shiyang / regional-platform

Download as
Browse Code »

Commit dcfdb01d275583a3e370d0c1bb8799685c476b00

Authored by liquanyu
2 parents 512b558ceb 9b4e49f98a
Exists in master and in 1 other branch nobuildprocess

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 @ dcfdb01
... ... @@ -65,7 +65,24 @@
65 65 List<AreaData> provincePatientList = statisticsService.queryProvincePatients();
66 66 Map<String, String> kvData = new HashMap<>();
67 67 Map<String, Integer> mapsData = new HashMap<>();
68   - for (AreaData areaData:provincePatientList) {
  68 +
  69 + Option areaBarOption = buildBarOption("建档&高危人数", null);
  70 + List<Object> areaBarSeriesList = new ArrayList<>();
  71 + Series patientSeries = new Series();
  72 + patientSeries.setName("建档人数");
  73 + patientSeries.setType("bar");
  74 + List<Object> patientDataList = new ArrayList<>();
  75 + patientSeries.setData(patientDataList);
  76 + Series riskSeries = new Series();
  77 + riskSeries.setName("高危人数");
  78 + riskSeries.setType("bar");
  79 + List<Object> riskDataList = new ArrayList<>();
  80 + riskSeries.setData(riskDataList);
  81 + areaBarSeriesList.add(patientSeries);
  82 + areaBarSeriesList.add(riskSeries);
  83 + areaBarOption.setSeries(areaBarSeriesList);
  84 +
  85 + for (AreaData areaData:provinceRiskList) {
69 86 String rigino = areaData.getProvinceName().replace("市", "").replace("省", "");
70 87 if (mapsData.get(rigino) == null) {
71 88 mapsData.put(rigino, areaData.getVal());
72 89  
73 90  
74 91  
... ... @@ -74,14 +91,18 @@
74 91 mapsData.put(rigino, mapsData.get(rigino) + areaData.getVal());
75 92 }
76 93 }
77   - for (AreaData areaData:provinceRiskList) {
  94 + for (AreaData areaData:provincePatientList) {
78 95 String rigino = areaData.getProvinceName().replace("市", "").replace("省", "");
79 96 if (mapsData.get(rigino) == null) {
  97 + riskDataList.add(0);
80 98 mapsData.put(rigino, areaData.getVal());
81 99 kvData.put(rigino, areaData.getProvinceId());
82 100 } else {
  101 + riskDataList.add(mapsData.get(rigino));
83 102 mapsData.put(rigino, mapsData.get(rigino) + areaData.getVal());
84 103 }
  104 + areaBarOption.getyAxis().getData().add(rigino);
  105 + patientDataList.add(areaData.getVal());
85 106 }
86 107  
87 108 List<Object> dataList = new ArrayList<>();
... ... @@ -109,6 +130,7 @@
109 130 seriesList.add(series);
110 131 option.setSeries(seriesList);
111 132  
  133 +
112 134 // 高危数据
113 135 List<AreaData> currentRiskList = statisticsService.queryRisks(new AreaDataQuery());
114 136 Option groupRiskOption = buildBarOption("当前高危人数", null);
... ... @@ -145,6 +167,7 @@
145 167 result.put("type", 1);
146 168 result.put("kvData", kvData);
147 169 result.put("mapsOption", option);
  170 + result.put("areaBarOption", areaBarOption);
148 171 result.put("groupRiskOption", groupRiskOption);
149 172 ResultUtils.buildSuccessResultAndWrite(response, result);
150 173 }
... ... @@ -201,6 +224,10 @@
201 224 option.setLegend(legend);
202 225 Grid grid = new Grid();
203 226 grid.setContainLabel(true);
  227 + grid.setTop("55px");
  228 + grid.setLeft("3%");
  229 + grid.setRight("3%");
  230 + grid.setBottom("3%");
204 231 option.setGrid(grid);
205 232 AxisPointer xAxis = new AxisPointer();
206 233 xAxis.setType("value");
... ... @@ -212,11 +239,6 @@
212 239 AxisPointer yAxis = new AxisPointer();
213 240 yAxis.setType("category");
214 241 List<Object> dataList = new ArrayList<Object>();
215   - dataList.add("其他");
216   - dataList.add("黄色");
217   - dataList.add("橙色");
218   - dataList.add("红色");
219   - dataList.add("紫色");
220 242 yAxis.setData(dataList);
221 243 option.setyAxis(yAxis);
222 244 return option;