diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java index c434b7e..428c2e4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java @@ -199,19 +199,19 @@ public class StatisticsController extends BaseController { // 4. 按省或市或地区查询区域内近12个自然月每月建档人数 List patientMonthList = statisticsService.queryMonthPatients(new AreaDataQuery()); Map> patientMonthMap = new HashMap<>(); + + Map pmap = new HashMap<>(); for (AreaData areaData:patientMonthList) { - String regino = areaData.getProvinceName(); - Map subMap = null; - if (patientMonthMap.containsKey(regino)) { - subMap = patientMonthMap.get(regino); + String month = buildMonth(areaData.getYear()); + if (pmap.containsKey(month)) { + pmap.put(month, pmap.get(month) + areaData.getVal()); } else { - subMap = new HashMap<>(); - patientMonthMap.put(regino, subMap); + pmap.put(month, areaData.getVal()); } - String month = buildMonth(areaData.getYear()); - subMap.put(month, areaData.getVal()); } - Option patientMonthOption = buildLineOption("建档人数", null, patientMonthMap, buildDefaultMonth(12)); + patientMonthMap.put("建档人数", pmap); + + Option patientMonthOption = buildLineOption("建档&高危人数", null, patientMonthMap, buildDefaultMonth(12));