Commit 1dd5f5b3ef8f2a2dab5b561272e64ff676c8e18c
1 parent
a364f3e902
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 12 additions and 0 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FamilyPlanningFacade.java
View file @
1dd5f5b
| ... | ... | @@ -292,6 +292,12 @@ |
| 292 | 292 | if (StringUtils.isNotEmpty(familyPlanningModel.getHospitalId())) { |
| 293 | 293 | familyPlanningResult.setHospitalName(CommonsHelper.getHospitalName(familyPlanningModel.getHospitalId(), organizationService)); |
| 294 | 294 | } |
| 295 | + if (StringUtils.isNotEmpty(familyPlanningModel.getCheckDoctor())) { | |
| 296 | + Users users = usersService.getUsers(NumberUtils.toInt(familyPlanningModel.getCheckDoctor())); | |
| 297 | + if (users != null && StringUtils.isNotEmpty(users.getName())) { | |
| 298 | + familyPlanningResult.setCheckDoctor(users.getName()); | |
| 299 | + } | |
| 300 | + } | |
| 295 | 301 | familyPlanningResultList.add(familyPlanningResult); |
| 296 | 302 | } |
| 297 | 303 | } |
| ... | ... | @@ -337,6 +343,12 @@ |
| 337 | 343 | if (familyPlanningResult != null) { |
| 338 | 344 | familyPlanningResult.convertToResult(familyPlanningModel); |
| 339 | 345 | familyPlanningResult.setHospitalName(CommonsHelper.getHospitalName(familyPlanningModel.getHospitalId(), organizationService)); |
| 346 | + if (StringUtils.isNotEmpty(familyPlanningModel.getCheckDoctor())) { | |
| 347 | + Users users = usersService.getUsers(NumberUtils.toInt(familyPlanningModel.getCheckDoctor())); | |
| 348 | + if (users != null && StringUtils.isNotEmpty(users.getName())) { | |
| 349 | + familyPlanningResult.setCheckDoctor(users.getName()); | |
| 350 | + } | |
| 351 | + } | |
| 340 | 352 | familyPlanningResultList.add(familyPlanningResult); |
| 341 | 353 | } |
| 342 | 354 | } |