jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 41af146e982a1e4e4dc9eed94e0d3449201863b6

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

继承高危因数和筛查结果

Showing 1 changed file with 18 additions and 20 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 41af146
... ... @@ -408,7 +408,6 @@
408 408 }
409 409  
410 410  
411   -
412 411 //修改转诊单高危及诊断信息
413 412 public void updateApplyOrder(final AntenatalExaminationModel antenatalExamination, final String parentId) {
414 413  
... ... @@ -433,7 +432,7 @@
433 432 referralApplyOrderQuery1.setTransferredHospital(patients.getHospitalId());
434 433 referralApplyOrderQuery1.setPid(patients.getPid());
435 434 ReferralApplyOrderModel model1 = new ReferralApplyOrderModel();
436   - if(referralApplyOrderModel.getStatus()==1) {
  435 + if (referralApplyOrderModel.getStatus() == 1) {
437 436 //设置接收时间
438 437 model1.setReceived(antenatalExamination.getCheckDate());
439 438 model1.setRecDoctor(antenatalExamination.getCheckDoctor());
440 439  
... ... @@ -445,11 +444,11 @@
445 444 //其他诊断
446 445 model1.setOtherDiagn(antenatalExamination.getDiagnosisOther());
447 446 model1.setDiagnosis(antenatalExamination.getDiagnosis());
448   - List<String> rlevel=Collections.emptyList();
  447 + List<String> rlevel = Collections.emptyList();
449 448 //风险等级颜色
450   - if(StringUtils.isNotEmpty(patients.getRiskLevelId())&&!"[]".equals(patients.getRiskLevelId())){
451   - rlevel= JsonUtil.jkstr2Obj(patients.getRiskLevelId(), List.class);
452   - com.lyms.platform.operate.web.utils.CollectionUtils.removeDuplicate(rlevel,true);
  449 + if (StringUtils.isNotEmpty(patients.getRiskLevelId()) && !"[]".equals(patients.getRiskLevelId())) {
  450 + rlevel = JsonUtil.jkstr2Obj(patients.getRiskLevelId(), List.class);
  451 + com.lyms.platform.operate.web.utils.CollectionUtils.removeDuplicate(rlevel, true);
453 452 }
454 453 model1.setrLevel(rlevel);
455 454 try {
... ... @@ -457,7 +456,7 @@
457 456 model1.setrRisk(queryRiskName(patients.getRiskFactorId()));
458 457 //高危集合ID
459 458 model1.setRiskFactorId(patients.getRiskFactorId());
460   - System.out.println("待修改转诊信息："+model1.toString());
  459 + System.out.println("待修改转诊信息：" + model1.toString());
461 460 } catch (Exception e) {
462 461 e.printStackTrace();
463 462 }
... ... @@ -471,7 +470,7 @@
471 470 referralApplyOrderQuery2.setPid(patients.getPid());
472 471 //设置转出申请单的状态为接收
473 472 applyOrderService.updateByParentId(referralApplyOrderQuery2, model1);
474   - System.out.println("查询转诊条件："+referralApplyOrderQuery.convertToQuery().convertToMongoQuery());
  473 + System.out.println("查询转诊条件：" + referralApplyOrderQuery.convertToQuery().convertToMongoQuery());
475 474  
476 475 }
477 476 }
... ... @@ -643,10 +642,10 @@
643 642 //其他诊断
644 643 model.setOtherDiagn(antExChuModel.getDiagnosisOther());
645 644 model.setDiagnosis(antExChuModel.getDiagnosis());
646   - List<String> rlevel=Collections.emptyList();
647   - if(StringUtils.isNotEmpty(patients.getRiskLevelId())&&!"[]".equals(patients.getRiskLevelId())){
648   - rlevel= JsonUtil.jkstr2Obj(patients.getRiskLevelId(), List.class);
649   - com.lyms.platform.operate.web.utils.CollectionUtils.removeDuplicate(rlevel,true);
  645 + List<String> rlevel = Collections.emptyList();
  646 + if (StringUtils.isNotEmpty(patients.getRiskLevelId()) && !"[]".equals(patients.getRiskLevelId())) {
  647 + rlevel = JsonUtil.jkstr2Obj(patients.getRiskLevelId(), List.class);
  648 + com.lyms.platform.operate.web.utils.CollectionUtils.removeDuplicate(rlevel, true);
650 649 }
651 650 model.setrLevel(rlevel);
652 651 try {
... ... @@ -852,7 +851,7 @@
852 851 } else if (null != date) {
853 852 antExQuery.setEnd(date);
854 853 }
855   - List<AntenatalExaminationModel> list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "checkDate").addOrder(Sort.Direction.DESC,"created"));
  854 + List<AntenatalExaminationModel> list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "checkDate").addOrder(Sort.Direction.DESC, "created"));
856 855 HighScoreResult highScoreResult = new HighScoreResult();
857 856 boolean next = true;
858 857 if (CollectionUtils.isNotEmpty(list)) {
859 858  
860 859  
... ... @@ -1762,16 +1761,15 @@
1762 1761 }
1763 1762  
1764 1763 public BaseResponse getLastRisk(String patientId, Integer id) {
1765   - List highRisk = new ArrayList();
1766   - String highriskDesc = "";
  1764 + Map<String, Object> resultMap = new HashMap<>();
1767 1765 Patients patients = patientsService.findOnePatientById(patientId);
1768 1766 if (patients != null) {
1769 1767 HighScoreResult highScoreResult = findLastRisk(patients.getPid(), true);
1770   - highRisk = highScoreResult.getHighRisk();
1771   - highriskDesc = highScoreResult.getHighriskDesc();
  1768 + resultMap.put("highRisk", highScoreResult.getHighRisk());
  1769 + resultMap.put("highriskDesc", highScoreResult.getHighriskDesc());
  1770 + resultMap.put("screenResult", getscreenResult(patients.getScreenResult()));
1772 1771 }
1773   -
1774   - return new BaseObjectResponse().setData(highRisk).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(highriskDesc);
  1772 + return new BaseObjectResponse().setData(resultMap).setErrorcode(ErrorCodeConstants.SUCCESS);
1775 1773 }
1776 1774  
1777 1775  
... ... @@ -2601,7 +2599,7 @@
2601 2599 antexChuResult.setDiagnosis(queryRisk(list, false).getHighRisk());
2602 2600 }
2603 2601 } catch (Exception e) {
2604   -e.printStackTrace();
  2602 + e.printStackTrace();
2605 2603 }
2606 2604 try {
2607 2605 if (StringUtils.isNotEmpty(antExChuModel.getHighrisk())) {