From 103c490ac94f82383b12031f090c48fa54cbaa39 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 18 Aug 2016 17:52:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E7=BD=AEparentid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/ApplyOrderFacade.java | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 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 91110d1..350e2ba 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 @@ -290,19 +290,25 @@ public class ApplyOrderFacade { List orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); if (CollectionUtils.isNotEmpty(orderModels)) { + String zhuanCName = ""; + String zhuanRname = ""; for (ReferralApplyOrderModel applyOrderModel : orderModels) { BabyApplyOrderResult babyApplyOrderResult = new BabyApplyOrderResult(); String zhuanchu = applyOrderModel.getOutHospitalId(); - Organization zhuanc = organizationService.getOrganization(Integer.valueOf(zhuanchu)); - String zhuanCName = ""; - String zhuanRname = ""; - if (null != zhuanc) { - zhuanCName = zhuanc.getName(); + String zhuanru= applyOrderModel.getTransferredHospital(); + if(NumberUtils.isNumber(zhuanchu)){ + Organization zhuanc = organizationService.getOrganization(Integer.valueOf(zhuanchu)); + if (null != zhuanc) { + zhuanCName = zhuanc.getName(); + } } - Organization zhuanc1 = organizationService.getOrganization(Integer.valueOf(zhuanchu)); - if (null != zhuanc1) { - zhuanRname = zhuanc1.getName(); + if(NumberUtils.isNumber(zhuanru)){ + Organization zhuanc1 = organizationService.getOrganization(Integer.valueOf(zhuanru)); + if (null != zhuanc1) { + zhuanRname = zhuanc1.getName(); + } } + /* BabyModelQuery babyModelQuery=new BabyModelQuery(); babyModelQuery.setId(applyOrderModel.getParentId()); babyModelQuery.setYn(YnEnums.YES.getId()); -- 1.8.3.1