Commit 971127b0c74e0ff78be390442f29aa555474b6f0
1 parent
ae3cbe79b2
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 10 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java
View file @
971127b
| ... | ... | @@ -751,7 +751,11 @@ |
| 751 | 751 | } |
| 752 | 752 | map.put("riskFactor", HighScoreResult.filter(rLevel)); // 妊娠风险等级 getrLevel |
| 753 | 753 | } |
| 754 | - map.put("zhuanRname", reScreeningModel.getTransferredHospital());//接诊机构 | |
| 754 | + if(StringUtils.isNotEmpty(reScreeningModel.getTransferredHospital())){ | |
| 755 | + Organization og = organizationService.getOrganization(Integer.valueOf(reScreeningModel.getTransferredHospital())); | |
| 756 | + if(og!=null) | |
| 757 | + map.put("zhuanRname", og.getName());//接诊机构 | |
| 758 | + } | |
| 755 | 759 | if (NumberUtils.isNumber(reScreeningModel.getRecDoctor())) { |
| 756 | 760 | Users users1 = usersService.getUsers(NumberUtils.toInt(reScreeningModel.getRecDoctor())); |
| 757 | 761 | if (null != users) { |
| ... | ... | @@ -837,7 +841,11 @@ |
| 837 | 841 | map.put("recDoctor", users1.getName());//报告人(接收医生) |
| 838 | 842 | } |
| 839 | 843 | } |
| 840 | - map.put("transferredHospitalName", reScreeningModel.getTransferredHospital());//报告机构(转入医院) | |
| 844 | + if(StringUtils.isNotEmpty(reScreeningModel.getTransferredHospital())){ | |
| 845 | + Organization og = organizationService.getOrganization(Integer.valueOf(reScreeningModel.getTransferredHospital())); | |
| 846 | + if(og!=null) | |
| 847 | + map.put("transferredHospitalName", og.getName());//报告机构(转入医院) | |
| 848 | + } | |
| 841 | 849 | map.put("reportingDate", DateUtil.getyyyy_MM_dd(new Date()));//报告日期 |
| 842 | 850 | } |
| 843 | 851 | return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); |