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 70d17b0..0c182b0 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 @@ -15,6 +15,8 @@ import com.lyms.platform.operate.web.request.SieveApplyOrderAddRequest; import com.lyms.platform.operate.web.result.ApplyOrderOutResult; import com.lyms.platform.operate.web.result.ReferralApplyOrderResult; import com.lyms.platform.operate.web.result.SieveApplyOrderResult; +import com.lyms.platform.permission.model.Organization; +import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.pojo.Patients; import com.lyms.platform.pojo.ReferralApplyOrderModel; import com.lyms.platform.pojo.SieveApplyOrderModel; @@ -44,6 +46,8 @@ public class ApplyOrderFacade { private BasicConfigFacade basicConfigFacade; @Autowired private SieveService sieveService; + @Autowired + private OrganizationService organizationService; /** * 增加转诊申请 @@ -113,6 +117,16 @@ public class ApplyOrderFacade { ReferralApplyOrderResult referralApplyOrderResult = new ReferralApplyOrderResult(); if (CollectionUtils.isNotEmpty(list)) { Patients patients = patientsService.findOnePatientById(list.get(0).getParentId()); + String zhuanchu =list.get(0).getOutHospitalId(); + Organization zhuanc =organizationService.getOrganization(Integer.valueOf(zhuanchu)); + String zhuanCName ,zhuanRname; + if(null!=zhuanc){ + zhuanCName= zhuanc.getName(); + } + Organization zhuanc1 =organizationService.getOrganization(Integer.valueOf(zhuanchu)); + if(null!=zhuanc1){ + zhuanRname =zhuanc1.getName(); + } referralApplyOrderResult.convertToResult(list.get(0), patients); } return new BaseObjectResponse().setData(referralApplyOrderResult).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java index 0e5e908..d93ace2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java @@ -60,6 +60,26 @@ public class ReferralApplyOrderResult { private String transferMode; //申请医生 private String applyDoctor; + //转出医院 + private String zhuanCName; + //转入医院 + private String zhuanRname; + + public String getZhuanCName() { + return zhuanCName; + } + + public void setZhuanCName(String zhuanCName) { + this.zhuanCName = zhuanCName; + } + + public String getZhuanRname() { + return zhuanRname; + } + + public void setZhuanRname(String zhuanRname) { + this.zhuanRname = zhuanRname; + } public Integer getAge() { return age; @@ -205,7 +225,7 @@ public class ReferralApplyOrderResult { this.transferredHospital = transferredHospital; } - public ReferralApplyOrderResult convertToResult(ReferralApplyOrderModel destModel,Patients patients) { + public ReferralApplyOrderResult convertToResult(ReferralApplyOrderModel destModel,Patients patients,String zhuanCName ,String zhuanRname) { setId(destModel.getId()); setParentId(destModel.getParentId()); setName(destModel.getName()); @@ -221,6 +241,8 @@ public class ReferralApplyOrderResult { setTransferMode(destModel.getTransferMode()); setApplyDoctor(destModel.getApplyDoctor()); setTransferredHospital(destModel.getTransferredHospital()); + setZhuanCName(zhuanCName); + setZhuanRname(zhuanRname); if(null!=patients){ setName(patients.getUsername()); setPhone(patients.getPhone());