From 41af146e982a1e4e4dc9eed94e0d3449201863b6 Mon Sep 17 00:00:00 2001 From: yangfei Date: Wed, 30 May 2018 11:49:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=A7=E6=89=BF=E9=AB=98=E5=8D=B1=E5=9B=A0?= =?UTF-8?q?=E6=95=B0=E5=92=8C=E7=AD=9B=E6=9F=A5=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/facade/AntenatalExaminationFacade.java | 38 ++++++++++------------ 1 file changed, 18 insertions(+), 20 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 53f3450..c886836 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 @@ -408,7 +408,6 @@ public class AntenatalExaminationFacade { } - //修改转诊单高危及诊断信息 public void updateApplyOrder(final AntenatalExaminationModel antenatalExamination, final String parentId) { @@ -433,7 +432,7 @@ public class AntenatalExaminationFacade { referralApplyOrderQuery1.setTransferredHospital(patients.getHospitalId()); referralApplyOrderQuery1.setPid(patients.getPid()); ReferralApplyOrderModel model1 = new ReferralApplyOrderModel(); - if(referralApplyOrderModel.getStatus()==1) { + if (referralApplyOrderModel.getStatus() == 1) { //设置接收时间 model1.setReceived(antenatalExamination.getCheckDate()); model1.setRecDoctor(antenatalExamination.getCheckDoctor()); @@ -445,11 +444,11 @@ public class AntenatalExaminationFacade { //其他诊断 model1.setOtherDiagn(antenatalExamination.getDiagnosisOther()); model1.setDiagnosis(antenatalExamination.getDiagnosis()); - List rlevel=Collections.emptyList(); + List rlevel = Collections.emptyList(); //风险等级颜色 - if(StringUtils.isNotEmpty(patients.getRiskLevelId())&&!"[]".equals(patients.getRiskLevelId())){ - rlevel= JsonUtil.jkstr2Obj(patients.getRiskLevelId(), List.class); - com.lyms.platform.operate.web.utils.CollectionUtils.removeDuplicate(rlevel,true); + if (StringUtils.isNotEmpty(patients.getRiskLevelId()) && !"[]".equals(patients.getRiskLevelId())) { + rlevel = JsonUtil.jkstr2Obj(patients.getRiskLevelId(), List.class); + com.lyms.platform.operate.web.utils.CollectionUtils.removeDuplicate(rlevel, true); } model1.setrLevel(rlevel); try { @@ -457,7 +456,7 @@ public class AntenatalExaminationFacade { model1.setrRisk(queryRiskName(patients.getRiskFactorId())); //高危集合ID model1.setRiskFactorId(patients.getRiskFactorId()); - System.out.println("待修改转诊信息："+model1.toString()); + System.out.println("待修改转诊信息：" + model1.toString()); } catch (Exception e) { e.printStackTrace(); } @@ -471,7 +470,7 @@ public class AntenatalExaminationFacade { referralApplyOrderQuery2.setPid(patients.getPid()); //设置转出申请单的状态为接收 applyOrderService.updateByParentId(referralApplyOrderQuery2, model1); - System.out.println("查询转诊条件："+referralApplyOrderQuery.convertToQuery().convertToMongoQuery()); + System.out.println("查询转诊条件：" + referralApplyOrderQuery.convertToQuery().convertToMongoQuery()); } } @@ -643,10 +642,10 @@ public class AntenatalExaminationFacade { //其他诊断 model.setOtherDiagn(antExChuModel.getDiagnosisOther()); model.setDiagnosis(antExChuModel.getDiagnosis()); - List rlevel=Collections.emptyList(); - if(StringUtils.isNotEmpty(patients.getRiskLevelId())&&!"[]".equals(patients.getRiskLevelId())){ - rlevel= JsonUtil.jkstr2Obj(patients.getRiskLevelId(), List.class); - com.lyms.platform.operate.web.utils.CollectionUtils.removeDuplicate(rlevel,true); + List rlevel = Collections.emptyList(); + if (StringUtils.isNotEmpty(patients.getRiskLevelId()) && !"[]".equals(patients.getRiskLevelId())) { + rlevel = JsonUtil.jkstr2Obj(patients.getRiskLevelId(), List.class); + com.lyms.platform.operate.web.utils.CollectionUtils.removeDuplicate(rlevel, true); } model.setrLevel(rlevel); try { @@ -852,7 +851,7 @@ public class AntenatalExaminationFacade { } else if (null != date) { antExQuery.setEnd(date); } - List list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "checkDate").addOrder(Sort.Direction.DESC,"created")); + List list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "checkDate").addOrder(Sort.Direction.DESC, "created")); HighScoreResult highScoreResult = new HighScoreResult(); boolean next = true; if (CollectionUtils.isNotEmpty(list)) { @@ -1762,16 +1761,15 @@ public class AntenatalExaminationFacade { } public BaseResponse getLastRisk(String patientId, Integer id) { - List highRisk = new ArrayList(); - String highriskDesc = ""; + Map resultMap = new HashMap<>(); Patients patients = patientsService.findOnePatientById(patientId); if (patients != null) { HighScoreResult highScoreResult = findLastRisk(patients.getPid(), true); - highRisk = highScoreResult.getHighRisk(); - highriskDesc = highScoreResult.getHighriskDesc(); + resultMap.put("highRisk", highScoreResult.getHighRisk()); + resultMap.put("highriskDesc", highScoreResult.getHighriskDesc()); + resultMap.put("screenResult", getscreenResult(patients.getScreenResult())); } - - return new BaseObjectResponse().setData(highRisk).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(highriskDesc); + return new BaseObjectResponse().setData(resultMap).setErrorcode(ErrorCodeConstants.SUCCESS); } @@ -2601,7 +2599,7 @@ public class AntenatalExaminationFacade { antexChuResult.setDiagnosis(queryRisk(list, false).getHighRisk()); } } catch (Exception e) { -e.printStackTrace(); + e.printStackTrace(); } try { if (StringUtils.isNotEmpty(antExChuModel.getHighrisk())) { -- 1.8.3.1