Commit 8a4fb116f0b9f5a4d9f13d6b4b66fd48a963860c
1 parent
dfbb05490d
Exists in
master
and in
1 other branch
add statistics(map) common index
Showing 1 changed file with 4 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java
View file @
8a4fb11
| ... | ... | @@ -322,7 +322,7 @@ |
| 322 | 322 | areaBarOption.setSeries(areaBarSeriesList); |
| 323 | 323 | |
| 324 | 324 | for (AreaData areaData:provinceRiskList) { |
| 325 | - String rigino = areaData.getCityName().replace("市", "").replace("省", ""); | |
| 325 | + String rigino = areaData.getCityName(); | |
| 326 | 326 | if (mapsData.get(rigino) == null) { |
| 327 | 327 | mapsData.put(rigino, areaData.getVal()); |
| 328 | 328 | kvData.put(rigino, areaData.getProvinceId()); |
| ... | ... | @@ -331,7 +331,7 @@ |
| 331 | 331 | } |
| 332 | 332 | } |
| 333 | 333 | for (AreaData areaData:provincePatientList) { |
| 334 | - String rigino = areaData.getCityName().replace("市", "").replace("省", ""); | |
| 334 | + String rigino = areaData.getCityName(); | |
| 335 | 335 | if (mapsData.get(rigino) == null) { |
| 336 | 336 | riskDataList.add(0); |
| 337 | 337 | mapsData.put(rigino, areaData.getVal()); |
| 338 | 338 | |
| ... | ... | @@ -360,9 +360,9 @@ |
| 360 | 360 | series.setName("建档及高危数"); |
| 361 | 361 | series.setType("map"); |
| 362 | 362 | if ("130000".equals(pid)) { |
| 363 | - series.setMapType("hebei"); | |
| 363 | + series.setMapType("河北"); | |
| 364 | 364 | } else if ("510000".equals(pid)) { |
| 365 | - series.setMapType("sichuan"); | |
| 365 | + series.setMapType("四川"); | |
| 366 | 366 | } else { |
| 367 | 367 | series.setMapType("china"); |
| 368 | 368 | } |