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 48136d4..fd7bd58 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 @@ -403,6 +403,11 @@ public class ApplyOrderFacade { BabyApplyOrderResult babyApplyOrderResult = new BabyApplyOrderResult(); String zhuanchu = applyOrderModel.getOutHospitalId(); String zhuanru = applyOrderModel.getTransferredHospital(); + + babyApplyOrderResult.convert(applyOrderModel, zhuanCName, zhuanRname); + List diagnoseList = babyCheckFacade.getBabyLastDiagnose(applyOrderModel.getPid()); + + if (NumberUtils.isNumber(zhuanchu)) { Organization zhuanc = organizationService.getOrganization(Integer.valueOf(zhuanchu)); if (null != zhuanc) { @@ -427,8 +432,6 @@ public class ApplyOrderFacade { babyApplyOrderResult.setRecDoctor(users.getName()); } } - babyApplyOrderResult.convert(applyOrderModel, zhuanCName, zhuanRname); - List diagnoseList = babyCheckFacade.getBabyLastDiagnose(applyOrderModel.getPid()); String diagnose = ""; if (CollectionUtils.isNotEmpty(diagnoseList)) { diagnose = "";