From a2bd6756b1d40f48b3ca94d2b38b05f0c74c2125 Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Wed, 29 Nov 2017 18:38:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/controller/ReportController.java   |  4 ++--
 .../web/service/impl/ReportServiceImpl.java        | 22 +++++++++++++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java
index 76c899d..43fa199 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java
@@ -42,7 +42,7 @@ public class ReportController extends BaseController {
     @ResponseBody
     @TokenRequired
     @RequestMapping(value = "/patients", method = RequestMethod.GET)
-    public BaseObjectResponse patients(@RequestParam String provinceId, String cityId, String areaId, String streetId, @RequestParam Integer statistType, Integer statistVal,
+    public BaseObjectResponse patients(@RequestParam String provinceId, String cityId, String areaId, String streetId, Integer statistType, Integer statistVal,
                                        Integer ageType, Integer patientType, Date startDate, Date endDate, HttpServletRequest request) {
         return reportService.patients(provinceId, cityId, areaId, streetId, statistType, statistVal, ageType, patientType, startDate, endDate, getUserId(request));
     }
@@ -57,7 +57,7 @@ public class ReportController extends BaseController {
     @ResponseBody
     @TokenRequired
     @RequestMapping(value = "/patients/export", method = RequestMethod.GET)
-    public void patientsExport(String provinceId, String cityId, String areaId, String streetId, @RequestParam Integer statistType,
+    public void patientsExport(String provinceId, String cityId, String areaId, String streetId, Integer statistType,
                                Integer ageType, Integer patientType, Date startDate, Date endDate, HttpServletRequest request, HttpServletResponse response) {
         reportService.patientsExport(provinceId, cityId, areaId, streetId, statistType, ageType, patientType, startDate, endDate, getUserId(request), response);
 //        reportService.patientsExport(provinceId, cityId, aredId, streetId, statistType, ageType, patientType, startDate, endDate, 1000000185, response);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
index 2980967..916d30e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
@@ -196,6 +196,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
         Map<String, Object> restMap = new HashMap<>();
         List<List<String>> tabList = new ArrayList<>();
         List<String> titleList = new ArrayList<>();
+        List<String> countList = new ArrayList<>();
         List<String> xDatas = new ArrayList<>();
         List<Map<String, Object>> series = new ArrayList<>();
         List<String> legend = Arrays.asList("建档总数");
@@ -349,6 +350,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
 
         tabList.add(0, titleList);
         setTabListInfo(tabList, StringUtils.isNotEmpty(aredId) ? 2 : 3);
+        setCountList(tabList, countList, StringUtils.isNotEmpty(aredId) ? 3 : 4);
 
         barMap.put("data", bar);
         barMap.put("type", "bar");
@@ -436,11 +438,29 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
         return RespBuilder.buildSuccess(restMap);
     }
 
+    private void setCountList(List<List<String>> tabList, List<String> countList, int index) {
+        countList.add(tabList.size() + "");
+        countList.add("合计");
+        countList.add("建档总数");
+        if(tabList.size() > 1) {
+            for (int i = index; i < tabList.get(0).size(); i++) {
+                int count = 0;
+                for (int j = 1; j < tabList.size(); j++) {
+                    count += Integer.parseInt(tabList.get(j).get(i));
+                }
+                countList.add(count + "");
+            }
+
+        }
+        tabList.add(countList);
+
+    }
+
     private void setTabListInfo(List<List<String>> tabList, int index) {
         if(CollectionUtils.isNotEmpty(tabList)) {
+            int seq = 0;
             for (int i = 0; i < tabList.size(); i++) {
                 List<String> list = tabList.get(i);
-                int seq = 0;
                 if(i == 0) {
                     list.add(0, "序号" );
                     list.add("合计");
-- 
1.8.3.1