Commit 9481e0acada2c2dc21039ce891948947697b6c67
1 parent
b7be1325ee
Exists in
master
and in
6 other branches
区县产妇统计
Showing 1 changed file with 22 additions and 20 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
9481e0a
... | ... | @@ -625,29 +625,31 @@ |
625 | 625 | data = convertToQuanCPatient(patientses, userId, hospital); |
626 | 626 | } |
627 | 627 | } |
628 | - Organization og = organizationService.getOrganization(Integer.valueOf(hospital)); | |
628 | + if (StringUtils.isNotEmpty(hospital)) | |
629 | + { | |
630 | + Organization og = organizationService.getOrganization(Integer.valueOf(hospital)); | |
629 | 631 | |
630 | - if(og!=null&&"2".equals(og.getCityId())&&riskPatientsQueryRequest.getShowDetail()==1) {//隐藏姓名、地址 | |
631 | - for (Object result : data) { | |
632 | - if (result instanceof RiskPatientsResult) { | |
633 | - RiskPatientsResult riskResult = (RiskPatientsResult) result; | |
634 | - riskResult.setName(StringUtils.encryName(riskResult.getName())); | |
635 | - riskResult.setAddr(StringUtils.encryAddr(riskResult.getAddr())); | |
636 | - riskResult.setRegisterAddr(StringUtils.encryAddr(riskResult.getRegisterAddr())); | |
637 | - } else if (result instanceof QuanPatientsResult) { | |
638 | - QuanPatientsResult quanResult = (QuanPatientsResult) result; | |
639 | - quanResult.setName(StringUtils.encryName(quanResult.getName())); | |
640 | - quanResult.setAddr(StringUtils.encryAddr(quanResult.getAddr())); | |
641 | - quanResult.setRegisterAddr(StringUtils.encryAddr(quanResult.getRegisterAddr())); | |
642 | - } else if (result instanceof QuanChanResult) { | |
643 | - QuanChanResult quanResult = (QuanChanResult) result; | |
644 | - quanResult.setName(StringUtils.encryName(quanResult.getName())); | |
645 | - quanResult.setAddr(StringUtils.encryAddr(quanResult.getAddr())); | |
646 | - quanResult.setRegisterAddr(StringUtils.encryAddr(quanResult.getRegisterAddr())); | |
632 | + if(og!=null&&"2".equals(og.getCityId())&&riskPatientsQueryRequest.getShowDetail()==1) {//隐藏姓名、地址 | |
633 | + for (Object result : data) { | |
634 | + if (result instanceof RiskPatientsResult) { | |
635 | + RiskPatientsResult riskResult = (RiskPatientsResult) result; | |
636 | + riskResult.setName(StringUtils.encryName(riskResult.getName())); | |
637 | + riskResult.setAddr(StringUtils.encryAddr(riskResult.getAddr())); | |
638 | + riskResult.setRegisterAddr(StringUtils.encryAddr(riskResult.getRegisterAddr())); | |
639 | + } else if (result instanceof QuanPatientsResult) { | |
640 | + QuanPatientsResult quanResult = (QuanPatientsResult) result; | |
641 | + quanResult.setName(StringUtils.encryName(quanResult.getName())); | |
642 | + quanResult.setAddr(StringUtils.encryAddr(quanResult.getAddr())); | |
643 | + quanResult.setRegisterAddr(StringUtils.encryAddr(quanResult.getRegisterAddr())); | |
644 | + } else if (result instanceof QuanChanResult) { | |
645 | + QuanChanResult quanResult = (QuanChanResult) result; | |
646 | + quanResult.setName(StringUtils.encryName(quanResult.getName())); | |
647 | + quanResult.setAddr(StringUtils.encryAddr(quanResult.getAddr())); | |
648 | + quanResult.setRegisterAddr(StringUtils.encryAddr(quanResult.getRegisterAddr())); | |
649 | + } | |
647 | 650 | } |
648 | 651 | } |
649 | 652 | } |
650 | - | |
651 | 653 | return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(patientsQuery.getPageInfo()); |
652 | 654 | } |
653 | 655 |