From 107d8bfb54c19c539a8f8cb70846f10fb95ddb3a Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 30 May 2019 20:40:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/result/BabyManageListResult.java | 21 +++++++++++++++++++++ .../platform/operate/web/utils/BabyListTask.java | 3 +++ 2 files changed, 24 insertions(+) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java index 551a39b..4c5b4bd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java @@ -74,6 +74,27 @@ public class BabyManageListResult { //分娩机构 private String fmHospitalName; + //母亲证件号 + private String mcertNo; + + private String mcertTypeId; + + public String getMcertNo() { + return mcertNo; + } + + public void setMcertNo(String mcertNo) { + this.mcertNo = mcertNo; + } + + public String getMcertTypeId() { + return mcertTypeId; + } + + public void setMcertTypeId(String mcertTypeId) { + this.mcertTypeId = mcertTypeId; + } + public String getFmHospitalName() { return fmHospitalName; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java index a1e3f52..b20cc31 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java @@ -108,6 +108,9 @@ public class BabyListTask implements Callable { result.setBuildTime(DateUtil.getyyyy_MM_dd(model.getBuildDate())); result.setHospitalName(hospitalName); + result.setMcertNo(model.getMcertNo()); + result.setMcertTypeId(model.getMcertTypeId()); + if (String.valueOf("true").equals(isArea)) { result.setHospitalName(organizationService.getOrganization(Integer.valueOf(model.getHospitalId())).getName()); -- 1.8.3.1