diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 9e4fb24..2ff6766 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -87,12 +87,12 @@
     /**
      * 总用水量和瞬时流量
      */
-    Map<String, Object> getWaterMeter();
+    Map<String, Object> getWaterMeter(@Param("year") String year);
 
     /**
      * 本月总用水量
      */
-    String getWaterMeterMonth();
+    Map<String, Object> getWaterMeterMonth(@Param("month") String month);
 
     /**
      * 今日用水量

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 9e4fb24..2ff6766 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -87,12 +87,12 @@
     /**
      * 总用水量和瞬时流量
      */
-    Map<String, Object> getWaterMeter();
+    Map<String, Object> getWaterMeter(@Param("year") String year);
 
     /**
      * 本月总用水量
      */
-    String getWaterMeterMonth();
+    Map<String, Object> getWaterMeterMonth(@Param("month") String month);
 
     /**
      * 今日用水量
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 16545a3..5c26568 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -1021,15 +1021,17 @@
     </select>
 
     <select id="getWaterMeter" resultType="map">
-        SELECT SUM(dw.FLOW_ACC) AS total,
-               SUM(dw.FLOW)     AS now
-        FROM data_watermeter AS dw
+        SELECT SUM(dw.FLOW_ACC_MONTH) AS total
+        FROM data_watermeter_month AS dw, device_view as dv
+        where substring(dw.month, 1, 4) = #{year}
+        and dv.devcode = dw.devcode and dv.valid = 1 and dv.deviceType = '13'
     </select>
 
-    <select id="getWaterMeterMonth" resultType="string">
-        SELECT SUM(dwm.FLOW_ACC_MONTH) AS `month`
-        FROM data_watermeter_month AS dwm
-        WHERE DATE_FORMAT(dwm.`MONTH`, '%Y-%m') = DATE_FORMAT(NOW(), '%Y-%m')
+    <select id="getWaterMeterMonth" resultType="map">
+        SELECT SUM(dwm.FLOW_ACC_MONTH) AS `monthAcc`
+        FROM data_watermeter_month AS dwm, device_view as dv
+        WHERE dwm.`MONTH` = #{month}
+        and dv.devcode = dwm.devcode and dv.valid = 1 and dv.deviceType = '13'
     </select>
 
     <select id="getWaterMeterDay" resultType="string">

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 9e4fb24..2ff6766 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -87,12 +87,12 @@
     /**
      * 总用水量和瞬时流量
      */
-    Map<String, Object> getWaterMeter();
+    Map<String, Object> getWaterMeter(@Param("year") String year);
 
     /**
      * 本月总用水量
      */
-    String getWaterMeterMonth();
+    Map<String, Object> getWaterMeterMonth(@Param("month") String month);
 
     /**
      * 今日用水量
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 16545a3..5c26568 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -1021,15 +1021,17 @@
     </select>
 
     <select id="getWaterMeter" resultType="map">
-        SELECT SUM(dw.FLOW_ACC) AS total,
-               SUM(dw.FLOW)     AS now
-        FROM data_watermeter AS dw
+        SELECT SUM(dw.FLOW_ACC_MONTH) AS total
+        FROM data_watermeter_month AS dw, device_view as dv
+        where substring(dw.month, 1, 4) = #{year}
+        and dv.devcode = dw.devcode and dv.valid = 1 and dv.deviceType = '13'
     </select>
 
-    <select id="getWaterMeterMonth" resultType="string">
-        SELECT SUM(dwm.FLOW_ACC_MONTH) AS `month`
-        FROM data_watermeter_month AS dwm
-        WHERE DATE_FORMAT(dwm.`MONTH`, '%Y-%m') = DATE_FORMAT(NOW(), '%Y-%m')
+    <select id="getWaterMeterMonth" resultType="map">
+        SELECT SUM(dwm.FLOW_ACC_MONTH) AS `monthAcc`
+        FROM data_watermeter_month AS dwm, device_view as dv
+        WHERE dwm.`MONTH` = #{month}
+        and dv.devcode = dwm.devcode and dv.valid = 1 and dv.deviceType = '13'
     </select>
 
     <select id="getWaterMeterDay" resultType="string">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index aed1460..4c5ebc7 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -23,6 +23,7 @@
 import org.springframework.validation.FieldError;
 import org.springframework.validation.Validator;
 
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -44,6 +45,11 @@
     private final ICommonPermissionService permissionService;
     private final Validator validator;
 
+    private SimpleDateFormat sdfY = new SimpleDateFormat("yyyy");
+    private SimpleDateFormat sdfM = new SimpleDateFormat("yyyy-MM");
+    private SimpleDateFormat sdfD = new SimpleDateFormat("yyyy-MM-dd");
+    private DecimalFormat df2 = new DecimalFormat("0.00");
+
     public DeviceServiceImpl(IDeviceTypeService deviceTypeService,
                              IDeviceModelsService deviceModelsService,
                              IDeviceConcentratorService deviceConcentratorService,
@@ -568,18 +574,19 @@
 
     @Override
     public Map<String, Object> getOverview() {
-        Map<String, Object> waterMeter = this.baseMapper.getWaterMeter();
-        String month = this.baseMapper.getWaterMeterMonth();
-        String today = this.baseMapper.getWaterMeterDay();
-        String yesterday = this.baseMapper.getWaterMeterYesterday();
+        Calendar calendar = Calendar.getInstance();
+        String year = sdfY.format(calendar.getTime());
+        String month = sdfM.format(calendar.getTime());
+        String date = sdfD.format(calendar.getTime());
+        Map<String, Object> waterMeter = this.baseMapper.getWaterMeter(year);
+        Map<String, Object> monthAcc = this.baseMapper.getWaterMeterMonth(month);
+        String todayAcc = this.baseMapper.getWaterMeterDay();
         String sound = this.baseMapper.getNoiseData();
 
         Map<String, Object> resultMap = new HashMap<>();
-        resultMap.put("total", String.valueOf(waterMeter.get("total")));
-        resultMap.put("month", month);
-        resultMap.put("today", today);
-        resultMap.put("yesterday", yesterday);
-        resultMap.put("now", String.valueOf(waterMeter.get("now")));
+        resultMap.put("total", df2.format((Double) waterMeter.get("total")));
+        resultMap.put("month", df2.format((Double) monthAcc.get("monthAcc")));
+        resultMap.put("today", todayAcc);
         resultMap.put("sound", sound);
         return resultMap;
     }