From 38c856c51c052bb195044bd1743fa207e63f6bb6 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 10 Oct 2017 11:47:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/facade/PatientFacade.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) 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 32e5925..33bc383 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 @@ -384,8 +384,6 @@ public class PatientFacade { hospitalList = new ArrayList<>(); fmHospitalList = new ArrayList<>(); - fmHospitalList.add(riskPatientsQueryRequest.getFmHospital()); - String hospital = autoMatchFacade.getHospitalId(userId); if (null != hospital) { hospitalList.add(hospital); @@ -454,12 +452,20 @@ public class PatientFacade { } fmHospitalList.retainAll(orgId); } - if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskPatientsQueryRequest.getFprovinceId())) + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskPatientsQueryRequest.getFmHospital())) + { + fmHospitalList.add(riskPatientsQueryRequest.getFmHospital()); + } + else { - patientsQuery.setFmHospitalList(fmHospitalList); + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskPatientsQueryRequest.getFprovinceId())) + { + patientsQuery.setFmHospitalList(fmHospitalList); + } } + } else { patientsQuery.setFmHospital(riskPatientsQueryRequest.getFmHospital()); -- 1.8.3.1