From 7c73c9451f2ab3da60fd8c998c5b53e552f1586e Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 26 Aug 2016 14:50:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E7=97=85=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/facade/ApplyOrderFacade.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 = ""; -- 1.8.3.1