jiangjiazhi / regional-platform

Download as
Browse Code »

Commit b299baafee73df3b1e4e4d98164bb171f1e53f09

Authored by jiangjiazhi
1 parent f6bb02c6e7
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

修改新电子病历

Showing 2 changed files with 62 additions and 14 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ b299baa
... ... @@ -2,10 +2,7 @@
2 2  
3 3 import com.lyms.platform.biz.service.*;
4 4 import com.lyms.platform.common.constants.ErrorCodeConstants;
5   -import com.lyms.platform.common.enums.ServiceStatusEnums;
6   -import com.lyms.platform.common.enums.ServiceTypeEnums;
7   -import com.lyms.platform.common.enums.SexEnum;
8   -import com.lyms.platform.common.enums.YnEnums;
  5 +import com.lyms.platform.common.enums.*;
9 6 import com.lyms.platform.common.result.BaseListResponse;
10 7 import com.lyms.platform.common.result.BaseObjectResponse;
11 8 import com.lyms.platform.common.result.BaseResponse;
12 9  
... ... @@ -121,10 +118,17 @@
121 118 }
122 119 referralApplyOrderModel.setLastMenses(patients.getLastMenses());
123 120 HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), true);
124   - referralApplyOrderModel.setrRisk(highScoreResult.getHighId());
  121 + referralApplyOrderModel.setrRisk(highScoreResult.gethighRiskList());
125 122 referralApplyOrderModel.setScore(highScoreResult.getScore());
126   - referralApplyOrderModel.setrLevel(highScoreResult.getLevelId());
127   - referralApplyOrderModel.setOtherHighRisk(highScoreResult.getOtherHigh());
  123 + List lsit = new ArrayList();
  124 + for(String str : highScoreResult.getLevelId()){
  125 + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str);
  126 + if(null!=basicConfig){
  127 + lsit.add(basicConfig.getName());
  128 + }
  129 + }
  130 + referralApplyOrderModel.setrLevel(lsit);
  131 +// referralApplyOrderModel.setOtherHighRisk(highScoreResult.getOtherHigh());
128 132 referralApplyOrderModel.setPid(patients.getPid());
129 133 referralApplyOrderModel.setDueWeek(days);
130 134 referralApplyOrderModel.setServiceType(patients.getServiceType());
... ... @@ -188,7 +192,14 @@
188 192 referralApplyOrderModel.setmCardNo(patients.getCardNo());
189 193 referralApplyOrderModel.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId());
190 194 List<String> diagnoseList = babyCheckFacade.getBabyLastDiagnose(babyModel.getPid());
191   - referralApplyOrderModel.setrRisk(diagnoseList);
  195 + List lsit = new ArrayList();
  196 + for(String str : diagnoseList){
  197 + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str);
  198 + if(null!=basicConfig){
  199 + lsit.add(basicConfig.getName());
  200 + }
  201 + }
  202 + referralApplyOrderModel.setrRisk(lsit);
192 203 if (StringUtils.isNotEmpty(referralApplyOrderModel.getTransferredHospital()) && NumberUtils.isNumber(referralApplyOrderModel.getTransferredHospital())) {
193 204 BabyModelQuery babyModelQuery = new BabyModelQuery();
194 205 babyModelQuery.setPid(babyModel.getPid());
... ... @@ -508,10 +519,7 @@
508 519 if (CollectionUtils.isNotEmpty(diagnoseList)) {
509 520 diagnose = "";
510 521 for (String obj : diagnoseList) {
511   - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(obj);
512   - if (basicConfig != null) {
513   - diagnose += basicConfig.getName() + " ";
514   - }
  522 + diagnose +=obj + " ";
515 523 }
516 524 babyApplyOrderResult.sethRisk(diagnose);
517 525 }
... ... @@ -643,7 +651,7 @@
643 651 applyOrderResult.setRecDoctor(users.getName());
644 652 }
645 653 }
646   - HighScoreResult highScoreResult = antenatalExaminationFacade.queryRisk(orderModel.getrRisk(), true);
  654 + /*HighScoreResult highScoreResult = antenatalExaminationFacade.queryRisk(orderModel.getrRisk(), true);
647 655 StringBuilder stringBuilder = new StringBuilder(highScoreResult.gethighRiskStr());
648 656 if (StringUtils.isNotEmpty(orderModel.getOtherHighRisk())) {
649 657 if (stringBuilder.length() > 0 && StringUtils.isNotEmpty(orderModel.getOtherHighRisk())) {
650 658  
651 659  
... ... @@ -652,11 +660,37 @@
652 660 if (StringUtils.isNotEmpty(orderModel.getOtherHighRisk())) {
653 661 stringBuilder.append(orderModel.getOtherHighRisk());
654 662 }
  663 + }*/
  664 +
  665 + StringBuilder stringBuilder = new StringBuilder();
  666 + if(CollectionUtils.isNotEmpty(orderModel.getrRisk())){
  667 + for(String str:orderModel.getrRisk()){
  668 + stringBuilder.append(str).append(", ");
  669 + }
  670 + if(stringBuilder.length()>0){
  671 + stringBuilder.setLength(stringBuilder.length() - 2);
  672 + }
655 673 }
  674 +
656 675 applyOrderResult.convertToResult(orderModel, zhuanCName, zhuanRname);
657 676 applyOrderResult.setrRisk(stringBuilder.toString());
658 677 applyOrderResult.setScore(orderModel.getScore());
659   - applyOrderResult.setrLevel(highScoreResult.getLevel());
  678 +
  679 +
  680 + List rLevel = new ArrayList();
  681 + if(CollectionUtils.isNotEmpty(orderModel.getrRisk())){
  682 + for(String str:orderModel.getrRisk()){
  683 + Map map1 = new HashMap();
  684 + map1.put("id", "");
  685 + if (str.indexOf("预警") > -1) {
  686 + str = str.replace("预警", "");
  687 + }
  688 + map1.put("name",str);
  689 + map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(str));
  690 + rLevel.add(map1);
  691 + }
  692 + }
  693 + applyOrderResult.setrLevel(rLevel);
660 694 Patients patients = patientsService.findOnePatientById(orderModel.getParentId());
661 695 if (null != patients) {
662 696 if (1 == patients.getDueStatus())
... ... @@ -669,6 +703,9 @@
669 703 }
670 704 return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(referralApplyOrderQuery.getPageInfo());
671 705 }
  706 +
  707 +
  708 +
672 709  
673 710 public BaseResponse getEnums() {
674 711 Map<String, Object> map = new HashMap<>();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java View file @ b299baa
... ... @@ -145,5 +145,16 @@
145 145 }
146 146 return stringBuilder.toString();
147 147 }
  148 + public List gethighRiskList(){
  149 + List<String> list=new ArrayList<>();
  150 + if (null == highRisk) {
  151 + return list;
  152 + }
  153 + for (int i1 = 0; i1 < highRisk.size(); i1++) {
  154 + java.util.Map<String, String> map = (java.util.Map<String, String>) highRisk.get(i1);
  155 + list.add(map.get("name"));
  156 + }
  157 + return list;
  158 + }
148 159 }