diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 62bf170..cab2513 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -1615,6 +1615,7 @@ public class TestController { if (applyOrderService.queryCount(applyOrderQuery) > 0) { ReferralApplyOrderModel referralApplyOrderModel = new ReferralApplyOrderModel(); referralApplyOrderModel.setrRisk(Arrays.asList(commonService.resloveFactor(loa.getRiskFactorId()).split(","))); + referralApplyOrderModel.setOtherHighRisk(loa.getoRiskFactor()); referralApplyOrderModel.setrLevel(StringUtils.isNotEmpty(loa.getRiskLevelId())&&!"[]".equals(loa.getRiskLevelId())?JsonUtil.jkstr2Obj(loa.getRiskLevelId(), List.class):Collections.emptyList()); applyOrderService.updateByParentId(applyOrderQuery, referralApplyOrderModel); } 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 978f674..a2a182f 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 @@ -183,7 +183,7 @@ public class ApplyOrderFacade { patients.setExpVip(0); patients.setEnable("0"); id = patientsService.addPatient(patients).getId(); - operateLogFacade.addAddOptLog(userId,Integer.parseInt(hospital),patients,OptActionEnums.ADD.getId(),"添加孕妇转诊"); + operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospital), patients, OptActionEnums.ADD.getId(), "添加孕妇转诊"); } else { Patients patients1 = patientsList.get(0); id = patients1.getId(); @@ -260,7 +260,7 @@ public class ApplyOrderFacade { babyModel.setEnable("0"); id = babyService.addOneBaby(babyModel).getId(); - operateLogFacade.addAddOptLog(userId,Integer.parseInt(hospital),babyModel,OptActionEnums.ADD.getId(),"添加儿童转诊"); + operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospital), babyModel, OptActionEnums.ADD.getId(), "添加儿童转诊"); } else { BabyModel babyModel1 = babyModels.get(0); id = babyModel1.getId(); @@ -370,9 +370,9 @@ public class ApplyOrderFacade { sieveApplyOrderModel1.setStatus(1); SieveApplyOrderQuery sieveApplyOrderQuery2 = new SieveApplyOrderQuery(); sieveApplyOrderQuery2.setId(str); - List list2 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery2); + List list2 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery2); applyOrderService.updateSieve(sieveApplyOrderModel1); - operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId),list2.get(0), sieveApplyOrderModel1, OptActionEnums.UPDATE.getId(), "更新产晒申请"); + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), list2.get(0), sieveApplyOrderModel1, OptActionEnums.UPDATE.getId(), "更新产晒申请"); } } SieveQuery sieveQuery = new SieveQuery(); @@ -764,7 +764,6 @@ public class ApplyOrderFacade { zhuanCName = zhuanc.getName(); } } catch (Exception e) { - } } if (NumberUtils.isNumber(zhuanru)) { @@ -774,7 +773,6 @@ public class ApplyOrderFacade { zhuanRname = zhuanc1.getName(); } } catch (Exception e) { - } } @@ -790,16 +788,6 @@ public class ApplyOrderFacade { applyOrderResult.setRecDoctor(users.getName()); } } - /*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())) { - stringBuilder.append(","); - } - if (StringUtils.isNotEmpty(orderModel.getOtherHighRisk())) { - stringBuilder.append(orderModel.getOtherHighRisk()); - } - }*/ StringBuilder stringBuilder = new StringBuilder(); if (CollectionUtils.isNotEmpty(orderModel.getrRisk())) { @@ -811,24 +799,18 @@ public class ApplyOrderFacade { } } + if (StringUtils.isNotEmpty(orderModel.getOtherHighRisk())) { + if (stringBuilder.length() > 0 && StringUtils.isNotEmpty(orderModel.getOtherHighRisk())) { + stringBuilder.append(","); + } else if (StringUtils.isNotEmpty(orderModel.getOtherHighRisk())) { + stringBuilder.append(orderModel.getOtherHighRisk()); + } + } + applyOrderResult.convertToResult(orderModel, zhuanCName, zhuanRname); applyOrderResult.setrRisk(stringBuilder.toString()); applyOrderResult.setScore(orderModel.getScore()); - - /* - if (CollectionUtils.isNotEmpty(orderModel.getrLevel())) { - for (String str : orderModel.getrLevel()) { - 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); - } - }*/ List rLevel = new ArrayList(); if (CollectionUtils.isNotEmpty(orderModel.getrLevel())) { try { @@ -850,7 +832,7 @@ public class ApplyOrderFacade { Patients patients = patientsService.findOnePatientById(orderModel.getParentId()); if (null != patients) { - applyOrderResult.setIsGravida(patients.getType()==3?"0":"1"); + applyOrderResult.setIsGravida(patients.getType() == 3 ? "0" : "1"); if (1 == patients.getDueStatus()) applyOrderResult.setcDueWeek("终止妊娠"); else if (patients.getType() == 3)