jiangjiazhi / regional-platform

Download as
Browse Code »

Commit b8020389cff17220c06bd6605c19c4e17adde627

Authored by jiangjiazhi
1 parent 91d446820e
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

1

Showing 2 changed files with 14 additions and 31 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ b802038
... ... @@ -1615,6 +1615,7 @@
1615 1615 if (applyOrderService.queryCount(applyOrderQuery) > 0) {
1616 1616 ReferralApplyOrderModel referralApplyOrderModel = new ReferralApplyOrderModel();
1617 1617 referralApplyOrderModel.setrRisk(Arrays.asList(commonService.resloveFactor(loa.getRiskFactorId()).split(",")));
  1618 + referralApplyOrderModel.setOtherHighRisk(loa.getoRiskFactor());
1618 1619 referralApplyOrderModel.setrLevel(StringUtils.isNotEmpty(loa.getRiskLevelId())&&!"[]".equals(loa.getRiskLevelId())?JsonUtil.jkstr2Obj(loa.getRiskLevelId(), List.class):Collections.emptyList());
1619 1620 applyOrderService.updateByParentId(applyOrderQuery, referralApplyOrderModel);
1620 1621 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ b802038
... ... @@ -183,7 +183,7 @@
183 183 patients.setExpVip(0);
184 184 patients.setEnable("0");
185 185 id = patientsService.addPatient(patients).getId();
186   - operateLogFacade.addAddOptLog(userId,Integer.parseInt(hospital),patients,OptActionEnums.ADD.getId(),"添加孕妇转诊");
  186 + operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospital), patients, OptActionEnums.ADD.getId(), "添加孕妇转诊");
187 187 } else {
188 188 Patients patients1 = patientsList.get(0);
189 189 id = patients1.getId();
... ... @@ -260,7 +260,7 @@
260 260 babyModel.setEnable("0");
261 261 id = babyService.addOneBaby(babyModel).getId();
262 262  
263   - operateLogFacade.addAddOptLog(userId,Integer.parseInt(hospital),babyModel,OptActionEnums.ADD.getId(),"添加儿童转诊");
  263 + operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospital), babyModel, OptActionEnums.ADD.getId(), "添加儿童转诊");
264 264 } else {
265 265 BabyModel babyModel1 = babyModels.get(0);
266 266 id = babyModel1.getId();
267 267  
... ... @@ -370,9 +370,9 @@
370 370 sieveApplyOrderModel1.setStatus(1);
371 371 SieveApplyOrderQuery sieveApplyOrderQuery2 = new SieveApplyOrderQuery();
372 372 sieveApplyOrderQuery2.setId(str);
373   - List<SieveApplyOrderModel> list2 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery2);
  373 + List<SieveApplyOrderModel> list2 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery2);
374 374 applyOrderService.updateSieve(sieveApplyOrderModel1);
375   - operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId),list2.get(0), sieveApplyOrderModel1, OptActionEnums.UPDATE.getId(), "更新产晒申请");
  375 + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), list2.get(0), sieveApplyOrderModel1, OptActionEnums.UPDATE.getId(), "更新产晒申请");
376 376 }
377 377 }
378 378 SieveQuery sieveQuery = new SieveQuery();
... ... @@ -764,7 +764,6 @@
764 764 zhuanCName = zhuanc.getName();
765 765 }
766 766 } catch (Exception e) {
767   -
768 767 }
769 768 }
770 769 if (NumberUtils.isNumber(zhuanru)) {
... ... @@ -774,7 +773,6 @@
774 773 zhuanRname = zhuanc1.getName();
775 774 }
776 775 } catch (Exception e) {
777   -
778 776 }
779 777 }
780 778  
... ... @@ -790,16 +788,6 @@
790 788 applyOrderResult.setRecDoctor(users.getName());
791 789 }
792 790 }
793   - /*HighScoreResult highScoreResult = antenatalExaminationFacade.queryRisk(orderModel.getrRisk(), true);
794   - StringBuilder stringBuilder = new StringBuilder(highScoreResult.gethighRiskStr());
795   - if (StringUtils.isNotEmpty(orderModel.getOtherHighRisk())) {
796   - if (stringBuilder.length() > 0 && StringUtils.isNotEmpty(orderModel.getOtherHighRisk())) {
797   - stringBuilder.append(",");
798   - }
799   - if (StringUtils.isNotEmpty(orderModel.getOtherHighRisk())) {
800   - stringBuilder.append(orderModel.getOtherHighRisk());
801   - }
802   - }*/
803 791  
804 792 StringBuilder stringBuilder = new StringBuilder();
805 793 if (CollectionUtils.isNotEmpty(orderModel.getrRisk())) {
806 794  
... ... @@ -811,24 +799,18 @@
811 799 }
812 800 }
813 801  
  802 + if (StringUtils.isNotEmpty(orderModel.getOtherHighRisk())) {
  803 + if (stringBuilder.length() > 0 && StringUtils.isNotEmpty(orderModel.getOtherHighRisk())) {
  804 + stringBuilder.append(",");
  805 + } else if (StringUtils.isNotEmpty(orderModel.getOtherHighRisk())) {
  806 + stringBuilder.append(orderModel.getOtherHighRisk());
  807 + }
  808 + }
  809 +
814 810 applyOrderResult.convertToResult(orderModel, zhuanCName, zhuanRname);
815 811 applyOrderResult.setrRisk(stringBuilder.toString());
816 812 applyOrderResult.setScore(orderModel.getScore());
817 813  
818   -
819   - /*
820   - if (CollectionUtils.isNotEmpty(orderModel.getrLevel())) {
821   - for (String str : orderModel.getrLevel()) {
822   - Map map1 = new HashMap();
823   - map1.put("id", "");
824   - if (str.indexOf("预警") > -1) {
825   - str = str.replace("预警", "");
826   - }
827   - map1.put("name", str);
828   - map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(str));
829   - rLevel.add(map1);
830   - }
831   - }*/
832 814 List rLevel = new ArrayList();
833 815 if (CollectionUtils.isNotEmpty(orderModel.getrLevel())) {
834 816 try {
... ... @@ -850,7 +832,7 @@
850 832 Patients patients = patientsService.findOnePatientById(orderModel.getParentId());
851 833  
852 834 if (null != patients) {
853   - applyOrderResult.setIsGravida(patients.getType()==3?"0":"1");
  835 + applyOrderResult.setIsGravida(patients.getType() == 3 ? "0" : "1");
854 836 if (1 == patients.getDueStatus())
855 837 applyOrderResult.setcDueWeek("终止妊娠");
856 838 else if (patients.getType() == 3)