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 ba8a287..953a41b 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,52 @@ 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<Map.Entry<String, Integer>> subListData = new ArrayList<Map.Entry<String, Integer>>(subMapsData.get(areaName).entrySet());
-//                    Collections.sort(subListData, new Comparator<Map.Entry<String, Integer>>() {
-//                        public int compare(Map.Entry<String, Integer> o1, Map.Entry<String, Integer> o2) {
-//                            if (o2.getValue() != null && o1.getValue() != null && o2.getValue().compareTo(o1.getValue()) > 0) {
-//                                return -1;
-//                            } else {
-//                                return 1;
-//                            }
-//                        }
-//                    });
-//
-//                    List<Object> subGroupRiskDataList = new ArrayList<>();
-//                    n = listData.size();
-//                    for (Map.Entry<String, Integer> 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();
+                    groupRiskOption.getTooltip().setShow(true);
+                    List<Object> subGroupRiskSeriesList = new ArrayList<>();
+                    Series subGroupRiskSeries = new Series();
+                    subGroupRiskSeries.setName("高危人数");
+                    subGroupRiskSeries.setType("bar");
+                    // 按MAP的value排序
+                    List<Map.Entry<String, Integer>> subListData = new ArrayList<Map.Entry<String, Integer>>(subMapsData.get(areaName).entrySet());
+                    Collections.sort(subListData, new Comparator<Map.Entry<String, Integer>>() {
+                        public int compare(Map.Entry<String, Integer> o1, Map.Entry<String, Integer> o2) {
+                            if (o2.getValue() != null && o1.getValue() != null && o2.getValue().compareTo(o1.getValue()) > 0) {
+                                return -1;
+                            } else {
+                                return 1;
+                            }
+                        }
+                    });
+
+                    List<Object> subGroupRiskDataList = new ArrayList<>();
+                    n = subListData.size();
+                    for (Map.Entry<String, Integer> 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());
+                        }
+                    }
+
+                    subGroupRiskSeries.setData(subGroupRiskDataList);
+                    subGroupRiskSeriesList.add(subGroupRiskSeries);
+                    subGroupRiskOption.setSeries(subGroupRiskSeriesList);
+                    groupRiskOptionMap.put(areaName, subGroupRiskOption);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
 
 
             Map<String, Map<String, Integer>> patientMonthMap = new HashMap<>();
@@ -896,7 +895,7 @@ public class StatisticsController extends BaseController {
             Option groupRiskMonthOption = buildxBarOption("高危历史人数", null, groupRiskMonthMap, buildDefaultMonth(6), colormap);
 
             for (String areaName:subGroupRiskMonthMap.keySet()) {
-                groupRiskMonthOptionMap.put(areaName, buildLineOption(areaName + "高危历史人数", null, subGroupRiskMonthMap.get(areaName), buildDefaultMonth(12)));
+                groupRiskMonthOptionMap.put(areaName, buildxBarOption(areaName + "高危历史人数", null, subGroupRiskMonthMap.get(areaName), buildDefaultMonth(6), colormap));
             }