From dff6f2a26d82e44412184866a38c40fcbe90cf55 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 26 Jun 2018 14:35:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E7=AD=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/facade/SieveFacade.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index ca5f56f..d173157 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -714,7 +714,7 @@ public class SieveFacade { public BaseResponse getSieveApplyInfo(String parentId, Integer userId,Integer type) { Map map = new HashMap<>(); - String hospitalId = autoMatchFacade.getHospitalId(userId); + //String hospitalId = autoMatchFacade.getHospitalId(userId); PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); @@ -722,6 +722,11 @@ public class SieveFacade { List localPatients = patientsService.queryPatient(patientsQuery); + SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); + sieveApplyOrderQuery1.setParentId(parentId); + + sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); + if (CollectionUtils.isNotEmpty(localPatients)) { Patients pat = localPatients.get(0); @@ -731,14 +736,11 @@ public class SieveFacade { patientBaseResult.setRiskFactor(highScoreResult.getHighRisk()); patientBaseResult.setRiskScore(highScoreResult.getScoreStr()); + sieveApplyOrderQuery1.setHospitalId(pat.getHospitalId()); + map.put("patientInfo", patientBaseResult); } - SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); - sieveApplyOrderQuery1.setParentId(parentId); - sieveApplyOrderQuery1.setHospitalId(hospitalId); - sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); - if (type == 4) { -- 1.8.3.1