diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
index 5a85056..04da3e4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
@@ -71,7 +71,7 @@
         // 赋值井编号
         DeviceWellDto wellDto = deviceService.selectWellByDevcode(gasFlowAddr);
         if (null == wellDto) {
-            log.info("没有找到" + gasFlowAddr + "对应的井编号");
+            log.info("气体流量接收，没有找到" + gasFlowAddr + "对应的井编号");
             return ResponseData.success();
         }
         dataGasFlow.setWellCode(wellDto.getWellCode());

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
index 5a85056..04da3e4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
@@ -71,7 +71,7 @@
         // 赋值井编号
         DeviceWellDto wellDto = deviceService.selectWellByDevcode(gasFlowAddr);
         if (null == wellDto) {
-            log.info("没有找到" + gasFlowAddr + "对应的井编号");
+            log.info("气体流量接收，没有找到" + gasFlowAddr + "对应的井编号");
             return ResponseData.success();
         }
         dataGasFlow.setWellCode(wellDto.getWellCode());
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
index 63d2e9d..75cb70b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
@@ -69,7 +69,7 @@
         // 赋值井编号
         DeviceWellDto wellDto = deviceService.selectWellByDevcode(meterAddr);
         if (null == wellDto) {
-            log.info("没有找到" + meterAddr + "对应的井编号");
+            log.info("供水接收，没有找到" + meterAddr + "对应的井编号");
             return ResponseData.success();
         }
         dataWaterMeter.setWellCode(wellDto.getWellCode());

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
index 5a85056..04da3e4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
@@ -71,7 +71,7 @@
         // 赋值井编号
         DeviceWellDto wellDto = deviceService.selectWellByDevcode(gasFlowAddr);
         if (null == wellDto) {
-            log.info("没有找到" + gasFlowAddr + "对应的井编号");
+            log.info("气体流量接收，没有找到" + gasFlowAddr + "对应的井编号");
             return ResponseData.success();
         }
         dataGasFlow.setWellCode(wellDto.getWellCode());
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
index 63d2e9d..75cb70b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
@@ -69,7 +69,7 @@
         // 赋值井编号
         DeviceWellDto wellDto = deviceService.selectWellByDevcode(meterAddr);
         if (null == wellDto) {
-            log.info("没有找到" + meterAddr + "对应的井编号");
+            log.info("供水接收，没有找到" + meterAddr + "对应的井编号");
             return ResponseData.success();
         }
         dataWaterMeter.setWellCode(wellDto.getWellCode());
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java
index 18e6657..7aa3b2b 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java
@@ -94,11 +94,13 @@
     /**
      * 没有间隔
      */
