From 61e5d61f1c748e5a558210fbe474190812dcaf9c Mon Sep 17 00:00:00 2001
From: gengxiaokai <gengxiaokai@lymsh.com>
Date: Mon, 3 Apr 2017 21:19:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/hospitalapi/qhdfy/QhdfyHisService.java  | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
index 8d2b272..d8e5182 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
@@ -458,7 +458,7 @@ public class QhdfyHisService {
             return CheckByDate;
 
         }else{
-            List<CheckResponse> result = new ArrayList<>();
+            List<CheckResponse> result = new ArrayList<CheckResponse>();
             List<CheckByDate> CheckByDate=new ArrayList<CheckByDate>();
             List<CheckType> CheckType=new ArrayList<CheckType>();
             result.addAll(l);
@@ -527,7 +527,7 @@ public class QhdfyHisService {
                 for(String typ:listtype){
                     List<CheckResponse> result2=new ArrayList<>();
                     CheckType CheckType1=new CheckType();
-                    CheckType1.setType(typ);
+                    //CheckType1.setType(typ);
                     for(CheckResponse chre:result){
                         if(type.equals(chre.getType().toString()) && typ.equals(chre.getTitle())){
                             chre.setTitle(DateUtil.getyyyy_MM_dd(chre.getModified())+" "+chre.getTitle());
@@ -537,8 +537,12 @@ public class QhdfyHisService {
                         }
 
                     }
-                    CheckType1.setTypeName(result2);
-                    CheckType.add(CheckType1);
+                    if(result2.size()>0){
+                        CheckType1.setType(typ);
+                        CheckType1.setTypeName(result2);
+                        CheckType.add(CheckType1);
+                    }
+
                 }
 
 
@@ -559,6 +563,14 @@ public class QhdfyHisService {
 
             }
 
+            for(String typ:listtype){
+
+
+            }
+
+
+
+
 
             return CheckByDate;
         }
-- 
1.8.3.1