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 e030f16..aff6b9a 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 @@ -69,23 +69,19 @@ public class ApplyOrderFacade { //添加回执单 public BaseResponse addReferralReceipt(ReferralReceiptRequest referralReceipt) { - ReferralApplyOrderModel referralApplyOrderModel = applyOrderService.findByIdReferralApplyOrder(referralReceipt.getId()); + ReferralApplyOrderModel referralApplyOrderModel = new ReferralApplyOrderModel(); referralReceipt.convertToDataModel(referralApplyOrderModel); referralApplyOrderModel.setrRisk(queryRiskName(referralReceipt.getrRisk())); referralApplyOrderModel.setRiskFactorId(referralReceipt.getrRisk()); int score = antenatalExaminationFacade.queryRisk(referralReceipt.getrRisk(), false).getScore(); //高危评分 referralApplyOrderModel.setScore(score); - if (StringUtils.isNotEmpty(referralApplyOrderModel.getId())) { - updataReferral(referralReceipt.getPatientId(),referralApplyOrderModel); - return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); - } else { - return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("错误"); - } + updataReferral(referralReceipt.getPatientId(), referralApplyOrderModel); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } //同步更新两条转诊记录信息 - public void updataReferral(String patientId,ReferralApplyOrderModel referralApplyModel){ + public void updataReferral(String patientId, ReferralApplyOrderModel referralApplyModel) { Patients patients = patientsService.findOnePatientById(patientId); ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); referralApplyOrderQuery.setParentId(patientId); @@ -102,13 +98,6 @@ public class ApplyOrderFacade { referralApplyOrderQuery1.setTransferredHospital(patients.getHospitalId()); referralApplyOrderQuery1.setPid(patients.getPid()); applyOrderService.updateByParentId(referralApplyOrderQuery1, referralApplyModel); - - //查询转出申请单 - ReferralApplyOrderQuery referralApplyOrderQuery2 = new ReferralApplyOrderQuery(); - referralApplyOrderQuery2.setOutHospitalId(patients.getHospitalId()); - referralApplyOrderQuery2.setTransferredHospital(outHospitalId); - referralApplyOrderQuery2.setPid(patients.getPid()); - applyOrderService.updateByParentId(referralApplyOrderQuery2, referralApplyModel); } } @@ -522,14 +511,14 @@ public class ApplyOrderFacade { referralApplyOrderResult.setScreenResult(screenList); - Map recDoctorMap = new HashMap<>(); + Map recDoctorMap = new HashMap<>(); //接诊医生 if (NumberUtils.isNumber(referralApplyOrderModel.getRecDoctor())) { - recDoctorMap.put("id",referralApplyOrderModel.getRecDoctor()); + recDoctorMap.put("id", referralApplyOrderModel.getRecDoctor()); Users users = usersService.getUsers(NumberUtils.toInt(referralApplyOrderModel.getRecDoctor())); if (null != users) { - recDoctorMap.put("id",users.getId()); - recDoctorMap.put("name",users.getName()); + recDoctorMap.put("id", users.getId()); + recDoctorMap.put("name", users.getName()); referralApplyOrderResult.setRecDoctor(recDoctorMap); } } @@ -908,7 +897,7 @@ public class ApplyOrderFacade { } applyOrderResult.setrLevel(rLevel); Patients patients = patientsService.findOnePatientById(orderModel.getParentId()); - if(patients!=null){ + if (patients != null) { //筛查结果数据 String screenStr = basicConfigService.getScreenResult(patients.getScreenResult()); applyOrderResult.setScreenResult(screenStr); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralReceiptRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralReceiptRequest.java index e22d61a..0917c1d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralReceiptRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralReceiptRequest.java @@ -77,7 +77,6 @@ public class ReferralReceiptRequest { * @return 转换后的model */ public void convertToDataModel(ReferralApplyOrderModel referralApplyOrderModel) { - referralApplyOrderModel.setId(id); referralApplyOrderModel.setrRisk(rRisk); if (null != diagnosis) { referralApplyOrderModel.setDiagnosis(JsonUtil.array2JsonString(diagnosis));