From 63ae8ccaaaa092494c556a1e4d7aebdff235a04d Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 27 Dec 2016 20:10:29 +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 | 12 ++++++------ .../lyms/platform/operate/web/facade/ApplyOrderFacade.java | 4 ++-- .../lyms/platform/operate/web/facade/MatDeliverFacade.java | 2 +- .../lyms/platform/operate/web/facade/PostReviewFacade.java | 2 +- 4 files changed, 10 insertions(+), 10 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 eef8239..d88c98b 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 @@ -72,12 +72,12 @@ public class AntenatalExaminationFacade { * @param userId * @return */ - public String handHideBuild(String pid, String parentId, Integer userId) { + public String handHideBuild(String pid, String parentId, Integer userId,int type) { String hospitalId = autoMatchFacade.getHospitalId(userId); List li = new ArrayList(); li.add(hospitalId); - Patients patients = findOnePatient(null, null, null, li, 1, false, pid, true); + Patients patients = findOnePatient(null, null, null, li, type, false, pid, true); //表示本院已经有隐藏建档 if (null != patients) { return patients.getId(); @@ -92,11 +92,11 @@ public class AntenatalExaminationFacade { //表示区域的 if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId)) && StringUtils.isNotEmpty(pid)) { - patients = findOnePatient(null, null, null, null, 1, false, pid, false); + patients = findOnePatient(null, null, null, null, type, false, pid, false); patients.setSource(patients.getId()); patients.setId(null); patients.setHospitalId(hospitalId); - patients.setType(1); +// patients.setType(1); patients.setCreated(new Date()); patients.setBookbuildingDoctor(userId + ""); patients.setEnable("2"); @@ -177,7 +177,7 @@ public class AntenatalExaminationFacade { AntenatalExaminationModel model = antExAddRequest.convertToDataModel(); //表示区域的 if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { - String parentId = handHideBuild(antExAddRequest.getPid(), antExAddRequest.getParentId(), userId); + String parentId = handHideBuild(antExAddRequest.getPid(), antExAddRequest.getParentId(), userId,1); if (StringUtils.isEmpty(parentId)) { //打印日志 } @@ -315,7 +315,7 @@ public class AntenatalExaminationFacade { //表示区域的 if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { - String parentId = handHideBuild(excAddRequest.getPid(), excAddRequest.getParentId(), userId); + String parentId = handHideBuild(excAddRequest.getPid(), excAddRequest.getParentId(), userId,1); if (StringUtils.isEmpty(parentId)) { //打印日志 } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index f60645b..c0b34fa 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -84,7 +84,7 @@ public class ApplyOrderFacade { String hospital = autoMatchFacade.getHospitalId(userId); //表示区域的 if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospital))) { - String parentId = antenatalExaminationFacade.handHideBuild(referralApplyOrderAddRequest.getPid(), referralApplyOrderAddRequest.getParentId(), userId); + String parentId = antenatalExaminationFacade.handHideBuild(referralApplyOrderAddRequest.getPid(), referralApplyOrderAddRequest.getParentId(), userId,-1); if (StringUtils.isEmpty(parentId)) { //打印日志 } @@ -295,7 +295,7 @@ public class ApplyOrderFacade { //表示区域的 if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { - String parentId = antenatalExaminationFacade.handHideBuild(sieveApplyOrderAddRequest.getPid(), sieveApplyOrderAddRequest.getParentId(), userId); + String parentId = antenatalExaminationFacade.handHideBuild(sieveApplyOrderAddRequest.getPid(), sieveApplyOrderAddRequest.getParentId(), userId,-1); if (StringUtils.isEmpty(parentId)) { //打印日志 } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 0237390..70c056c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -134,7 +134,7 @@ public class MatDeliverFacade { //表示区域的 if (StringUtils.isNotEmpty(organizationGroupsFacade.findByCurrentUserId(hospitalId))) { - String parentId =antenatalExaminationFacade.handHideBuild(deliverAddRequest.getPid(), deliverAddRequest.getParentId(), userId); + String parentId =antenatalExaminationFacade.handHideBuild(deliverAddRequest.getPid(), deliverAddRequest.getParentId(), userId,-1); if (StringUtils.isEmpty(parentId)) { logger.warn("get handHideBuild parentId is null."); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java index 1d49ab2..d158617 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java @@ -81,7 +81,7 @@ public class PostReviewFacade { if(StringUtils.isNotEmpty(groupId)){ OrganizationGroups gorp= groupsService.findById(groupId); if (gorp.getbType()!=1) { - String parentId = examinationFacade.handHideBuild(postReviewRequest.getPid(), postReviewRequest.getParentId(), userId); + String parentId = examinationFacade.handHideBuild(postReviewRequest.getPid(), postReviewRequest.getParentId(), userId,3); if (StringUtils.isEmpty(parentId)) { //打印日志 } -- 1.8.3.1