diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java
index a077958..f6387c2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java
@@ -68,7 +68,7 @@
                 }
             }
             if (ToolUtil.isNotEmpty(childIdsList)) {
-                Long count = statisticsService.countByFirstArea(startTime, endTime, StringUtils.join(childIdsList.toArray(), ","));
+                String count = statisticsService.countByFirstArea(startTime, endTime, StringUtils.join(childIdsList.toArray(), ","));
                 map.put("count", count);
             }
             mapList.add(map);
@@ -265,7 +265,7 @@
                 }
             }
             if (ToolUtil.isNotEmpty(childIdsList)) {
-                Long count = statisticsService.countByFirstArea(startTime, endTime, StringUtils.join(childIdsList.toArray(), ","));
+                String count = statisticsService.countByFirstArea(startTime, endTime, StringUtils.join(childIdsList.toArray(), ","));
                 map.put("count", count);
             }
             mapList.add(map);
@@ -402,10 +402,10 @@
                 }
             }
             if (ToolUtil.isNotEmpty(childIdsList)) {
-                Long countThis = statisticsService.countByFirstArea(startTimeThis, endTimeThis, StringUtils.join(childIdsList.toArray(), ","));
+                String countThis = statisticsService.countByFirstArea(startTimeThis, endTimeThis, StringUtils.join(childIdsList.toArray(), ","));
                 areaSecondMap.put("now", countThis);
 
-                Long countLast = statisticsService.countByFirstArea(startTimeLast, endTimeLast, StringUtils.join(childIdsList.toArray(), ","));
+                String countLast = statisticsService.countByFirstArea(startTimeLast, endTimeLast, StringUtils.join(childIdsList.toArray(), ","));
                 areaSecondMap.put("last", countLast);
             }
             resultMapList.add(areaSecondMap);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java
index a077958..f6387c2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java
@@ -68,7 +68,7 @@
                 }
             }
             if (ToolUtil.isNotEmpty(childIdsList)) {
-                Long count = statisticsService.countByFirstArea(startTime, endTime, StringUtils.join(childIdsList.toArray(), ","));
+                String count = statisticsService.countByFirstArea(startTime, endTime, StringUtils.join(childIdsList.toArray(), ","));
                 map.put("count", count);
             }
             mapList.add(map);
@@ -265,7 +265,7 @@
                 }
             }
             if (ToolUtil.isNotEmpty(childIdsList)) {
-                Long count = statisticsService.countByFirstArea(startTime, endTime, StringUtils.join(childIdsList.toArray(), ","));
+                String count = statisticsService.countByFirstArea(startTime, endTime, StringUtils.join(childIdsList.toArray(), ","));
                 map.put("count", count);
             }
             mapList.add(map);
@@ -402,10 +402,10 @@
                 }
             }
             if (ToolUtil.isNotEmpty(childIdsList)) {
-                Long countThis = statisticsService.countByFirstArea(startTimeThis, endTimeThis, StringUtils.join(childIdsList.toArray(), ","));
+                String countThis = statisticsService.countByFirstArea(startTimeThis, endTimeThis, StringUtils.join(childIdsList.toArray(), ","));
                 areaSecondMap.put("now", countThis);
 
-                Long countLast = statisticsService.countByFirstArea(startTimeLast, endTimeLast, StringUtils.join(childIdsList.toArray(), ","));
+                String countLast = statisticsService.countByFirstArea(startTimeLast, endTimeLast, StringUtils.join(childIdsList.toArray(), ","));
                 areaSecondMap.put("last", countLast);
             }
             resultMapList.add(areaSecondMap);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 9538db4..774181d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -29,7 +29,7 @@
 
     Map<String, Object> warningBySecondArea(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("areaIds") String areaIds);
 
