Commit 9b4e49f98a78e7ee5e1b3fd7455c84b9e017c7c2
1 parent
9c60d4629d
Exists in
master
and in
1 other branch
add statistics(map) common index
Showing 1 changed file with 7 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java
View file @
9b4e49f
... | ... | @@ -65,16 +65,23 @@ |
65 | 65 | List<AreaData> provincePatientList = statisticsService.queryProvincePatients(); |
66 | 66 | Map<String, String> kvData = new HashMap<>(); |
67 | 67 | Map<String, Integer> mapsData = new HashMap<>(); |
68 | + | |
68 | 69 | Option areaBarOption = buildBarOption("建档&高危人数", null); |
69 | 70 | List<Object> areaBarSeriesList = new ArrayList<>(); |
70 | 71 | Series patientSeries = new Series(); |
71 | 72 | patientSeries.setName("建档人数"); |
72 | 73 | patientSeries.setType("bar"); |
73 | 74 | List<Object> patientDataList = new ArrayList<>(); |
75 | + patientSeries.setData(patientDataList); | |
74 | 76 | Series riskSeries = new Series(); |
75 | 77 | riskSeries.setName("高危人数"); |
76 | 78 | riskSeries.setType("bar"); |
77 | 79 | List<Object> riskDataList = new ArrayList<>(); |
80 | + riskSeries.setData(riskDataList); | |
81 | + areaBarSeriesList.add(patientSeries); | |
82 | + areaBarSeriesList.add(riskSeries); | |
83 | + areaBarOption.setSeries(areaBarSeriesList); | |
84 | + | |
78 | 85 | for (AreaData areaData:provinceRiskList) { |
79 | 86 | String rigino = areaData.getProvinceName().replace("市", "").replace("省", ""); |
80 | 87 | if (mapsData.get(rigino) == null) { |
... | ... | @@ -97,9 +104,6 @@ |
97 | 104 | areaBarOption.getyAxis().getData().add(rigino); |
98 | 105 | patientDataList.add(areaData.getVal()); |
99 | 106 | } |
100 | - areaBarSeriesList.add(patientDataList); | |
101 | - areaBarSeriesList.add(riskDataList); | |
102 | - areaBarOption.setSeries(areaBarSeriesList); | |
103 | 107 | |
104 | 108 | List<Object> dataList = new ArrayList<>(); |
105 | 109 | Set<String> set = mapsData.keySet(); |