-    private void noIntervalDayGasFlow(DataGasFlowDay gasFlowDay, Map<String, Object> lastDayAcc, Double flowAccDayRet,
+    private void noIntervalDayGasFlow(DataGasFlowDay gasFlowDay,
+                                      Map<String, Object> lastDayAcc,
+                                      Double flowAccDayRet,
                                       Double flowAccDelta, DataGasFlowMonth gasFlowMonth, DataGasFlow dataGasFlow) {
-        gasFlowDay.setTotalFlowDate(dataGasFlow.getTotalFlow());
-        gasFlowDay.setTotalFlow(df2.format(flowAccDayRet));
-        this.baseMapper.updateDataGasFlowDay(gasFlowDay.getDevcode(), gasFlowDay.getDevcode(), gasFlowDay.getDate(),
+        gasFlowDay.setTotalFlowDate(df2.format(flowAccDayRet));
+        gasFlowDay.setTotalFlow(dataGasFlow.getTotalFlow());
+        this.baseMapper.updateDataGasFlowDay(gasFlowDay.getDevcode(), gasFlowDay.getWellCode(), gasFlowDay.getDate(),
                 gasFlowDay.getTotalFlow(), gasFlowDay.getTotalFlowDate());
         // 更新月用气量
         Map<String, Object> monthExist = this.baseMapper.isExistDataGasFlowMonth(gasFlowMonth.getDevcode(), gasFlowMonth.getMonth());
@@ -108,7 +110,8 @@
             gasFlowMonth.setId((Long) monthExist.get("id"));
             dataGasFlowMonthMapper.updateById(gasFlowMonth);
         } else {
-            gasFlowMonth.setTotalFlowMonth(flowAccDelta.toString());
+            Double  totalFlowMonth=flowAccDelta-Double.valueOf(gasFlowMonth.getFirstTotal());
+            gasFlowMonth.setTotalFlowMonth(totalFlowMonth.toString());
             gasFlowMonth.setFirstTotal(lastDayAcc.get("totalFlow").toString());
             gasFlowMonth.setEndTotal(dataGasFlow.getTotalFlow());
             dataGasFlowMonthMapper.insert(gasFlowMonth);
@@ -197,8 +200,9 @@
         if (dayDelta != 0) {
             //修正月统计最后的累计
             Double lastTimeDiff = avgFlowDay + Double.valueOf(dayDelta * 24 - delhour) / 24 * avgFlowDay;
+            Double  flowMonth=lastDay.get(Calendar.DATE)==1?lastTimeDiff:Double.parseDouble(monthExist.get("totalFlowMonth").toString())+lastTimeDiff;
             //更新最后月累计量
-            gasFlowMonth.setTotalFlowMonth(df2.format(Double.parseDouble(monthExist.get("totalFlowMonth").toString())+lastTimeDiff));
+            gasFlowMonth.setTotalFlowMonth(df2.format(flowMonth));
             dataGasFlowMonthMapper.updateById(gasFlowMonth);
         }
     }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
index 5a85056..04da3e4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataReceiver.java
@@ -71,7 +71,7 @@
         // 赋值井编号
         DeviceWellDto wellDto = deviceService.selectWellByDevcode(gasFlowAddr);
         if (null == wellDto) {
-            log.info("没有找到" + gasFlowAddr + "对应的井编号");
+            log.info("气体流量接收，没有找到" + gasFlowAddr + "对应的井编号");
             return ResponseData.success();
         }
         dataGasFlow.setWellCode(wellDto.getWellCode());
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
index 63d2e9d..75cb70b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
@@ -69,7 +69,7 @@
         // 赋值井编号
         DeviceWellDto wellDto = deviceService.selectWellByDevcode(meterAddr);
         if (null == wellDto) {
-            log.info("没有找到" + meterAddr + "对应的井编号");
+            log.info("供水接收，没有找到" + meterAddr + "对应的井编号");
             return ResponseData.success();
         }
         dataWaterMeter.setWellCode(wellDto.getWellCode());
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java
index 18e6657..7aa3b2b 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowDataServiceImpl.java
@@ -94,11 +94,13 @@
     /**
      * 没有间隔
      */
-    private void noIntervalDayGasFlow(DataGasFlowDay gasFlowDay, Map<String, Object> lastDayAcc, Double flowAccDayRet,
+    private void noIntervalDayGasFlow(DataGasFlowDay gasFlowDay,
+                                      Map<String, Object> lastDayAcc,
+                                      Double flowAccDayRet,
                                       Double flowAccDelta, DataGasFlowMonth gasFlowMonth, DataGasFlow dataGasFlow) {
-        gasFlowDay.setTotalFlowDate(dataGasFlow.getTotalFlow());
-        gasFlowDay.setTotalFlow(df2.format(flowAccDayRet));
-        this.baseMapper.updateDataGasFlowDay(gasFlowDay.getDevcode(), gasFlowDay.getDevcode(), gasFlowDay.getDate(),
+        gasFlowDay.setTotalFlowDate(df2.format(flowAccDayRet));
+        gasFlowDay.setTotalFlow(dataGasFlow.getTotalFlow());
+        this.baseMapper.updateDataGasFlowDay(gasFlowDay.getDevcode(), gasFlowDay.getWellCode(), gasFlowDay.getDate(),
                 gasFlowDay.getTotalFlow(), gasFlowDay.getTotalFlowDate());
         // 更新月用气量
         Map<String, Object> monthExist = this.baseMapper.isExistDataGasFlowMonth(gasFlowMonth.getDevcode(), gasFlowMonth.getMonth());
@@ -108,7 +110,8 @@
             gasFlowMonth.setId((Long) monthExist.get("id"));
             dataGasFlowMonthMapper.updateById(gasFlowMonth);
         } else {
-            gasFlowMonth.setTotalFlowMonth(flowAccDelta.toString());
+            Double  totalFlowMonth=flowAccDelta-Double.valueOf(gasFlowMonth.getFirstTotal());
+            gasFlowMonth.setTotalFlowMonth(totalFlowMonth.toString());
             gasFlowMonth.setFirstTotal(lastDayAcc.get("totalFlow").toString());
             gasFlowMonth.setEndTotal(dataGasFlow.getTotalFlow());
             dataGasFlowMonthMapper.insert(gasFlowMonth);
@@ -197,8 +200,9 @@
         if (dayDelta != 0) {
             //修正月统计最后的累计
             Double lastTimeDiff = avgFlowDay + Double.valueOf(dayDelta * 24 - delhour) / 24 * avgFlowDay;
+            Double  flowMonth=lastDay.get(Calendar.DATE)==1?lastTimeDiff:Double.parseDouble(monthExist.get("totalFlowMonth").toString())+lastTimeDiff;
             //更新最后月累计量
-            gasFlowMonth.setTotalFlowMonth(df2.format(Double.parseDouble(monthExist.get("totalFlowMonth").toString())+lastTimeDiff));
+            gasFlowMonth.setTotalFlowMonth(df2.format(flowMonth));
             dataGasFlowMonthMapper.updateById(gasFlowMonth);
         }
     }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/WaterMeterDataServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/WaterMeterDataServiceImpl.java
index 5f09884..6e2e3ee 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/WaterMeterDataServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/WaterMeterDataServiceImpl.java
@@ -190,8 +190,10 @@
         if (dayDelta != 0) {
             //修正月统计最后的累计
             Double lastTimeDiff = avgFlowAccDay + Double.valueOf(dayDelta * 24 - dateHour) / 24 * avgFlowAccDay;
+            //修正月统计最后的累计
+            Double  flowMonth=lastDay.get(Calendar.DATE)==1?lastTimeDiff:Double.parseDouble(monthExist.get("flowAccMonth").toString())+lastTimeDiff;
             //更新最后月累计量
-            waterMeterMonth.put("flowAccMonth", df2.format(Double.parseDouble(monthExist.get("flowAccMonth").toString()) + lastTimeDiff));
+            waterMeterMonth.put("flowAccMonth", df2.format(flowMonth));
             this.baseMapper.updateDataWatermeterMonth(waterMeterMonth, (Long) monthExist.get("id"));
         }
     }