From b299baafee73df3b1e4e4d98164bb171f1e53f09 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 5 Sep 2016 11:22:06 +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 --- .../operate/web/facade/ApplyOrderFacade.java | 65 +++++++++++++++++----- .../operate/web/result/HighScoreResult.java | 11 ++++ 2 files changed, 62 insertions(+), 14 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index debd8e7..519efea 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -2,10 +2,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; -import com.lyms.platform.common.enums.ServiceStatusEnums; -import com.lyms.platform.common.enums.ServiceTypeEnums; -import com.lyms.platform.common.enums.SexEnum; -import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; @@ -121,10 +118,17 @@ public class ApplyOrderFacade { } referralApplyOrderModel.setLastMenses(patients.getLastMenses()); HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), true); - referralApplyOrderModel.setrRisk(highScoreResult.getHighId()); + referralApplyOrderModel.setrRisk(highScoreResult.gethighRiskList()); referralApplyOrderModel.setScore(highScoreResult.getScore()); - referralApplyOrderModel.setrLevel(highScoreResult.getLevelId()); - referralApplyOrderModel.setOtherHighRisk(highScoreResult.getOtherHigh()); + List lsit = new ArrayList(); + for(String str : highScoreResult.getLevelId()){ + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str); + if(null!=basicConfig){ + lsit.add(basicConfig.getName()); + } + } + referralApplyOrderModel.setrLevel(lsit); +// referralApplyOrderModel.setOtherHighRisk(highScoreResult.getOtherHigh()); referralApplyOrderModel.setPid(patients.getPid()); referralApplyOrderModel.setDueWeek(days); referralApplyOrderModel.setServiceType(patients.getServiceType()); @@ -188,7 +192,14 @@ public class ApplyOrderFacade { referralApplyOrderModel.setmCardNo(patients.getCardNo()); referralApplyOrderModel.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); List diagnoseList = babyCheckFacade.getBabyLastDiagnose(babyModel.getPid()); - referralApplyOrderModel.setrRisk(diagnoseList); + List lsit = new ArrayList(); + for(String str : diagnoseList){ + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str); + if(null!=basicConfig){ + lsit.add(basicConfig.getName()); + } + } + referralApplyOrderModel.setrRisk(lsit); if (StringUtils.isNotEmpty(referralApplyOrderModel.getTransferredHospital()) && NumberUtils.isNumber(referralApplyOrderModel.getTransferredHospital())) { BabyModelQuery babyModelQuery = new BabyModelQuery(); babyModelQuery.setPid(babyModel.getPid()); @@ -508,10 +519,7 @@ public class ApplyOrderFacade { if (CollectionUtils.isNotEmpty(diagnoseList)) { diagnose = ""; for (String obj : diagnoseList) { - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(obj); - if (basicConfig != null) { - diagnose += basicConfig.getName() + " "; - } + diagnose +=obj + " "; } babyApplyOrderResult.sethRisk(diagnose); } @@ -643,7 +651,7 @@ public class ApplyOrderFacade { applyOrderResult.setRecDoctor(users.getName()); } } - HighScoreResult highScoreResult = antenatalExaminationFacade.queryRisk(orderModel.getrRisk(), true); + /*HighScoreResult highScoreResult = antenatalExaminationFacade.queryRisk(orderModel.getrRisk(), true); StringBuilder stringBuilder = new StringBuilder(highScoreResult.gethighRiskStr()); if (StringUtils.isNotEmpty(orderModel.getOtherHighRisk())) { if (stringBuilder.length() > 0 && StringUtils.isNotEmpty(orderModel.getOtherHighRisk())) { @@ -652,11 +660,37 @@ public class ApplyOrderFacade { if (StringUtils.isNotEmpty(orderModel.getOtherHighRisk())) { stringBuilder.append(orderModel.getOtherHighRisk()); } + }*/ + + StringBuilder stringBuilder = new StringBuilder(); + if(CollectionUtils.isNotEmpty(orderModel.getrRisk())){ + for(String str:orderModel.getrRisk()){ + stringBuilder.append(str).append(", "); + } + if(stringBuilder.length()>0){ + stringBuilder.setLength(stringBuilder.length() - 2); + } } + applyOrderResult.convertToResult(orderModel, zhuanCName, zhuanRname); applyOrderResult.setrRisk(stringBuilder.toString()); applyOrderResult.setScore(orderModel.getScore()); - applyOrderResult.setrLevel(highScoreResult.getLevel()); + + + List rLevel = new ArrayList(); + if(CollectionUtils.isNotEmpty(orderModel.getrRisk())){ + for(String str:orderModel.getrRisk()){ + Map map1 = new HashMap(); + map1.put("id", ""); + if (str.indexOf("预警") > -1) { + str = str.replace("预警", ""); + } + map1.put("name",str); + map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(str)); + rLevel.add(map1); + } + } + applyOrderResult.setrLevel(rLevel); Patients patients = patientsService.findOnePatientById(orderModel.getParentId()); if (null != patients) { if (1 == patients.getDueStatus()) @@ -670,6 +704,9 @@ public class ApplyOrderFacade { return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(referralApplyOrderQuery.getPageInfo()); } + + + public BaseResponse getEnums() { Map map = new HashMap<>(); map.put("gwfz", basicConfigFacade.getBaseicConfigByParentId(SystemConfig.HIGH_RISK_ID)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java index e7d938c..066300e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java @@ -145,4 +145,15 @@ public class HighScoreResult { } return stringBuilder.toString(); } + public List gethighRiskList(){ + List list=new ArrayList<>(); + if (null == highRisk) { + return list; + } + for (int i1 = 0; i1 < highRisk.size(); i1++) { + java.util.Map map = (java.util.Map) highRisk.get(i1); + list.add(map.get("name")); + } + return list; + } } -- 1.8.3.1