diff --git a/src/main/java/com/gunshi/project/hsz/service/ReservoirWaterService.java b/src/main/java/com/gunshi/project/hsz/service/ReservoirWaterService.java
index 0d9aa0b..9785cb9 100644
--- a/src/main/java/com/gunshi/project/hsz/service/ReservoirWaterService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/ReservoirWaterService.java
@@ -211,6 +211,7 @@ public class ReservoirWaterService {
             if(tm != null && tm.before(currentHour)){
                 vo.setRz(null);
                 vo.setTm(null);
+                vo.setDrpTm(null);
             }else if (tm != null && rz != null){
                 if (rz != null) {
                     //BigDecimal w = stZvarlBService.getWFromZvarl(rz, null, zvarlList);
@@ -263,6 +264,9 @@ public class ReservoirWaterService {
             }else if(stWaterRReal2 != null){
                 attResBaseVo.setIrrigationFlowTm(stWaterRReal2.getTm());
             }
+            if(totalSum == null){
+                attResBaseVo.setIrrigationFlowTm(null);
+            }
         }
         //获取新建生态供水流量站最新得流量
         String ecologyStcd = "1114";
diff --git a/src/main/java/com/gunshi/project/hsz/service/RiceRqWaterService.java b/src/main/java/com/gunshi/project/hsz/service/RiceRqWaterService.java
index 531eb4e..5448cfa 100644
--- a/src/main/java/com/gunshi/project/hsz/service/RiceRqWaterService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/RiceRqWaterService.java
@@ -645,6 +645,7 @@ public class RiceRqWaterService extends ServiceImpl<RiceRqWaterMapper, RiceRqWat
             cycleTotal = cycleTotal.add(riceWaterForecastCycle.getIrrigationUse());
 //            riceWaterForecastCycle.setIrrigationUse(riceWaterForecastCycle.getIrrigationUse().setScale(2,RoundingMode.HALF_UP));
         }
+        monthTotal = cycleTotal;
         vo.setIrrigationMonthTotalUse(monthTotal.setScale(2,RoundingMode.HALF_UP));
         vo.setIrrigationCycleTotalUse(cycleTotal.setScale(2,RoundingMode.HALF_UP));
         vo.setRiceWaterKis(riceWaterKis);