From f9905e0aadb3aea5bbb23f1b88714a63ae7e62d8 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 23 Dec 2016 10:36:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E6=A3=80=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/AntenatalExaminationFacade.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 43c2bb7..c653b41 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -74,10 +74,7 @@ public class AntenatalExaminationFacade { */ public String handHideBuild(String pid, String parentId, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); - //修改时不为空 - if (StringUtils.isNotEmpty(parentId)) { - return parentId; - } + List li = new ArrayList(); li.add(hospitalId); Patients patients = findOnePatient(null, null, null, li, 1, false, pid, true); @@ -86,6 +83,13 @@ public class AntenatalExaminationFacade { return patients.getId(); } + Patients patients1= patientsService.findOnePatientById(parentId); + + if(patients1.getHospitalId().equals(hospitalId)){ + return patients1.getId(); + } + + //表示区域的 if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId)) && StringUtils.isNotEmpty(pid)) { patients = findOnePatient(null, null, null, null, 1, false, pid, false); @@ -300,6 +304,8 @@ public class AntenatalExaminationFacade { //打印日志 } antExChuModel.setParentId(parentId); + excAddRequest.setParentId(parentId); + } antExChuModel.setOperator(userId); if (StringUtils.isNotEmpty(antExChuModel.getId()) && StringUtils.isNotEmpty(antExChuModel.getParentId())) { -- 1.8.3.1