diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java index af8cc1a..19cfca0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java @@ -55,11 +55,11 @@ public class StatisticsController extends BaseController { public void getTotalIndex(HttpServletResponse response, @RequestParam(value = "type")Integer type, @RequestParam(value = "pid", required = false)String pid) { Map result= new HashMap(); Map colormap = new HashMap<>(); - colormap.put("紫色", "#ff00ff"); - colormap.put("红色", "#ff0000"); - colormap.put("橙色", "#ff8800"); + colormap.put("紫色", "#be75ff"); + colormap.put("红色", "#ff6767"); + colormap.put("橙色", "#ffb02e"); colormap.put("黄色", "#ffff00"); - colormap.put("其他", "#DEDCE0"); + colormap.put("其他", "#ffd84d"); Normal normal = new Normal(true, null); Label label = new Label(); @@ -181,7 +181,12 @@ public class StatisticsController extends BaseController { }); List groupRiskDataList = new ArrayList<>(); + int n = 0; for (Map.Entry entry:listData) { + n++; + if (n>20) { + break; + } groupRiskOption.getyAxis().getData().add(entry.getKey()); if (riskColorMap.containsKey(entry.getKey())) { Data data = new Data(); @@ -245,8 +250,8 @@ public class StatisticsController extends BaseController { secondmap.put(month, areaData.getVal2()); } } - reportMonthMap.put("初诊人数", firstmap); reportMonthMap.put("复诊人数", secondmap); + reportMonthMap.put("初诊人数", firstmap); Option reportMonthOption = buildLineOption("初诊&复诊人数", null, reportMonthMap, buildDefaultMonth(12));