From 24b23be6cf93112aef66a8ae23b493ce32caa980 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 25 May 2021 14:30:55 +0800 Subject: [PATCH] update --- .../com/lyms/platform/operate/web/facade/PostkfFaccade.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostkfFaccade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostkfFaccade.java index 5de0ab9..9188032 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostkfFaccade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostkfFaccade.java @@ -231,8 +231,14 @@ public class PostkfFaccade { { MaternalDeliverModel maternalDeliverModel = list2.get(0); info.put("fmDate",maternalDeliverModel.getDueDate()); - info.put("fmDoctor",usersService.getUsers(Integer.parseInt(maternalDeliverModel.getDeliverDoctor())).getName()); - info.put("name",patientsService.findOnePatientById(maternalDeliverModel.getParentId()).getUsername()); + info.put("fmDoctor", usersService.getUsers(Integer.parseInt(maternalDeliverModel.getDeliverDoctor())).getName()); + + Patients patients = patientsService.findOnePatientById(maternalDeliverModel.getParentId()); + if (patients != null) + { + info.put("name",patients.getUsername()); + info.put("age", DateUtil.getAge(patients.getBirth(), maternalDeliverModel.getDueDate1())); + } } BaseObjectResponse response = new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(CollectionUtils.isNotEmpty(postkfModels) -- 1.8.3.1