Commit ab95256983e620403b5d499b4f24faed7a18a1a9
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 @
ab95256
| ... | ... | @@ -55,11 +55,11 @@ |
| 55 | 55 | public void getTotalIndex(HttpServletResponse response, @RequestParam(value = "type")Integer type, @RequestParam(value = "pid", required = false)String pid) { |
| 56 | 56 | Map<String,Object> result= new HashMap<String, Object>(); |
| 57 | 57 | Map<String, String> colormap = new HashMap<>(); |
| 58 | - colormap.put("紫色", "#ff00ff"); | |
| 59 | - colormap.put("红色", "#ff0000"); | |
| 60 | - colormap.put("橙色", "#ff8800"); | |
| 58 | + colormap.put("紫色", "#be75ff"); | |
| 59 | + colormap.put("红色", "#ff6767"); | |
| 60 | + colormap.put("橙色", "#ffb02e"); | |
| 61 | 61 | colormap.put("黄色", "#ffff00"); |
| 62 | - colormap.put("其他", "#DEDCE0"); | |
| 62 | + colormap.put("其他", "#ffd84d"); | |
| 63 | 63 | |
| 64 | 64 | Normal normal = new Normal(true, null); |
| 65 | 65 | Label label = new Label(); |
| 66 | 66 | |
| ... | ... | @@ -181,7 +181,12 @@ |
| 181 | 181 | }); |
| 182 | 182 | |
| 183 | 183 | List<Object> groupRiskDataList = new ArrayList<>(); |
| 184 | + int n = listData.size(); | |
| 184 | 185 | for (Map.Entry<String, Integer> entry:listData) { |
| 186 | + n--; | |
| 187 | + if (n>20) { | |
| 188 | + continue; | |
| 189 | + } | |
| 185 | 190 | groupRiskOption.getyAxis().getData().add(entry.getKey()); |
| 186 | 191 | if (riskColorMap.containsKey(entry.getKey())) { |
| 187 | 192 | Data data = new Data(); |
| 188 | 193 | |
| ... | ... | @@ -245,8 +250,8 @@ |
| 245 | 250 | secondmap.put(month, areaData.getVal2()); |
| 246 | 251 | } |
| 247 | 252 | } |
| 248 | - reportMonthMap.put("初诊人数", firstmap); | |
| 249 | 253 | reportMonthMap.put("复诊人数", secondmap); |
| 254 | + reportMonthMap.put("初诊人数", firstmap); | |
| 250 | 255 | Option reportMonthOption = buildLineOption("初诊&复诊人数", null, reportMonthMap, buildDefaultMonth(12)); |
| 251 | 256 | |
| 252 | 257 |