From 33667ab80fe06a78aeb39a7d4a8bbdfe59ca0d2e Mon Sep 17 00:00:00 2001 From: yangfei Date: Tue, 28 Nov 2017 16:31:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java | 2 ++ .../java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java index a3296b9..ff7fc2c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java @@ -81,6 +81,7 @@ public class MatdeliverFollowFacade { map.put("time", maternalDeliverModel.getDueDate()); map.put("title", "分娩记录"); map.put("id", id); + map.put("hospitalId", maternalDeliverModel.getHospitalId()); //分娩记录类型 map.put("type", "1"); resutList.add(map); @@ -94,6 +95,7 @@ public class MatdeliverFollowFacade { map.put("time", DateUtil.getyyyy_MM_dd(md.getVisitCreateDate()==null?md.getUpdateDate():md.getVisitCreateDate())); map.put("title", "访视记录"); map.put("id", md.getId()); + map.put("hospitalId", md.getHospitalId()); //访视记录类型 map.put("type", "2"); resutList.add(map); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index 96e649b..fb0d794 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -693,7 +693,7 @@ public class PatientServiceFacade { List hospitalDoctServices=hospitalDoctServiceService.queryHospitalDoctService(hospitalDoctServiceQuery); //判断是否有数据 - if(CollectionUtils.isNotEmpty(hospitalServiceContents)) { + if(CollectionUtils.isNotEmpty(hospitalDoctServices)) { for(HospitalDoctService hospitalServiceContent:hospitalDoctServices){ hospitalDoctService.add(convert(hospitalServiceContent)); } -- 1.8.3.1