-    Long countByFirstArea(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("areaIds") String areaIds);
+    Double countByFirstArea(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("areaIds") String areaIds);
 
     /**
      * 查询各二级分区燃气报警数量-气体泄漏监测仪

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java
index a077958..f6387c2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java
@@ -68,7 +68,7 @@
                 }
             }
             if (ToolUtil.isNotEmpty(childIdsList)) {
-                Long count = statisticsService.countByFirstArea(startTime, endTime, StringUtils.join(childIdsList.toArray(), ","));
+                String count = statisticsService.countByFirstArea(startTime, endTime, StringUtils.join(childIdsList.toArray(), ","));
                 map.put("count", count);
             }
             mapList.add(map);
@@ -265,7 +265,7 @@
                 }
             }
             if (ToolUtil.isNotEmpty(childIdsList)) {
-                Long count = statisticsService.countByFirstArea(startTime, endTime, StringUtils.join(childIdsList.toArray(), ","));
+                String count = statisticsService.countByFirstArea(startTime, endTime, StringUtils.join(childIdsList.toArray(), ","));
                 map.put("count", count);
             }
             mapList.add(map);
@@ -402,10 +402,10 @@
                 }
             }
             if (ToolUtil.isNotEmpty(childIdsList)) {
-                Long countThis = statisticsService.countByFirstArea(startTimeThis, endTimeThis, StringUtils.join(childIdsList.toArray(), ","));
+                String countThis = statisticsService.countByFirstArea(startTimeThis, endTimeThis, StringUtils.join(childIdsList.toArray(), ","));
                 areaSecondMap.put("now", countThis);
 
-                Long countLast = statisticsService.countByFirstArea(startTimeLast, endTimeLast, StringUtils.join(childIdsList.toArray(), ","));
+                String countLast = statisticsService.countByFirstArea(startTimeLast, endTimeLast, StringUtils.join(childIdsList.toArray(), ","));
                 areaSecondMap.put("last", countLast);
             }
             resultMapList.add(areaSecondMap);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 9538db4..774181d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -29,7 +29,7 @@
 
     Map<String, Object> warningBySecondArea(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("areaIds") String areaIds);
 
-    Long countByFirstArea(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("areaIds") String areaIds);
+    Double countByFirstArea(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("areaIds") String areaIds);
 
     /**
      * 查询各二级分区燃气报警数量-气体泄漏监测仪
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index c038e8e..8f1aaed 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -132,7 +132,7 @@
         GROUP BY dd.`DATE`
     </select>
 
-    <select id="countByFirstArea" resultType="Long">
+    <select id="countByFirstArea" resultType="Double">
         SELECT
         IFNULL(SUM(dd.`FLOW_ACC_DATE`), 0) AS 'count'
         FROM

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java
index a077958..f6387c2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java
@@ -68,7 +68,7 @@
                 }
             }
             if (ToolUtil.isNotEmpty(childIdsList)) {
-                Long count = statisticsService.countByFirstArea(startTime, endTime, StringUtils.join(childIdsList.toArray(), ","));
+                String count = statisticsService.countByFirstArea(startTime, endTime, StringUtils.join(childIdsList.toArray(), ","));
                 map.put("count", count);
             }
             mapList.add(map);
@@ -265,7 +265,7 @@
                 }
             }
             if (ToolUtil.isNotEmpty(childIdsList)) {
-                Long count = statisticsService.countByFirstArea(startTime, endTime, StringUtils.join(childIdsList.toArray(), ","));
+                String count = statisticsService.countByFirstArea(startTime, endTime, StringUtils.join(childIdsList.toArray(), ","));
                 map.put("count", count);
             }
             mapList.add(map);
@@ -402,10 +402,10 @@
                 }
             }
             if (ToolUtil.isNotEmpty(childIdsList)) {
-                Long countThis = statisticsService.countByFirstArea(startTimeThis, endTimeThis, StringUtils.join(childIdsList.toArray(), ","));
+                String countThis = statisticsService.countByFirstArea(startTimeThis, endTimeThis, StringUtils.join(childIdsList.toArray(), ","));
                 areaSecondMap.put("now", countThis);
 
-                Long countLast = statisticsService.countByFirstArea(startTimeLast, endTimeLast, StringUtils.join(childIdsList.toArray(), ","));
+                String countLast = statisticsService.countByFirstArea(startTimeLast, endTimeLast, StringUtils.join(childIdsList.toArray(), ","));
                 areaSecondMap.put("last", countLast);
             }
             resultMapList.add(areaSecondMap);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 9538db4..774181d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -29,7 +29,7 @@
 
     Map<String, Object> warningBySecondArea(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("areaIds") String areaIds);
 
-    Long countByFirstArea(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("areaIds") String areaIds);
+    Double countByFirstArea(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("areaIds") String areaIds);
 
     /**
      * 查询各二级分区燃气报警数量-气体泄漏监测仪
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index c038e8e..8f1aaed 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -132,7 +132,7 @@
         GROUP BY dd.`DATE`
     </select>
 
-    <select id="countByFirstArea" resultType="Long">
+    <select id="countByFirstArea" resultType="Double">
         SELECT
         IFNULL(SUM(dd.`FLOW_ACC_DATE`), 0) AS 'count'
         FROM
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 348ee64..cf4204f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -17,7 +17,7 @@
     List<Map<String, Object>> countByDayFirst(String startTime,String endTime,String areaIds);
     List<Map<String, Object>> alarmCountByDay(String startTime,String endTime);
     Map<String, Object> alarmBySecondArea(String startTime,String endTime,String areaIds);
-    Long countByFirstArea(String startTime,String endTime,String areaIds);
+    String countByFirstArea(String startTime,String endTime,String areaIds);
 
     /**
      * 查询各二级分区燃气报警数量-气体泄漏监测仪-设备类型为4

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java
index a077958..f6387c2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterStaticsController.java
@@ -68,7 +68,7 @@
                 }
             }
             if (ToolUtil.isNotEmpty(childIdsList)) {
-                Long count = statisticsService.countByFirstArea(startTime, endTime, StringUtils.join(childIdsList.toArray(), ","));
+                String count = statisticsService.countByFirstArea(startTime, endTime, StringUtils.join(childIdsList.toArray(), ","));
                 map.put("count", count);
             }
             mapList.add(map);
@@ -265,7 +265,7 @@
                 }
             }
             if (ToolUtil.isNotEmpty(childIdsList)) {
-                Long count = statisticsService.countByFirstArea(startTime, endTime, StringUtils.join(childIdsList.toArray(), ","));
+                String count = statisticsService.countByFirstArea(startTime, endTime, StringUtils.join(childIdsList.toArray(), ","));
                 map.put("count", count);
             }
             mapList.add(map);
@@ -402,10 +402,10 @@
                 }
             }
             if (ToolUtil.isNotEmpty(childIdsList)) {
-                Long countThis = statisticsService.countByFirstArea(startTimeThis, endTimeThis, StringUtils.join(childIdsList.toArray(), ","));
+                String countThis = statisticsService.countByFirstArea(startTimeThis, endTimeThis, StringUtils.join(childIdsList.toArray(), ","));
                 areaSecondMap.put("now", countThis);
 
-                Long countLast = statisticsService.countByFirstArea(startTimeLast, endTimeLast, StringUtils.join(childIdsList.toArray(), ","));
+                String countLast = statisticsService.countByFirstArea(startTimeLast, endTimeLast, StringUtils.join(childIdsList.toArray(), ","));
                 areaSecondMap.put("last", countLast);
             }
             resultMapList.add(areaSecondMap);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
index 9538db4..774181d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/StatisticMapper.java
@@ -29,7 +29,7 @@
 
     Map<String, Object> warningBySecondArea(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("areaIds") String areaIds);
 
-    Long countByFirstArea(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("areaIds") String areaIds);
+    Double countByFirstArea(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("areaIds") String areaIds);
 
     /**
      * 查询各二级分区燃气报警数量-气体泄漏监测仪
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index c038e8e..8f1aaed 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -132,7 +132,7 @@
         GROUP BY dd.`DATE`
     </select>
 
-    <select id="countByFirstArea" resultType="Long">
+    <select id="countByFirstArea" resultType="Double">
         SELECT
         IFNULL(SUM(dd.`FLOW_ACC_DATE`), 0) AS 'count'
         FROM
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
index 348ee64..cf4204f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IStatisticsService.java
@@ -17,7 +17,7 @@
     List<Map<String, Object>> countByDayFirst(String startTime,String endTime,String areaIds);
     List<Map<String, Object>> alarmCountByDay(String startTime,String endTime);
     Map<String, Object> alarmBySecondArea(String startTime,String endTime,String areaIds);
-    Long countByFirstArea(String startTime,String endTime,String areaIds);
+    String countByFirstArea(String startTime,String endTime,String areaIds);
 
     /**
      * 查询各二级分区燃气报警数量-气体泄漏监测仪-设备类型为4
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index 2e77dc5..cdf1f58 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -16,6 +16,7 @@
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -33,6 +34,8 @@
     @Resource
     private IAreaService areaService;
 
+    private DecimalFormat df2 = new DecimalFormat("0.00");
+
     @Override
     public List<Map<String, Object>> wellStaticsByDept(DataScope dataScope) {
         List<Map<String, Object>> mapList = statisticMapper.wellStaticsByDept(dataScope);
@@ -144,8 +147,9 @@
     }
 
     @Override
-    public Long countByFirstArea(String startTime, String endTime, String areaIds) {
-        return statisticMapper.countByFirstArea(startTime, endTime, areaIds);
+    public String countByFirstArea(String startTime, String endTime, String areaIds) {
+        Double    countWaterData=statisticMapper.countByFirstArea(startTime, endTime, areaIds);
+        return  df2.format(countWaterData);
     }
 
     /**