From 9481e0acada2c2dc21039ce891948947697b6c67 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 24 May 2018 10:32:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=8E=BF=E4=BA=A7=E5=A6=87=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/PatientFacade.java | 42 +++++++++++----------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 2c8e284..7445603 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -625,29 +625,31 @@ public class PatientFacade { data = convertToQuanCPatient(patientses, userId, hospital); } } - Organization og = organizationService.getOrganization(Integer.valueOf(hospital)); - - if(og!=null&&"2".equals(og.getCityId())&&riskPatientsQueryRequest.getShowDetail()==1) {//隐藏姓名、地址 - for (Object result : data) { - if (result instanceof RiskPatientsResult) { - RiskPatientsResult riskResult = (RiskPatientsResult) result; - riskResult.setName(StringUtils.encryName(riskResult.getName())); - riskResult.setAddr(StringUtils.encryAddr(riskResult.getAddr())); - riskResult.setRegisterAddr(StringUtils.encryAddr(riskResult.getRegisterAddr())); - } else if (result instanceof QuanPatientsResult) { - QuanPatientsResult quanResult = (QuanPatientsResult) result; - quanResult.setName(StringUtils.encryName(quanResult.getName())); - quanResult.setAddr(StringUtils.encryAddr(quanResult.getAddr())); - quanResult.setRegisterAddr(StringUtils.encryAddr(quanResult.getRegisterAddr())); - } else if (result instanceof QuanChanResult) { - QuanChanResult quanResult = (QuanChanResult) result; - quanResult.setName(StringUtils.encryName(quanResult.getName())); - quanResult.setAddr(StringUtils.encryAddr(quanResult.getAddr())); - quanResult.setRegisterAddr(StringUtils.encryAddr(quanResult.getRegisterAddr())); + if (StringUtils.isNotEmpty(hospital)) + { + Organization og = organizationService.getOrganization(Integer.valueOf(hospital)); + + if(og!=null&&"2".equals(og.getCityId())&&riskPatientsQueryRequest.getShowDetail()==1) {//隐藏姓名、地址 + for (Object result : data) { + if (result instanceof RiskPatientsResult) { + RiskPatientsResult riskResult = (RiskPatientsResult) result; + riskResult.setName(StringUtils.encryName(riskResult.getName())); + riskResult.setAddr(StringUtils.encryAddr(riskResult.getAddr())); + riskResult.setRegisterAddr(StringUtils.encryAddr(riskResult.getRegisterAddr())); + } else if (result instanceof QuanPatientsResult) { + QuanPatientsResult quanResult = (QuanPatientsResult) result; + quanResult.setName(StringUtils.encryName(quanResult.getName())); + quanResult.setAddr(StringUtils.encryAddr(quanResult.getAddr())); + quanResult.setRegisterAddr(StringUtils.encryAddr(quanResult.getRegisterAddr())); + } else if (result instanceof QuanChanResult) { + QuanChanResult quanResult = (QuanChanResult) result; + quanResult.setName(StringUtils.encryName(quanResult.getName())); + quanResult.setAddr(StringUtils.encryAddr(quanResult.getAddr())); + quanResult.setRegisterAddr(StringUtils.encryAddr(quanResult.getRegisterAddr())); + } } } } - return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(patientsQuery.getPageInfo()); } -- 1.8.3.1