Commit e3669ff507e6ac675b882c73bcce964a3cbf1dd9
1 parent
45b5051bfa
Exists in
master
and in
1 other branch
add statistics(map) common index
Showing 1 changed file with 4 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java
View file @
e3669ff
... | ... | @@ -52,8 +52,7 @@ |
52 | 52 | * @param pid 省ID、地区ID |
53 | 53 | */ |
54 | 54 | @RequestMapping(value = "/total/index", method = RequestMethod.GET) |
55 | - public void getTotalIndex(HttpServletResponse response, @RequestParam(value = "type")Integer type, @RequestParam(value = "pid", required = false)String pid, | |
56 | - @RequestParam(value = "provinceId", required = false)String provinceId) { | |
55 | + public void getTotalIndex(HttpServletResponse response, @RequestParam(value = "type")Integer type, @RequestParam(value = "pid", required = false)String pid) { | |
57 | 56 | Map<String,Object> result= new HashMap<String, Object>(); |
58 | 57 | Map<String, String> colormap = new HashMap<>(); |
59 | 58 | colormap.put("紫色", "#be75ff"); |
... | ... | @@ -512,6 +511,7 @@ |
512 | 511 | |
513 | 512 | // TYPE 地区数据 |
514 | 513 | else if (type == 3) { |
514 | + String provinceId = null; | |
515 | 515 | Map<String, String> cityPinyinMap = new HashMap<>(); |
516 | 516 | cityPinyinMap.put("南充", "nanchong"); |
517 | 517 | cityPinyinMap.put("衡水", "hengshui"); |
... | ... | @@ -556,6 +556,7 @@ |
556 | 556 | for (AreaData areaData:provinceRiskList) { |
557 | 557 | if (cityName == null) { |
558 | 558 | cityName = areaData.getCityName(); |
559 | + provinceId = areaData.getProvinceId(); | |
559 | 560 | } |
560 | 561 | String rigino = areaData.getAreaName(); |
561 | 562 | if (mapsData.get(rigino) == null) { |
... | ... | @@ -568,6 +569,7 @@ |
568 | 569 | for (AreaData areaData:provincePatientList) { |
569 | 570 | if (cityName == null) { |
570 | 571 | cityName = areaData.getCityName(); |
572 | + provinceId = areaData.getProvinceId(); | |
571 | 573 | } |
572 | 574 | String rigino = areaData.getAreaName(); |
573 | 575 | if (mapsData.get(rigino) == null) { |