From 432724903bd1a9c5caf1f050ba52f35a6530ac40 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 3 Feb 2021 09:37:09 +0800 Subject: [PATCH] update --- .../platform/operate/web/facade/AntenatalExaminationFacade.java | 2 +- .../com/lyms/platform/operate/web/facade/BookbuildingFacade.java | 4 ++-- .../com/lyms/platform/operate/web/facade/MatDeliverFacade.java | 4 ++-- .../java/com/lyms/platform/operate/web/facade/PatientFacade.java | 8 ++++++++ 4 files changed, 13 insertions(+), 5 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 7490094..e9931b4 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 @@ -3628,7 +3628,7 @@ public class AntenatalExaminationFacade { //衡水区域并且不是衡水市第六人民医院 if("12".equals(og.getCityId()) && !"2100002324".equals(hospitalId)) { - currentGroupHospital.remove("2100002324");//排查冀州妇幼 + currentGroupHospital.remove("2100002324");//衡水市第六人民医院 } if (!StringUtils.isEmpty(queryRequest.getPatientId())) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 00c9829..ae259a4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -1498,10 +1498,10 @@ public class BookbuildingFacade { } - //衡水区域并且不是冀州妇幼登陆 + //衡水区域并且不是衡水市第六人民医院 if("12".equals(org.getCityId()) && !"2100002324".equals(hospitalId)) { - hids.remove("2100002324");//排查冀州妇幼 + hids.remove("2100002324");//衡水六院登陆 } if (CollectionUtils.isNotEmpty(hids)) { 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 4b865f9..046019b 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 @@ -1352,10 +1352,10 @@ public class MatDeliverFacade { List hids = organizationGroupsFacade.findGroupHospital(userId, false); - //衡水区域并且不是冀州妇幼登陆 + //衡水区域并且不是衡水市第六人民医院 if("12".equals(og.getCityId()) && !"2100002324".equals(hospital)) { - hids.remove("2100002324");//排查冀州妇幼 + hids.remove("2100002324");//衡水六院登陆 } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 4638f1e..8a57662 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -490,6 +490,14 @@ public class PatientFacade { hospitalList.retainAll(orgId); } } + + //衡水区域并且不是衡水市第六人民医院 + if(!"2100002324".equals(hospital)) + { + hospitalList.remove("2100002324");//衡水六院登陆 + } + + patientsQuery.setHospitalList(hospitalList); fmHospitalList.addAll(hospitalList); -- 1.8.3.1