From afd92dfc8f40661a24486c82fed09e0c5493b191 Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Tue, 4 Apr 2017 11:14:01 +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 --- .../java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 25ae848..bbab86a 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 @@ -285,7 +285,7 @@ public class QhdfyHisService { */ public List queryCheckListupdate(String cardNo,int ftype){ - CheckResponse check1=new CheckResponse(); + /* CheckResponse check1=new CheckResponse(); check1.setHospitalName("秦皇岛妇幼保健"); check1.setModified(DateUtil.parseYMDHMS("2017-3-31 10:20:58")); check1.setType(1); @@ -365,15 +365,15 @@ public class QhdfyHisService { List l=new ArrayList(); l.add(check1); l.add(check10); - l.add(check9); + l.add(check9);*/ if(1==ftype){ List result = new ArrayList<>(); List CheckByDate=new ArrayList(); //List CheckType=new ArrayList(); - result.addAll(l); - //result.addAll(queryLisCheckList(cardNo));解开 + //result.addAll(l); + result.addAll(queryLisCheckList(cardNo)); //result.addAll(queryPacsCheckList(cardNo)); List keyList = new ArrayList<>(); // 去重 @@ -462,8 +462,8 @@ public class QhdfyHisService { List result = new ArrayList(); List CheckByDate=new ArrayList(); //List CheckType=new ArrayList(); - result.addAll(l); - //result.addAll(queryLisCheckList(cardNo));解开 + //result.addAll(l); + result.addAll(queryLisCheckList(cardNo)); //result.addAll(queryPacsCheckList(cardNo)); List keyList = new ArrayList<>(); List listtype=new ArrayList<>(); -- 1.8.3.1