jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f0c228edb6f05eb4033de51eced89c02b801a86c

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

update

Showing 2 changed files with 18 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ f0c228e
... ... @@ -856,7 +856,7 @@
856 856 ReferralApplyOrderModel referralApplyOrderModel = list.get(0);
857 857 String zhuanCName = "";
858 858 String zhuanRname = "";
859   - Patients patients = patientsService.findOnePatientById(referralApplyOrderModel.getParentId());
  859 +
860 860 String zhuanchu = referralApplyOrderModel.getOutHospitalId();
861 861 String zhuanru = referralApplyOrderModel.getTransferredHospital();
862 862 Map map1 = new HashMap();
863 863  
... ... @@ -886,9 +886,24 @@
886 886  
887 887 }
888 888 }
  889 +
  890 + Patients patients = null;
  891 + BabyModel babyModel = null;
  892 + if (referralApplyOrderModel.getType() == 2 )
  893 + {
  894 + patients = patientsService.findOnePatientById(referralApplyOrderModel.getParentId());
  895 + List<Map<String, Object>> screenList = antenatalExaminationFacade.getscreenResult(patients.getScreenResult());
  896 + referralApplyOrderResult.setScreenResult(screenList);
  897 + }
  898 + else
  899 + {
  900 + babyModel = babyService.getOneBabyById(referralApplyOrderModel.getParentId());
  901 + }
  902 +
889 903 referralApplyOrderResult.convertToResult(referralApplyOrderModel, patients, zhuanCName, zhuanRname);
890 904 referralApplyOrderResult.setTransferredHospital(map1);
891 905  
  906 +
892 907 try {
893 908 if (StringUtils.isNotEmpty(referralApplyOrderModel.getDiagnosis())) {
894 909 List diagnosis = JsonUtil.toList(referralApplyOrderModel.getDiagnosis(), List.class);
... ... @@ -916,8 +931,7 @@
916 931 }
917 932  
918 933 referralApplyOrderResult.setApplyDoctor(map);
919   - List<Map<String, Object>> screenList = antenatalExaminationFacade.getscreenResult(patients.getScreenResult());
920   - referralApplyOrderResult.setScreenResult(screenList);
  934 +
921 935  
922 936  
923 937 Map<String, Object> recDoctorMap = new HashMap<>();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java View file @ f0c228e
... ... @@ -279,7 +279,7 @@
279 279 //其他诊断
280 280 setOtherDiagn(destModel.getOtherDiagn());
281 281 setId(destModel.getId());
282   - setDiseaseDesc(destModel.getDiseaseDesc());
  282 +// setDiseaseDesc(destModel.getDiseaseDesc());
283 283 setParentId(destModel.getParentId());
284 284 setName(destModel.getName());
285 285 setAge(destModel.getAge());