Commit db6f45f4c3677a85b613ffb21d68c8d9707adced
1 parent
5573bdafd4
Exists in
master
and in
1 other branch
add statistics(map) common index
Showing 1 changed file with 2 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java
View file @
db6f45f
| ... | ... | @@ -331,7 +331,7 @@ |
| 331 | 331 | } |
| 332 | 332 | } |
| 333 | 333 | for (AreaData areaData:provincePatientList) { |
| 334 | - String rigino = areaData.getProvinceName().replace("市", "").replace("省", ""); | |
| 334 | + String rigino = areaData.getCityName().replace("市", "").replace("省", ""); | |
| 335 | 335 | if (mapsData.get(rigino) == null) { |
| 336 | 336 | riskDataList.add(0); |
| 337 | 337 | mapsData.put(rigino, areaData.getVal()); |
| ... | ... | @@ -368,7 +368,7 @@ |
| 368 | 368 | |
| 369 | 369 | |
| 370 | 370 | // 高危数据 |
| 371 | - List<AreaData> currentRiskList = statisticsService.queryRisks(new AreaDataQuery()); | |
| 371 | + List<AreaData> currentRiskList = statisticsService.queryRisks(query); | |
| 372 | 372 | Option groupRiskOption = buildyBarOption("当前高危人数", null); |
| 373 | 373 | groupRiskOption.getTooltip().setShow(true); |
| 374 | 374 | List<Object> groupRiskSeriesList = new ArrayList<>(); |
| ... | ... | @@ -451,7 +451,6 @@ |
| 451 | 451 | Option patientMonthOption = buildLineOption("建档及高危人数", null, patientMonthMap, buildDefaultMonth(12)); |
| 452 | 452 | |
| 453 | 453 | // 按省或市或地区查询区域内近12个自然月每月初诊人数、复诊人数 |
| 454 | - query = new AreaDataQuery(); | |
| 455 | 454 | List<AreaData> reportMonthList = statisticsService.queryMonthReports(query); |
| 456 | 455 | Map<String, Map<String, Integer>> reportMonthMap = new HashMap<>(); |
| 457 | 456 | Map<String, Integer> firstmap = new HashMap<>(); |