Commit e095eb0e271a93302ff328ea49a9d9a817efa41f
1 parent
34bc400be8
Exists in
master
and in
8 other branches
add statistics(map) common index (area data)
Showing 1 changed file with 4 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java
View file @
e095eb0
... | ... | @@ -687,7 +687,9 @@ |
687 | 687 | |
688 | 688 | for (String areaName:subMapsData.keySet()) { |
689 | 689 | try { |
690 | - Option subGroupRiskOption = (Option)BeanUtils.cloneBean(groupRiskOption); | |
690 | + Option subGroupRiskOption = new Option(); | |
691 | + BeanUtils.copyProperties(groupRiskOption, subGroupRiskOption); | |
692 | + groupRiskOptionMap.put(areaName, subGroupRiskOption); | |
691 | 693 | subGroupRiskOption.getTitle().setText(areaName + subGroupRiskOption.getTitle().getText()); |
692 | 694 | subGroupRiskOption.getyAxis().getData().clear(); |
693 | 695 | // 按MAP的value排序 |
... | ... | @@ -910,7 +912,7 @@ |
910 | 912 | result.put("reportMonthOption", reportMonthOption); |
911 | 913 | result.put("groupRiskMonthOption", groupRiskMonthOption); |
912 | 914 | |
913 | - result.put("groupRiskOptionMap", groupRiskOptionMap); | |
915 | + result.put("riskOptionMap", groupRiskOptionMap); | |
914 | 916 | result.put("patientMonthOptionMap", patientMonthOptionMap); |
915 | 917 | result.put("reportMonthOptionMap", reportMonthOptionMap); |
916 | 918 | result.put("groupRiskMonthOptionMap", groupRiskMonthOptionMap); |