Merge branch '20210223' of http://114.135.61.188:53000/UIMS/Code into 20210223

sms_water/src/main/java/com/huaxu/service/impl/AppReportMonitorServiceImpl.java

@@ -124,9 +124,9 @@ public class AppReportMonitorServiceImpl  implements AppReportMonitorService {
                     value.stream().forEach(waterSupplyData -> {
                         waterSupplyChart.setSort(waterSupplyData.getDay());
 
-                        if (waterSupplyData.getParmType() == 3) { //供水
+                        if (waterSupplyData.getParmType() == 3&&waterSupplyData.getAmount()!=null) { //供水
                             waterSupplyChart.setWaterData(waterSupplyData.getAmount().divide(new BigDecimal("10000"),3,BigDecimal.ROUND_HALF_UP));
-                        } else if (waterSupplyData.getParmType() == 5) {//电耗
+                        } else if (waterSupplyData.getParmType() == 5&&waterSupplyData.getAmount()!=null) {//电耗
                             waterSupplyChart.setPowerData(waterSupplyData.getAmount().divide(new BigDecimal("10000"),3,BigDecimal.ROUND_HALF_UP));
                         }
 //                        else if (waterSupplyData.getParmType() == 6) {//药耗