From f6823af4fb4938ae7136ecc88bfe12e15e1e322f Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 19 Aug 2016 10:56:06 +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 | 23 ++++++++++++++-------- 1 file changed, 15 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 5cf5a24..286ff37 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 @@ -261,18 +261,25 @@ public class ApplyOrderFacade { List list = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); ReferralApplyOrderResult referralApplyOrderResult = new ReferralApplyOrderResult(); if (CollectionUtils.isNotEmpty(list)) { - Patients patients = patientsService.findOnePatientById(list.get(0).getParentId()); - String zhuanchu = list.get(0).getOutHospitalId(); - Organization zhuanc = organizationService.getOrganization(Integer.valueOf(zhuanchu)); String zhuanCName = ""; String zhuanRname = ""; - if (null != zhuanc) { - zhuanCName = zhuanc.getName(); + Patients patients = patientsService.findOnePatientById(list.get(0).getParentId()); + String zhuanchu = list.get(0).getOutHospitalId(); + String zhuanru = list.get(0).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(zhuanchu)) { + Organization zhuanc1 = organizationService.getOrganization(Integer.valueOf(zhuanru)); + if (null != zhuanc1) { + zhuanRname = zhuanc1.getName(); + } } + referralApplyOrderResult.convertToResult(list.get(0), patients, zhuanCName, zhuanRname); Map map = new HashMap(); if (StringUtils.isNotEmpty(list.get(0).getApplyDoctor())) { -- 1.8.3.1