From a53069862c4ac19d165896bfda07321c01b6da5e Mon Sep 17 00:00:00 2001
From: baohanddd <baohanddd@gmail.com>
Date: Thu, 7 Jul 2016 11:17:10 +0800
Subject: [PATCH] add statistics(map) common index

---
 .../operate/web/controller/StatisticsController.java         | 12 +++++-------
 1 file changed, 5 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 ef61705..edc74d2 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
@@ -74,7 +74,7 @@ public class StatisticsController extends BaseController {
             Map<String, Integer> mapsData = new HashMap<>();
             Map<String, String> riskColorMap = new HashMap<>();
 
-            Option areaBarOption = buildyBarOption("建档&高危人数", null);
+            Option areaBarOption = buildyBarOption("建档及高危人数", null);
             areaBarOption.getLegend().getData().add("近30天建档人数");
             areaBarOption.getLegend().getData().add("当前高危总人数");
             areaBarOption.getLegend().setOrient("horizontal");
@@ -136,11 +136,10 @@ public class StatisticsController extends BaseController {
             option.getLegend().setTop("50px");
             List<Object> seriesList = new ArrayList<>();
             Series series = new Series();
-            series.setName("建档&高危数");
+            series.setName("建档及高危数");
             series.setType("map");
             series.setMapType("china");
             series.setRoam(false);
-            series.setLabel(label);
             series.setData(dataList);
             seriesList.add(series);
             option.setSeries(seriesList);
@@ -154,7 +153,6 @@ public class StatisticsController extends BaseController {
             Series groupRiskSeries = new Series();
             groupRiskSeries.setName("高危人数");
             groupRiskSeries.setType("bar");
-            groupRiskSeries.setLabel(label);
             mapsData.clear();
             for (AreaData areaData:currentRiskList) {
                 String groupName = areaData.getGroupName().replace("预警", "");
@@ -184,7 +182,7 @@ public class StatisticsController extends BaseController {
             int n = listData.size();
             for (Map.Entry<String, Integer> entry:listData) {
                 n--;
-                if (n>20) {
+                if (n>28) {
                     continue;
                 }
                 groupRiskOption.getyAxis().getData().add(entry.getKey());
@@ -229,7 +227,7 @@ public class StatisticsController extends BaseController {
                 }
             }
             patientMonthMap.put("建档人数", pmap);
-            Option patientMonthOption = buildLineOption("建档&高危人数", null, patientMonthMap, buildDefaultMonth(12));
+            Option patientMonthOption = buildLineOption("建档及高危人数", null, patientMonthMap, buildDefaultMonth(12));
 
             // 按省或市或地区查询区域内近12个自然月每月初诊人数、复诊人数
             query = new AreaDataQuery();
@@ -252,7 +250,7 @@ public class StatisticsController extends BaseController {
             }
             reportMonthMap.put("复诊人数", secondmap);
             reportMonthMap.put("初诊人数", firstmap);
-            Option reportMonthOption = buildLineOption("初诊&复诊人数", null, reportMonthMap, buildDefaultMonth(12));
+            Option reportMonthOption = buildLineOption("初诊及复诊人数", null, reportMonthMap, buildDefaultMonth(12));
 
 
             // 近6个月高危数据（按颜色分组）
-- 
1.8.3.1