From 9673cf9c9df9f96c41b99800f8b1595d8dad83cb Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 23 Dec 2016 15:46: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 --- .../platform/operate/web/facade/AntenatalExaminationFacade.java | 1 + .../com/lyms/platform/operate/web/facade/MatDeliverFacade.java | 7 ++++--- 2 files changed, 5 insertions(+), 3 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 b654b11..938d6dc 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 @@ -1050,6 +1050,7 @@ public class AntenatalExaminationFacade { organization = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())); } pid = patients.getPid(); + //当主档案的医院不在group组里需要显示本来的隐藏档案 if(!"2".equals(patients.getEnable())){ listData.add(new AntData(patients, null != organization ? organization.getName() : "")); } 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 43556c2..f5ce588 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 @@ -78,6 +78,7 @@ public class MatDeliverFacade { @Autowired private BasicConfigService basicConfigService; + private static Map ONE_ENUMS = new HashMap<>(); private static Map babyMap = new HashMap<>(); @@ -131,14 +132,14 @@ public class MatDeliverFacade { String hospitalId = autoMatchFacade.getHospitalId(userId); MaternalDeliverModel maternalDeliverModel = deliverAddRequest.convertToDataModel(); - Organization og = organizationService.getOrganization(Integer.valueOf(hospitalId)); - //区域模式 - if (og.getbStatus()!=1) { + //表示区域的 + if (StringUtils.isNotEmpty(organizationGroupsFacade.findByCurrentUserId(hospitalId))) { String parentId =antenatalExaminationFacade.handHideBuild(deliverAddRequest.getPid(), deliverAddRequest.getParentId(), userId); if (StringUtils.isEmpty(parentId)) { logger.warn("get handHideBuild parentId is null."); } maternalDeliverModel.setParentId(parentId); + deliverAddRequest.setParentId(parentId); } //增加 -- 1.8.3.1