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 3c7b340..ba8a287 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 @@ -685,53 +685,53 @@ public class StatisticsController extends BaseController { groupRiskSeriesList.add(groupRiskSeries); groupRiskOption.setSeries(groupRiskSeriesList); - for (String areaName:subMapsData.keySet()) { - try { - Option subGroupRiskOption = new Option(); - BeanUtils.copyProperties(groupRiskOption, subGroupRiskOption); - groupRiskOptionMap.put(areaName, subGroupRiskOption); - subGroupRiskOption.getTitle().setText(areaName + subGroupRiskOption.getTitle().getText()); - subGroupRiskOption.getyAxis().getData().clear(); - // 按MAP的value排序 - List> subListData = new ArrayList>(subMapsData.get(areaName).entrySet()); - Collections.sort(subListData, new Comparator>() { - public int compare(Map.Entry o1, Map.Entry o2) { - if (o2.getValue() != null && o1.getValue() != null && o2.getValue().compareTo(o1.getValue()) > 0) { - return -1; - } else { - return 1; - } - } - }); - - List subGroupRiskDataList = new ArrayList<>(); - n = listData.size(); - for (Map.Entry entry:subListData) { - n--; - if (n>28) { - continue; - } - subGroupRiskOption.getyAxis().getData().add(entry.getKey()); - if (riskColorMap.containsKey(entry.getKey())) { - Data data = new Data(); - data.setValue(entry.getValue()); - data.setItemStyle(new ItemStyle(new Normal(true,riskColorMap.get(entry.getKey())),null)); - subGroupRiskDataList.add(data); - } else { - subGroupRiskDataList.add(entry.getValue()); - } - } - - Series subgroupRiskSeries = new Series(); - subgroupRiskSeries.setName("高危人数"); - subgroupRiskSeries.setType("bar"); - subgroupRiskSeries.setData(subGroupRiskDataList); - subGroupRiskOption.getSeries().clear(); - subGroupRiskOption.getSeries().add(subgroupRiskSeries); - } catch (Exception e) { - e.printStackTrace(); - } - } +// for (String areaName:subMapsData.keySet()) { +// try { +// Option subGroupRiskOption = new Option(); +// BeanUtils.copyProperties(groupRiskOption, subGroupRiskOption); +// groupRiskOptionMap.put(areaName, subGroupRiskOption); +// subGroupRiskOption.getTitle().setText(areaName + subGroupRiskOption.getTitle().getText()); +// subGroupRiskOption.getyAxis().getData().clear(); +// // 按MAP的value排序 +// List> subListData = new ArrayList>(subMapsData.get(areaName).entrySet()); +// Collections.sort(subListData, new Comparator>() { +// public int compare(Map.Entry o1, Map.Entry o2) { +// if (o2.getValue() != null && o1.getValue() != null && o2.getValue().compareTo(o1.getValue()) > 0) { +// return -1; +// } else { +// return 1; +// } +// } +// }); +// +// List subGroupRiskDataList = new ArrayList<>(); +// n = listData.size(); +// for (Map.Entry entry:subListData) { +// n--; +// if (n>28) { +// continue; +// } +// subGroupRiskOption.getyAxis().getData().add(entry.getKey()); +// if (riskColorMap.containsKey(entry.getKey())) { +// Data data = new Data(); +// data.setValue(entry.getValue()); +// data.setItemStyle(new ItemStyle(new Normal(true,riskColorMap.get(entry.getKey())),null)); +// subGroupRiskDataList.add(data); +// } else { +// subGroupRiskDataList.add(entry.getValue()); +// } +// } +// +// Series subgroupRiskSeries = new Series(); +// subgroupRiskSeries.setName("高危人数"); +// subgroupRiskSeries.setType("bar"); +// subgroupRiskSeries.setData(subGroupRiskDataList); +// subGroupRiskOption.getSeries().clear(); +// subGroupRiskOption.getSeries().add(subgroupRiskSeries); +// } catch (Exception e) { +// e.printStackTrace(); +// } +// } Map> patientMonthMap = new HashMap<>();