Commit bc392853c152568fc19eef7e0ac2ad4c6c59466f
Exists in
master
and in
1 other branch
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java
View file @
bc39285
| ... | ... | @@ -511,6 +511,7 @@ |
| 511 | 511 | |
| 512 | 512 | // TYPE 地区数据 |
| 513 | 513 | else if (type == 3) { |
| 514 | + String provinceId = null; | |
| 514 | 515 | Map<String, String> cityPinyinMap = new HashMap<>(); |
| 515 | 516 | cityPinyinMap.put("南充", "nanchong"); |
| 516 | 517 | cityPinyinMap.put("衡水", "hengshui"); |
| ... | ... | @@ -520,8 +521,8 @@ |
| 520 | 521 | AreaDataQuery query = new AreaDataQuery(); |
| 521 | 522 | query.setCityId(pid); |
| 522 | 523 | // 地图数据 |
| 523 | - List<AreaData> provinceRiskList = statisticsService.queryRisksByProvince(query); | |
| 524 | - List<AreaData> provincePatientList = statisticsService.queryPatientsByProvince(query); | |
| 524 | + List<AreaData> provinceRiskList = statisticsService.queryRisksByCity(query); | |
| 525 | + List<AreaData> provincePatientList = statisticsService.queryPatientsByCity(query); | |
| 525 | 526 | Map<String, String> kvData = new HashMap<>(); |
| 526 | 527 | Map<String, Integer> mapsData = new HashMap<>(); |
| 527 | 528 | Map<String, String> riskColorMap = new HashMap<>(); |
| ... | ... | @@ -555,6 +556,7 @@ |
| 555 | 556 | for (AreaData areaData:provinceRiskList) { |
| 556 | 557 | if (cityName == null) { |
| 557 | 558 | cityName = areaData.getCityName(); |
| 559 | + provinceId = areaData.getProvinceId(); | |
| 558 | 560 | } |
| 559 | 561 | String rigino = areaData.getAreaName(); |
| 560 | 562 | if (mapsData.get(rigino) == null) { |
| ... | ... | @@ -567,6 +569,7 @@ |
| 567 | 569 | for (AreaData areaData:provincePatientList) { |
| 568 | 570 | if (cityName == null) { |
| 569 | 571 | cityName = areaData.getCityName(); |
| 572 | + provinceId = areaData.getProvinceId(); | |
| 570 | 573 | } |
| 571 | 574 | String rigino = areaData.getAreaName(); |
| 572 | 575 | if (mapsData.get(rigino) == null) { |
| ... | ... | @@ -729,6 +732,7 @@ |
| 729 | 732 | |
| 730 | 733 | |
| 731 | 734 | result.put("type", 3); |
| 735 | + result.put("provinceId", provinceId); | |
| 732 | 736 | result.put("cityName", cityName); |
| 733 | 737 | result.put("cityPinyin", cityPinyinMap.get(cityName.replace("市","").replace("省",""))); |
| 734 | 738 | result.put("kvData", kvData); |