Commit a53069862c4ac19d165896bfda07321c01b6da5e
1 parent
c450d94b95
Exists in
master
and in
8 other branches
add statistics(map) common index
Showing 1 changed file with 5 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java
View file @
a530698
| ... | ... | @@ -74,7 +74,7 @@ |
| 74 | 74 | Map<String, Integer> mapsData = new HashMap<>(); |
| 75 | 75 | Map<String, String> riskColorMap = new HashMap<>(); |
| 76 | 76 | |
| 77 | - Option areaBarOption = buildyBarOption("建档&高危人数", null); | |
| 77 | + Option areaBarOption = buildyBarOption("建档及高危人数", null); | |
| 78 | 78 | areaBarOption.getLegend().getData().add("近30天建档人数"); |
| 79 | 79 | areaBarOption.getLegend().getData().add("当前高危总人数"); |
| 80 | 80 | areaBarOption.getLegend().setOrient("horizontal"); |
| 81 | 81 | |
| ... | ... | @@ -136,11 +136,10 @@ |
| 136 | 136 | option.getLegend().setTop("50px"); |
| 137 | 137 | List<Object> seriesList = new ArrayList<>(); |
| 138 | 138 | Series series = new Series(); |
| 139 | - series.setName("建档&高危数"); | |
| 139 | + series.setName("建档及高危数"); | |
| 140 | 140 | series.setType("map"); |
| 141 | 141 | series.setMapType("china"); |
| 142 | 142 | series.setRoam(false); |
| 143 | - series.setLabel(label); | |
| 144 | 143 | series.setData(dataList); |
| 145 | 144 | seriesList.add(series); |
| 146 | 145 | option.setSeries(seriesList); |
| ... | ... | @@ -154,7 +153,6 @@ |
| 154 | 153 | Series groupRiskSeries = new Series(); |
| 155 | 154 | groupRiskSeries.setName("高危人数"); |
| 156 | 155 | groupRiskSeries.setType("bar"); |
| 157 | - groupRiskSeries.setLabel(label); | |
| 158 | 156 | mapsData.clear(); |
| 159 | 157 | for (AreaData areaData:currentRiskList) { |
| 160 | 158 | String groupName = areaData.getGroupName().replace("预警", ""); |
| ... | ... | @@ -184,7 +182,7 @@ |
| 184 | 182 | int n = listData.size(); |
| 185 | 183 | for (Map.Entry<String, Integer> entry:listData) { |
| 186 | 184 | n--; |
| 187 | - if (n>20) { | |
| 185 | + if (n>28) { | |
| 188 | 186 | continue; |
| 189 | 187 | } |
| 190 | 188 | groupRiskOption.getyAxis().getData().add(entry.getKey()); |
| ... | ... | @@ -229,7 +227,7 @@ |
| 229 | 227 | } |
| 230 | 228 | } |
| 231 | 229 | patientMonthMap.put("建档人数", pmap); |
| 232 | - Option patientMonthOption = buildLineOption("建档&高危人数", null, patientMonthMap, buildDefaultMonth(12)); | |
| 230 | + Option patientMonthOption = buildLineOption("建档及高危人数", null, patientMonthMap, buildDefaultMonth(12)); | |
| 233 | 231 | |
| 234 | 232 | // 按省或市或地区查询区域内近12个自然月每月初诊人数、复诊人数 |
| 235 | 233 | query = new AreaDataQuery(); |
| ... | ... | @@ -252,7 +250,7 @@ |
| 252 | 250 | } |
| 253 | 251 | reportMonthMap.put("复诊人数", secondmap); |
| 254 | 252 | reportMonthMap.put("初诊人数", firstmap); |
| 255 | - Option reportMonthOption = buildLineOption("初诊&复诊人数", null, reportMonthMap, buildDefaultMonth(12)); | |
| 253 | + Option reportMonthOption = buildLineOption("初诊及复诊人数", null, reportMonthMap, buildDefaultMonth(12)); | |
| 256 | 254 | |
| 257 | 255 | |
| 258 | 256 | // 近6个月高危数据（按颜色分组） |