Commit 00cb5692e39ed87832e4e51f7cf01b5691126bb4
1 parent
7c81096d47
Exists in
master
and in
1 other branch
增加是否通知
Showing 1 changed file with 16 additions and 0 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
View file @
00cb569
| ... | ... | @@ -52,6 +52,8 @@ |
| 52 | 52 | private OrganizationService organizationService; |
| 53 | 53 | @Autowired |
| 54 | 54 | private BabyService babyService; |
| 55 | + @Autowired | |
| 56 | + private AntenatalExaminationFacade antenatalExaminationFacade; | |
| 55 | 57 | |
| 56 | 58 | /** |
| 57 | 59 | * 增加转诊申请 |
| ... | ... | @@ -198,6 +200,12 @@ |
| 198 | 200 | for(ReferralApplyOrderModel applyOrderModel:orderModels){ |
| 199 | 201 | BabyApplyOrderResult babyApplyOrderResult=new BabyApplyOrderResult(); |
| 200 | 202 | babyApplyOrderResult.convert(applyOrderModel); |
| 203 | + if(StringUtils.isNotEmpty(applyOrderModel.getTransferredHospital())){ | |
| 204 | + Organization organization = organizationService.getOrganization(Integer.valueOf(applyOrderModel.getTransferredHospital())); | |
| 205 | + if(null!=organization){ | |
| 206 | + babyApplyOrderResult.setTransferredHospital(organization.getName()); | |
| 207 | + } | |
| 208 | + } | |
| 201 | 209 | babyApplyOrderResults.add(babyApplyOrderResult); |
| 202 | 210 | } |
| 203 | 211 | } |
| ... | ... | @@ -244,6 +252,13 @@ |
| 244 | 252 | for (ReferralApplyOrderModel orderModel : orderModels) { |
| 245 | 253 | ApplyOrderOutResult applyOrderResult = new ApplyOrderOutResult(); |
| 246 | 254 | applyOrderResult.convertToResult(orderModel); |
| 255 | + if(StringUtils.isNotEmpty(orderModel.getTransferredHospital())){ | |
| 256 | + Organization organization = organizationService.getOrganization(Integer.valueOf(orderModel.getTransferredHospital())); | |
| 257 | + if(null!=organization){ | |
| 258 | + applyOrderResult.setTransferredHospital(organization.getName()); | |
| 259 | + } | |
| 260 | + } | |
| 261 | + | |
| 247 | 262 | data.add(applyOrderResult); |
| 248 | 263 | } |
| 249 | 264 | } |
| ... | ... | @@ -259,6 +274,7 @@ |
| 259 | 274 | list.add(15); |
| 260 | 275 | list.add(20); |
| 261 | 276 | map.put("score", list); |
| 277 | + map.put("organizations", antenatalExaminationFacade.convert()); | |
| 262 | 278 | return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); |
| 263 | 279 | } |
| 264 | 280 | } |