From b9d5a14383e44b7c662586bf0c1474628621e2c0 Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Sat, 4 Dec 2021 09:57:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=A6=E7=9A=87=E5=B2=9B-=E6=97=A9=E4=BA=A7?=
 =?UTF-8?q?=E5=AD=A9=E5=AD=90=E8=BF=90=E5=8A=A8=E6=B5=8B=E8=AF=84=E6=8C=89?=
 =?UTF-8?q?=E9=A2=84=E4=BA=A7=E6=9C=9F=E6=B5=8B=E8=AF=84=E4=B8=8D=E6=8C=89?=
 =?UTF-8?q?=E7=85=A7=E5=87=BA=E7=94=9F=E6=97=A5=E6=9C=9F=E5=A4=A9=E6=95=B0?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=84=E6=88=96=E8=80=85=E5=8C=BB=E7=94=9F=E6=83=B3?=
 =?UTF-8?q?=E8=87=AA=E5=B7=B1=E6=89=8B=E5=8A=A8=E8=BE=93=E5=85=A5=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C,=E8=BE=93=E5=85=A5=E9=94=99=E8=AF=AF=E8=83=BD?=
 =?UTF-8?q?=E8=87=AA=E5=B7=B1=E5=88=A0=E9=99=A4.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/BabyCheckFacade.java         |  4 ++++
 .../operate/web/result/BabyChooseResult.java        | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
index 231dfdd..dccfe05 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
@@ -1983,6 +1983,10 @@ public class BabyCheckFacade extends BaseServiceImpl {
                     result.setHighRisk(model.getHighRisk());
                     result.setWeakSon(model.getWeakSon());
                     result.setBabyDiagnosis(model.getBabyDiagnosis());
+                    //预产期
+                    result.setDueDate(model.getDueDate());
+                    //分娩孕周
+                    result.setDueWeek(model.getDueWeek());
                     //秦皇岛-高危儿详情
                     result.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(model.getQhdHighRiskInfo())?model.getQhdHighRiskInfo():null);
                     List <BabyChooseResult> list = new ArrayList <>();
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyChooseResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyChooseResult.java
index ba1e1f2..5fe6163 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyChooseResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyChooseResult.java
@@ -1,5 +1,6 @@
 package com.lyms.platform.operate.web.result;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -19,6 +20,8 @@ public class BabyChooseResult {
     private String blNo;
     private List highRiskInfo;//儿童高危详情
     private List weakSonInfo;//体弱儿详情
+    private Date dueDate;//预产期
+    private Integer dueWeek;//分娩孕周
 
     //是否高危 0 非高危 1高危
     private Integer highRisk;
@@ -52,8 +55,26 @@ public class BabyChooseResult {
     public void setQhdHighRiskInfo(List<Map<String, String>> qhdHighRiskInfo) {
         this.qhdHighRiskInfo = qhdHighRiskInfo;
     }
+
+    public Date getDueDate() {
+        return dueDate;
+    }
+
+    public void setDueDate(Date dueDate) {
+        this.dueDate = dueDate;
+    }
+
+    public Integer getDueWeek() {
+        return dueWeek;
+    }
+
+    public void setDueWeek(Integer dueWeek) {
+        this.dueWeek = dueWeek;
+    }
+
     /***********************************************************/
 
+
     public String getBabyDiagnosis() {
         return babyDiagnosis;
     }
-- 
1.8.3.1