From 946a3e8ac218734aa3739435ee87d3ef4fe6a449 Mon Sep 17 00:00:00 2001
From: baohanddd <baohanddd@gmail.com>
Date: Sat, 2 Jul 2016 14:54:45 +0800
Subject: [PATCH] add statistics(map) common index

---
 .../web/controller/StatisticsController.java       | 32 +++++++++++++++++-----
 1 file changed, 25 insertions(+), 7 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 39da709..85b5863 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,7 +65,17 @@ public class StatisticsController extends BaseController {
             List<AreaData> provincePatientList = statisticsService.queryProvincePatients();
             Map<String, String> kvData = new HashMap<>();
             Map<String, Integer> mapsData = new HashMap<>();
-            for (AreaData areaData:provincePatientList) {
+            Option areaBarOption = buildBarOption("建档&高危人数", null);
+            List<Object> areaBarSeriesList = new ArrayList<>();
+            Series patientSeries = new Series();
+            patientSeries.setName("建档人数");
+            patientSeries.setType("bar");
+            List<Object> patientDataList = new ArrayList<>();
+            Series riskSeries = new Series();
+            riskSeries.setName("高危人数");
+            riskSeries.setType("bar");
+            List<Object> riskDataList = new ArrayList<>();
+            for (AreaData areaData:provinceRiskList) {
                 String rigino = areaData.getProvinceName().replace("市", "").replace("省", "");
                 if (mapsData.get(rigino) == null) {
                     mapsData.put(rigino, areaData.getVal());
@@ -74,15 +84,22 @@ public class StatisticsController extends BaseController {
                     mapsData.put(rigino, mapsData.get(rigino) + areaData.getVal());
                 }
             }
-            for (AreaData areaData:provinceRiskList) {
+            for (AreaData areaData:provincePatientList) {
                 String rigino = areaData.getProvinceName().replace("市", "").replace("省", "");
                 if (mapsData.get(rigino) == null) {
+                    riskDataList.add(0);
                     mapsData.put(rigino, areaData.getVal());
                     kvData.put(rigino, areaData.getProvinceId());
                 } else {
+                    riskDataList.add(mapsData.get(rigino));
                     mapsData.put(rigino, mapsData.get(rigino) + areaData.getVal());
                 }
+                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();
@@ -109,6 +126,7 @@ public class StatisticsController extends BaseController {
             seriesList.add(series);
             option.setSeries(seriesList);
 
+
             // 高危数据
             List<AreaData> currentRiskList = statisticsService.queryRisks(new AreaDataQuery());
             Option groupRiskOption = buildBarOption("当前高危人数", null);
@@ -145,6 +163,7 @@ public class StatisticsController extends BaseController {
             result.put("type", 1);
             result.put("kvData", kvData);
             result.put("mapsOption", option);
+            result.put("areaBarOption", areaBarOption);
             result.put("groupRiskOption", groupRiskOption);
             ResultUtils.buildSuccessResultAndWrite(response, result);
         }
@@ -201,6 +220,10 @@ public class StatisticsController extends BaseController {
         option.setLegend(legend);
         Grid grid = new Grid();
         grid.setContainLabel(true);
+        grid.setTop("55px");
+        grid.setLeft("3%");
+        grid.setRight("3%");
+        grid.setBottom("3%");
         option.setGrid(grid);
         AxisPointer xAxis = new AxisPointer();
         xAxis.setType("value");
@@ -212,11 +235,6 @@ public class StatisticsController extends BaseController {
         AxisPointer yAxis = new AxisPointer();
         yAxis.setType("category");
         List<Object> dataList = new ArrayList<Object>();
-        dataList.add("其他");
-        dataList.add("黄色");
-        dataList.add("橙色");
-        dataList.add("红色");
-        dataList.add("紫色");
         yAxis.setData(dataList);
         option.setyAxis(yAxis);
         return option;
-- 
1.8.3.1