Commit 86f5606cdb8460cbf273aa1bd45c5d11b6c6b1be

Authored by jiangjiazhi
1 parent dd72564029

增加是否通知

Showing 2 changed files with 37 additions and 1 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ 86f5606
... ... @@ -15,6 +15,8 @@
15 15 import com.lyms.platform.operate.web.result.ApplyOrderOutResult;
16 16 import com.lyms.platform.operate.web.result.ReferralApplyOrderResult;
17 17 import com.lyms.platform.operate.web.result.SieveApplyOrderResult;
  18 +import com.lyms.platform.permission.model.Organization;
  19 +import com.lyms.platform.permission.service.OrganizationService;
18 20 import com.lyms.platform.pojo.Patients;
19 21 import com.lyms.platform.pojo.ReferralApplyOrderModel;
20 22 import com.lyms.platform.pojo.SieveApplyOrderModel;
... ... @@ -44,6 +46,8 @@
44 46 private BasicConfigFacade basicConfigFacade;
45 47 @Autowired
46 48 private SieveService sieveService;
  49 + @Autowired
  50 + private OrganizationService organizationService;
47 51  
48 52 /**
49 53 * 增加转诊申请
... ... @@ -113,6 +117,16 @@
113 117 ReferralApplyOrderResult referralApplyOrderResult = new ReferralApplyOrderResult();
114 118 if (CollectionUtils.isNotEmpty(list)) {
115 119 Patients patients = patientsService.findOnePatientById(list.get(0).getParentId());
  120 + String zhuanchu =list.get(0).getOutHospitalId();
  121 + Organization zhuanc =organizationService.getOrganization(Integer.valueOf(zhuanchu));
  122 + String zhuanCName ,zhuanRname;
  123 + if(null!=zhuanc){
  124 + zhuanCName= zhuanc.getName();
  125 + }
  126 + Organization zhuanc1 =organizationService.getOrganization(Integer.valueOf(zhuanchu));
  127 + if(null!=zhuanc1){
  128 + zhuanRname =zhuanc1.getName();
  129 + }
116 130 referralApplyOrderResult.convertToResult(list.get(0), patients);
117 131 }
118 132 return new BaseObjectResponse().setData(referralApplyOrderResult).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java View file @ 86f5606
... ... @@ -60,7 +60,27 @@
60 60 private String transferMode;
61 61 //申请医生
62 62 private String applyDoctor;
  63 + //转出医院
  64 + private String zhuanCName;
  65 + //转入医院
  66 + private String zhuanRname;
63 67  
  68 + public String getZhuanCName() {
  69 + return zhuanCName;
  70 + }
  71 +
  72 + public void setZhuanCName(String zhuanCName) {
  73 + this.zhuanCName = zhuanCName;
  74 + }
  75 +
  76 + public String getZhuanRname() {
  77 + return zhuanRname;
  78 + }
  79 +
  80 + public void setZhuanRname(String zhuanRname) {
  81 + this.zhuanRname = zhuanRname;
  82 + }
  83 +
64 84 public Integer getAge() {
65 85 return age;
66 86 }
... ... @@ -205,7 +225,7 @@
205 225 this.transferredHospital = transferredHospital;
206 226 }
207 227  
208   - public ReferralApplyOrderResult convertToResult(ReferralApplyOrderModel destModel,Patients patients) {
  228 + public ReferralApplyOrderResult convertToResult(ReferralApplyOrderModel destModel,Patients patients,String zhuanCName ,String zhuanRname) {
209 229 setId(destModel.getId());
210 230 setParentId(destModel.getParentId());
211 231 setName(destModel.getName());
... ... @@ -221,6 +241,8 @@
221 241 setTransferMode(destModel.getTransferMode());
222 242 setApplyDoctor(destModel.getApplyDoctor());
223 243 setTransferredHospital(destModel.getTransferredHospital());
  244 + setZhuanCName(zhuanCName);
  245 + setZhuanRname(zhuanRname);
224 246 if(null!=patients){
225 247 setName(patients.getUsername());
226 248 setPhone(patients.getPhone());