Commit e81632e03c77e906e261838fdb5fd51007e6c885
1 parent
6e85a658ef
Exists in
master
and in
1 other branch
督导医生问题修改
Showing 1 changed file with 15 additions and 13 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
e81632e
| ... | ... | @@ -1443,22 +1443,24 @@ |
| 1443 | 1443 | maternalDeliverResult.setDeliverDoctor(map); |
| 1444 | 1444 | //督导医生 |
| 1445 | 1445 | String supervisorDoctorId = deliverModel.getSupervisorDoctor(); |
| 1446 | - Map<String, String> supervisorMap = new HashMap<>(); | |
| 1447 | - try { | |
| 1448 | - Users users = usersService.getUsers(Integer.valueOf(supervisorDoctorId)); | |
| 1446 | + if (StringUtils.isNotEmpty(supervisorDoctorId)) { | |
| 1449 | 1447 | |
| 1450 | - if (null != users) { | |
| 1451 | - supervisorMap.put("id", users.getId() + ""); | |
| 1452 | - supervisorMap.put("name", users.getName()); | |
| 1448 | + | |
| 1449 | + Map<String, String> supervisorMap = new HashMap<>(); | |
| 1450 | + try { | |
| 1451 | + Users users = usersService.getUsers(Integer.valueOf(supervisorDoctorId)); | |
| 1452 | + if (null != users) { | |
| 1453 | + supervisorMap.put("id", users.getId() + ""); | |
| 1454 | + supervisorMap.put("name", users.getName()); | |
| 1455 | + } | |
| 1456 | + } catch (Exception e) { | |
| 1457 | + supervisorMap.put("id", "-1"); | |
| 1458 | + supervisorMap.put("name", doctorId); | |
| 1453 | 1459 | } |
| 1454 | - } catch (Exception e) { | |
| 1455 | - supervisorMap.put("id", "-1"); | |
| 1456 | - supervisorMap.put("name", doctorId); | |
| 1457 | - } | |
| 1458 | 1460 | |
| 1459 | 1461 | |
| 1460 | - maternalDeliverResult.setSupervisorDoctor(supervisorMap); | |
| 1461 | - | |
| 1462 | + maternalDeliverResult.setSupervisorDoctor(supervisorMap); | |
| 1463 | + } | |
| 1462 | 1464 | //获取新生儿信息 |
| 1463 | 1465 | List<MaternalDeliverModel.Baby> babyIdList = deliverModel.getBaby(); |
| 1464 | 1466 | List babyList = new ArrayList(); |
| ... | ... | @@ -2337,7 +2339,7 @@ |
| 2337 | 2339 | //新加根据母亲年龄查询 |
| 2338 | 2340 | if (null != newBabyManagerRequest.getStartAge() && null != newBabyManagerRequest.getEndAge()) { |
| 2339 | 2341 | Date start = DateUtil.getBeforeAge(newBabyManagerRequest.getStartAge()); |
| 2340 | - Date end = DateUtil.getBeforeAge(newBabyManagerRequest.getEndAge()+1); | |
| 2342 | + Date end = DateUtil.getBeforeAge(newBabyManagerRequest.getEndAge() + 1); | |
| 2341 | 2343 | babyModelQuery.setStartAge(start); |
| 2342 | 2344 | babyModelQuery.setEndAge(end); |
| 2343 | 2345 | } |