From c8369419f06ec39db0d0b50d1b263f153cb5ee87 Mon Sep 17 00:00:00 2001
From: litao <litao@lymsh.com>
Date: Fri, 21 Apr 2017 16:56:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=A3=80=E5=8C=BB=E7=94=9F=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/hospitalapi/pojo/ReportModel.java     |  6 ++--
 .../web/service/impl/ReportServiceImpl.java        | 37 ++++++++++------------
 2 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/ReportModel.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/ReportModel.java
index e918c8a..c0e3df2 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/ReportModel.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/ReportModel.java
@@ -22,7 +22,7 @@ public class ReportModel {
     /** 其他数据 */
     private List<Object> data;
 
-    private List<Map<String, List<Object>>> doctorInfo;
+    private List<Object> doctorInfo;
 
     public List<String> getxAxis() {
         return xAxis;
@@ -56,11 +56,11 @@ public class ReportModel {
         this.data = data;
     }
 
-    public List<Map<String, List<Object>>> getDoctorInfo() {
+    public List<Object> getDoctorInfo() {
         return doctorInfo;
     }
 
-    public void setDoctorInfo(List<Map<String, List<Object>>> doctorInfo) {
+    public void setDoctorInfo(List<Object> doctorInfo) {
         this.doctorInfo = doctorInfo;
     }
 }
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 7e2594b..341125f 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
@@ -46,7 +46,7 @@ public class ReportServiceImpl implements IReportService {
         ReportModel reportModel = new ReportModel();
         List<Object> params = new ArrayList<>();
         List<Object> doctorNames = new ArrayList<>();
-        List<Map<String, List<Object>>> doctorInfo = new ArrayList<>();
+        List<Object> doctorInfo = new ArrayList<>();
 
         List<Map<String, Object>> restList = reportDao.findList(getDoctorMedicalSql(startDate, endDate, childBirth, params), params);
 
@@ -60,14 +60,10 @@ public class ReportServiceImpl implements IReportService {
         return rest;
     }
 
-    private List<Map<String,Object>> createDoctorGrid(List<Map<String, Object>> restList, List<Object> doctorNames, List<Map<String, List<Object>>> doctorInfo) {
+    private List<Map<String,Object>> createDoctorGrid(List<Map<String, Object>> restList, List<Object> doctorNames, List<Object> doctorInfo) {
         List<Map<String,Object>> grid = new ArrayList<>();
-//        List<Object> inspectPeoples = new ArrayList<>(); /** 产检人数集合 */
-//        List<Object> twicePeoples = new ArrayList<>(); /** 产检人数集合 */
-//        List<Object> fiveTimesPeoples = new ArrayList<>(); /** 产检人数集合 */
         for (Map<String, Object> map : restList) {
             Map<String, Object> data = new HashMap<>();
-            Map<String,List<Object>> doctor = new HashMap<>();
             List<Object> doctorList = new ArrayList<>();
             Object doctorName = map.get("DOCTOR_NAME");
             if(doctorName != null && StringUtils.isNotBlank(doctorName.toString())) {
@@ -75,7 +71,10 @@ public class ReportServiceImpl implements IReportService {
             } else {
                 data.put("doctorName", "");
             }
-            doctorNames.add(doctorName);
+
+            if(!"总计".equals(doctorName + "")) {
+                doctorNames.add(doctorName);
+            }
 
             Object inspectTime = map.get("CJ_RC");
             if(inspectTime != null && StringUtils.isNotBlank(inspectTime.toString())) {
@@ -98,11 +97,16 @@ public class ReportServiceImpl implements IReportService {
             }
             grid.add(data);
 
-            doctorList.add(inspectPeople);
-            doctorList.add(twice);
-            doctorList.add(fiveTimes);
-            doctor.put(doctorName + "", doctorList);
-            doctorInfo.add(doctor);
+            if(!"总计".equals(doctorName + "")) {
+                Map<String, Object> doctorMap = new HashMap<>();
+                doctorList.add(inspectPeople);
+                doctorList.add(twice);
+                doctorList.add(fiveTimes);
+                doctorMap.put("name", doctorName);
+                doctorMap.put("type", "bar");
+                doctorMap.put("data", doctorList);
+                doctorInfo.add(doctorMap);
+            }
         }
 
         /** 把总计放到第一位 */
@@ -118,24 +122,15 @@ public class ReportServiceImpl implements IReportService {
         for (Map<String, Object> map : grid) {
             map.put("id", i++);
 
-            if(map.containsKey("inspectPeople")) {
-//                inspectPeoples.add(map.get("inspectPeople"));
-            }
-
             if(map.containsKey("twice")) { /** 两次以上比例 */
                 map.put("twiceProportion", MathUtil.getProportion(map.get("twice"), map.get("inspectPeople")));
-//                twicePeoples.add(map.get("twice"));
             }
 
             if(map.containsKey("fiveTimes")) { /** 五次以上比例 */
                 map.put("fiveTimeProportion", MathUtil.getProportion(map.get("fiveTimes"), map.get("inspectPeople")));
-//                fiveTimesPeoples.add(map.get("fiveTimes"));
             }
         }
 
-//        peoples.put("fiveTimesPeoples", fiveTimesPeoples);
-//        peoples.put("twicePeoples", twicePeoples);
-//        peoples.put("inspectPeoples", inspectPeoples );
         return grid;
     }
 
-- 
1.8.3.1