From 9b4e49f98a78e7ee5e1b3fd7455c84b9e017c7c2 Mon Sep 17 00:00:00 2001
From: baohanddd <baohanddd@gmail.com>
Date: Sat, 2 Jul 2016 15:03:12 +0800
Subject: [PATCH] add statistics(map) common index

---
 .../platform/operate/web/controller/StatisticsController.java  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

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 85b5863..8619a35 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
@@ -65,16 +65,23 @@ public class StatisticsController extends BaseController {
             List<AreaData> provincePatientList = statisticsService.queryProvincePatients();
             Map<String, String> kvData = new HashMap<>();
             Map<String, Integer> mapsData = new HashMap<>();
+
             Option areaBarOption = buildBarOption("建档&高危人数", null);
             List<Object> areaBarSeriesList = new ArrayList<>();
             Series patientSeries = new Series();
             patientSeries.setName("建档人数");
             patientSeries.setType("bar");
             List<Object> patientDataList = new ArrayList<>();
+            patientSeries.setData(patientDataList);
             Series riskSeries = new Series();
             riskSeries.setName("高危人数");
             riskSeries.setType("bar");
             List<Object> riskDataList = new ArrayList<>();
+            riskSeries.setData(riskDataList);
+            areaBarSeriesList.add(patientSeries);
+            areaBarSeriesList.add(riskSeries);
+            areaBarOption.setSeries(areaBarSeriesList);
+
             for (AreaData areaData:provinceRiskList) {
                 String rigino = areaData.getProvinceName().replace("市", "").replace("省", "");
                 if (mapsData.get(rigino) == null) {
@@ -97,9 +104,6 @@ public class StatisticsController extends BaseController {
                 areaBarOption.getyAxis().getData().add(rigino);
                 patientDataList.add(areaData.getVal());
             }
-            areaBarSeriesList.add(patientDataList);
-            areaBarSeriesList.add(riskDataList);
-            areaBarOption.setSeries(areaBarSeriesList);
 
             List<Object> dataList = new ArrayList<>();
             Set<String> set = mapsData.keySet();
-- 
1.8.3.1