From f73507799acebcb32c650c055e4fbc8556ea3f34 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 26 Jun 2018 14:24:05 +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 --- .../platform/operate/web/facade/SieveFacade.java | 38 +++++----------------- 1 file changed, 8 insertions(+), 30 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 e903ebb..722e20e 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 @@ -718,44 +718,22 @@ public class SieveFacade { String hospitalId = autoMatchFacade.getHospitalId(userId); PatientsQuery patientsQuery = new PatientsQuery(); - patientsQuery.setHospitalId(hospitalId); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setId(parentId); List localPatients = patientsService.queryPatient(patientsQuery); - Patients pat = null; + if (CollectionUtils.isNotEmpty(localPatients)) { - pat = localPatients.get(0); - } - else - { - patientsQuery.setHospitalId(null); - List areaPatients = patientsService.queryPatient(patientsQuery); - if (CollectionUtils.isNotEmpty(areaPatients)) { - pat = areaPatients.get(0); - if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { - //建立隐藏档案 - String id = antenatalExaminationFacade.handHideBuild(pat.getPid(), pat.getId(), userId, 1); - - pat = patientsService.findOnePatientById(id); - } - else - { - return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有档案，请建档后申请产筛"); - } - } - } - - HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(pat.getPid(), false); - PatientBaseResult patientBaseResult = new PatientBaseResult(); - if (null != pat) { + Patients pat = localPatients.get(0); + HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(pat.getPid(), false); + PatientBaseResult patientBaseResult = new PatientBaseResult(); patientBaseResult.convert(pat); - } - patientBaseResult.setRiskFactor(highScoreResult.getHighRisk()); - patientBaseResult.setRiskScore(highScoreResult.getScoreStr()); + patientBaseResult.setRiskFactor(highScoreResult.getHighRisk()); + patientBaseResult.setRiskScore(highScoreResult.getScoreStr()); - map.put("patientInfo", patientBaseResult); + map.put("patientInfo", patientBaseResult); + } SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); sieveApplyOrderQuery1.setParentId(parentId); -- 1.8.3.1