From 2117c52aae5e523b83328bbd95fea136db4f0556 Mon Sep 17 00:00:00 2001
From: baohanddd <baohanddd@gmail.com>
Date: Wed, 6 Jul 2016 16:18:19 +0800
Subject: [PATCH] add statistics(map) common index

---
 .../operate/web/controller/StatisticsController.java     | 16 +++++++++++++++-
 .../src/main/resources/reportOrm/StatisticsMapper.xml    |  2 +-
 2 files changed, 16 insertions(+), 2 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 2751ac5..fc500d8 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
@@ -200,7 +200,6 @@ public class StatisticsController extends BaseController {
             // 4. 按省或市或地区查询区域内近12个自然月每月建档人数
             List<AreaData> patientMonthList = statisticsService.queryMonthPatients(new AreaDataQuery());
             Map<String, Map<String, Integer>> patientMonthMap = new HashMap<>();
-
             Map<String, Integer> pmap = new HashMap<>();
             for (AreaData areaData:patientMonthList) {
                 String month = buildMonth(areaData.getYear());
@@ -211,6 +210,21 @@ public class StatisticsController extends BaseController {
                 }
             }
             patientMonthMap.put("建档人数", pmap);
+            // 6. 按省或市或地区查询区域内近12个自然月每月产检中历史高危人数（按颜色分组）
+            AreaDataQuery query = new AreaDataQuery();
+            query.setDays(12);
+            List<AreaData> riskMonthList = statisticsService.queryHrefYearRisks(query);
+            Map<String, Integer> rmap = new HashMap<>();
+            for (AreaData areaData:riskMonthList) {
+                String month = buildMonth(areaData.getYear());
+                if (rmap.containsKey(month)) {
+                    rmap.put(month, rmap.get(month) + areaData.getVal());
+                } else {
+                    rmap.put(month, areaData.getVal());
+                }
+            }
+            patientMonthMap.put("高危人数", rmap);
+
 
             Option patientMonthOption = buildLineOption("建档&高危人数", null, patientMonthMap, buildDefaultMonth(12));
 
diff --git a/platform-reportData/src/main/resources/reportOrm/StatisticsMapper.xml b/platform-reportData/src/main/resources/reportOrm/StatisticsMapper.xml
index 58e27d9..09ce2ab 100644
--- a/platform-reportData/src/main/resources/reportOrm/StatisticsMapper.xml
+++ b/platform-reportData/src/main/resources/reportOrm/StatisticsMapper.xml
@@ -549,7 +549,7 @@ ORDER BY E.YEAR_MONTH
         AND F.HIGH_RISK_GROUP<>'其他'
         AND B.EXAMINE_HISTORY_NUM=1
         AND B.INSERT_DATE<=TRUNC(SYSDATE)
-        AND B.INSERT_DATE>=TRUNC(ADD_MONTHS(SYSDATE,-12))
+        AND B.INSERT_DATE>=TRUNC(ADD_MONTHS(SYSDATE,-${days}))
          ]]>
         <if test="provinceId != null and provinceId != ''">
             AND D.PROVINCE_ID=#{provinceId}
-- 
1.8.3.1