From 14f63a52c746b72c2b008a314b7af854202c8ed6 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 9 Jan 2017 10:17:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E4=BD=9C=E5=BA=9F=E4=BA=A7?= =?UTF-8?q?=E6=A3=80=E5=8A=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/facade/AntenatalExaminationFacade.java | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 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 bce6d65..993d06b 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 @@ -78,23 +78,21 @@ public class AntenatalExaminationFacade { public String handHideBuild(String pid, String parentId, Integer userId, int type) { String hospitalId = autoMatchFacade.getHospitalId(userId); Patients patients=null; - if(StringUtils.isNotEmpty(pid)){ - List li = new ArrayList(); - li.add(hospitalId); - patients = findOnePatient(null, null, null, li, type, false, pid, true); - //表示本院已经有隐藏建档 - if (null != patients) { - return patients.getId(); - } - } - Patients patients1 = patientsService.findOnePatientById(parentId); - + if(StringUtils.isEmpty(pid)){ + pid=patients1.getPid(); + } + List li = new ArrayList(); + li.add(hospitalId); + patients = findOnePatient(null, null, null, li, type, false, pid, true); + //表示本院已经有隐藏建档 + if (null != patients) { + return patients.getId(); + } if (patients1.getHospitalId().equals(hospitalId)) { return patients1.getId(); } - //表示区域的 if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId)) && StringUtils.isNotEmpty(pid)) { patients = findOnePatient(null, null, null, null, type, false, pid, false); -- 1.8.3.1