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 75afd05..debd8e7 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 @@ -333,8 +333,11 @@ public class ApplyOrderFacade { Patients patients = patientsService.findOnePatientById(list.get(0).getParentId()); String zhuanchu = list.get(0).getOutHospitalId(); String zhuanru = list.get(0).getTransferredHospital(); + Map map1 = new HashMap(); zhuanCName=zhuanchu; zhuanRname=zhuanru; + map1.put("id",""); + map1.put("name",zhuanRname); if (NumberUtils.isNumber(zhuanchu)) { Organization zhuanc = organizationService.getOrganization(Integer.valueOf(zhuanchu)); if (null != zhuanc) { @@ -346,10 +349,16 @@ public class ApplyOrderFacade { Organization zhuanc1 = organizationService.getOrganization(Integer.valueOf(zhuanru)); if (null != zhuanc1) { zhuanRname = zhuanc1.getName(); + map1.put("id",zhuanc1.getId()); + map1.put("name",zhuanRname); } } referralApplyOrderResult.convertToResult(list.get(0), patients, zhuanCName, zhuanRname); + + + referralApplyOrderResult.setTransferredHospital(map1); + Map map = new HashMap(); if (StringUtils.isNotEmpty(list.get(0).getApplyDoctor())) { Users users = usersService.getUsers(Integer.valueOf(list.get(0).getApplyDoctor())); 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 d704c65..3bb9222 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 @@ -47,7 +47,7 @@ public class ReferralApplyOrderResult { //高危评分 private Integer score; //转入医院 - private String transferredHospital; + private Map transferredHospital; //转出医院id private String outHospitalId; @@ -228,11 +228,11 @@ public class ReferralApplyOrderResult { this.transferredDisease = transferredDisease; } - public String getTransferredHospital() { + public Map getTransferredHospital() { return transferredHospital; } - public void setTransferredHospital(String transferredHospital) { + public void setTransferredHospital(Map transferredHospital) { this.transferredHospital = transferredHospital; } @@ -256,7 +256,6 @@ public class ReferralApplyOrderResult { setTransferMode(destModel.getTransferMode()); - setTransferredHospital(destModel.getTransferredHospital()); setZhuanCName(zhuanCName); setZhuanRname(zhuanRname); if(null!=patients){