From e81632e03c77e906e261838fdb5fd51007e6c885 Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Mon, 10 Jun 2019 14:13:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9D=A3=E5=AF=BC=E5=8C=BB=E7=94=9F=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/MatDeliverFacade.java | 28 ++++++++++++---------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 3bbae00..35f86a6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -1443,22 +1443,24 @@ public class MatDeliverFacade { maternalDeliverResult.setDeliverDoctor(map); //督导医生 String supervisorDoctorId = deliverModel.getSupervisorDoctor(); - Map supervisorMap = new HashMap<>(); - try { - Users users = usersService.getUsers(Integer.valueOf(supervisorDoctorId)); + if (StringUtils.isNotEmpty(supervisorDoctorId)) { - if (null != users) { - supervisorMap.put("id", users.getId() + ""); - supervisorMap.put("name", users.getName()); - } - } catch (Exception e) { - supervisorMap.put("id", "-1"); - supervisorMap.put("name", doctorId); - } + Map supervisorMap = new HashMap<>(); + try { + Users users = usersService.getUsers(Integer.valueOf(supervisorDoctorId)); + if (null != users) { + supervisorMap.put("id", users.getId() + ""); + supervisorMap.put("name", users.getName()); + } + } catch (Exception e) { + supervisorMap.put("id", "-1"); + supervisorMap.put("name", doctorId); + } - maternalDeliverResult.setSupervisorDoctor(supervisorMap); + maternalDeliverResult.setSupervisorDoctor(supervisorMap); + } //获取新生儿信息 List babyIdList = deliverModel.getBaby(); List babyList = new ArrayList(); @@ -2337,7 +2339,7 @@ public class MatDeliverFacade { //新加根据母亲年龄查询 if (null != newBabyManagerRequest.getStartAge() && null != newBabyManagerRequest.getEndAge()) { Date start = DateUtil.getBeforeAge(newBabyManagerRequest.getStartAge()); - Date end = DateUtil.getBeforeAge(newBabyManagerRequest.getEndAge()+1); + Date end = DateUtil.getBeforeAge(newBabyManagerRequest.getEndAge() + 1); babyModelQuery.setStartAge(start); babyModelQuery.setEndAge(end); } -- 1.8.3.1