From db6f45f4c3677a85b613ffb21d68c8d9707adced Mon Sep 17 00:00:00 2001 From: baohanddd Date: Thu, 7 Jul 2016 12:39:26 +0800 Subject: [PATCH] add statistics(map) common index --- .../lyms/platform/operate/web/controller/StatisticsController.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 09066c6..d23438a 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 @@ -331,7 +331,7 @@ public class StatisticsController extends BaseController { } } for (AreaData areaData:provincePatientList) { - String rigino = areaData.getProvinceName().replace("市", "").replace("省", ""); + String rigino = areaData.getCityName().replace("市", "").replace("省", ""); if (mapsData.get(rigino) == null) { riskDataList.add(0); mapsData.put(rigino, areaData.getVal()); @@ -368,7 +368,7 @@ public class StatisticsController extends BaseController { // 高危数据 - List currentRiskList = statisticsService.queryRisks(new AreaDataQuery()); + List currentRiskList = statisticsService.queryRisks(query); Option groupRiskOption = buildyBarOption("当前高危人数", null); groupRiskOption.getTooltip().setShow(true); List groupRiskSeriesList = new ArrayList<>(); @@ -451,7 +451,6 @@ public class StatisticsController extends BaseController { Option patientMonthOption = buildLineOption("建档及高危人数", null, patientMonthMap, buildDefaultMonth(12)); // 按省或市或地区查询区域内近12个自然月每月初诊人数、复诊人数 - query = new AreaDataQuery(); List reportMonthList = statisticsService.queryMonthReports(query); Map> reportMonthMap = new HashMap<>(); Map firstmap = new HashMap<>(); -- 1.8.3.1