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 d9039dc..1a45cf0 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 @@ -52,6 +52,8 @@ public class ApplyOrderFacade { private OrganizationService organizationService; @Autowired private BabyService babyService; + @Autowired + private AntenatalExaminationFacade antenatalExaminationFacade; /** * 增加转诊申请 @@ -198,6 +200,12 @@ public class ApplyOrderFacade { for(ReferralApplyOrderModel applyOrderModel:orderModels){ BabyApplyOrderResult babyApplyOrderResult=new BabyApplyOrderResult(); babyApplyOrderResult.convert(applyOrderModel); + if(StringUtils.isNotEmpty(applyOrderModel.getTransferredHospital())){ + Organization organization = organizationService.getOrganization(Integer.valueOf(applyOrderModel.getTransferredHospital())); + if(null!=organization){ + babyApplyOrderResult.setTransferredHospital(organization.getName()); + } + } babyApplyOrderResults.add(babyApplyOrderResult); } } @@ -244,6 +252,13 @@ public class ApplyOrderFacade { for (ReferralApplyOrderModel orderModel : orderModels) { ApplyOrderOutResult applyOrderResult = new ApplyOrderOutResult(); applyOrderResult.convertToResult(orderModel); + if(StringUtils.isNotEmpty(orderModel.getTransferredHospital())){ + Organization organization = organizationService.getOrganization(Integer.valueOf(orderModel.getTransferredHospital())); + if(null!=organization){ + applyOrderResult.setTransferredHospital(organization.getName()); + } + } + data.add(applyOrderResult); } } @@ -259,6 +274,7 @@ public class ApplyOrderFacade { list.add(15); list.add(20); map.put("score", list); + map.put("organizations", antenatalExaminationFacade.convert()); return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } } \ No newline at end of file