From d1e15f9d933a03379515290eb1ab8e821da3d414 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 27 Sep 2016 11:35:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E7=97=85=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/PatientFacade.java | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 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 6aec70b..65c9d55 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 @@ -278,7 +278,8 @@ public class PatientFacade { buildType.add(0); buildType.add(2); patientsQuery.setBuildTypeList(buildType); - patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(userId)); + String hospital=autoMatchFacade.getHospitalId(userId); + patientsQuery.setHospitalId(hospital); patientsQuery.setNeed(needPage); //查询符合条件的孕妇 List patientses = patientsService.queryPatient1(patientsQuery, "modified"); @@ -286,13 +287,13 @@ public class PatientFacade { if (CollectionUtils.isNotEmpty(patientses)) { //如果是查高危孕妇 if (null != isHighRisk && Boolean.TRUE.equals(isHighRisk)) { - data = convertToHighRisk(patientses, userId); + data = convertToHighRisk(patientses, userId,hospital); } else if (type == 1) { //处理全部孕妇的情况 - data = convertToQuanPatient(patientses, userId); + data = convertToQuanPatient(patientses, userId,hospital); //处理全部产妇 } else if (type == 3) { - data = convertToQuanCPatient(patientses, userId); + data = convertToQuanCPatient(patientses, userId,hospital); } } return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(patientsQuery.getPageInfo()); @@ -326,10 +327,10 @@ public class PatientFacade { * @param patientses 符合条件的产妇 * @return */ - private List convertToQuanCPatient(List patientses, Integer userId) { + private List convertToQuanCPatient(List patientses, Integer userId,String hospital) { List data = new ArrayList<>(); AntExQuery antExQuery = new AntExQuery(); - String hospital = autoMatchFacade.getHospitalId(userId); +// String hospital = autoMatchFacade.getHospitalId(userId); for (Patients patients : patientses) { QuanChanResult chanResult = new QuanChanResult(); chanResult.convertToResult(patients); @@ -403,11 +404,11 @@ public class PatientFacade { } - private List convertToQuanPatient(List patientses, Integer userId) { + private List convertToQuanPatient(List patientses, Integer userId,String hospital) { AntExChuQuery antExChuQuery = new AntExChuQuery(); AntExQuery antExQuery = new AntExQuery(); List data = new ArrayList<>(); - String hospital = autoMatchFacade.getHospitalId(userId); +// String hospital = autoMatchFacade.getHospitalId(userId); for (Patients patients : patientses) { QuanPatientsResult quanPatientsResult = new QuanPatientsResult(); quanPatientsResult.convertToResult(patients); @@ -501,11 +502,11 @@ public class PatientFacade { * @param patientses * @return */ - private List convertToHighRisk(List patientses, Integer userId) { + private List convertToHighRisk(List patientses, Integer userId,String hospital) { AntExChuQuery antExChuQuery = new AntExChuQuery(); AntExQuery antExQuery = new AntExQuery(); List data = new ArrayList<>(); - String hospital = autoMatchFacade.getHospitalId(userId); +// String hospital = autoMatchFacade.getHospitalId(userId); for (Patients patients : patientses) { RiskPatientsResult riskPatientsResult = new RiskPatientsResult(); riskPatientsResult.convertToResult(patients); -- 1.8.3.1