From 003835154b54de17b2ac40c9dfcb2a70435068c5 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 13 Oct 2016 18:06:38 +0800 Subject: [PATCH] commit --- .../com/lyms/platform/operate/web/facade/ApplyOrderFacade.java | 10 ++++++++-- 1 file changed, 8 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 d22630b..07d1f1b 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 @@ -601,8 +601,14 @@ public class ApplyOrderFacade { referralApplyOrderQuery.setNeed("1"); String hospital = autoMatchFacade.getHospitalId(userId); - referralApplyOrderQuery.setHospitalId(hospital); - referralApplyOrderQuery.setHospitalName(organizationService.getOrganization(Integer.valueOf(hospital)).getName()); + if(StringUtils.isNotEmpty(hospital)){ + referralApplyOrderQuery.setHospitalId(hospital); + Organization og= organizationService.getOrganization(Integer.valueOf(hospital)); + if(null!=og){ + referralApplyOrderQuery.setHospitalName(og.getName()); + } + } + //1 转入 0转出 if ("1".equals(applyOrderQueryRequest.getAction())) { if (StringUtils.isNotEmpty(applyOrderQueryRequest.getTransferredHospital())) { -- 1.8.3.1