From 48665bdaa9a2d45667dfe3500ee0700b81333573 Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Tue, 19 Oct 2021 15:12:15 +0800
Subject: [PATCH] update

---
 .../operate/web/facade/BabyCheckFacade.java        |  3 +++
 .../operate/web/result/BabyBasicResult.java        | 27 ++++++++++++++++++++++
 2 files changed, 30 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 03ce2e2..e27fcef 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
@@ -1081,6 +1081,9 @@ public class BabyCheckFacade extends BaseServiceImpl {
             Query query=Query.query(criteria);
             BabyHighRiskBabyModel babyHighRiskBabyModel=mongoTemplate.findOne(query, BabyHighRiskBabyModel.class);
             base.setCyzd(null!=babyHighRiskBabyModel ? babyHighRiskBabyModel.getCyzd() : "");
+            base.setCyzdList(null!=babyHighRiskBabyModel ? babyHighRiskBabyModel.getCyzdList() : null);
+            //预产期
+            base.setBirthDueDate(babyHighRiskBabyModel.getBirthDueDate());
         }
         resMap.put("baseInfo", base);
         resMap.put("checkList", list);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java
index 58fcd96..ce1755c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java
@@ -1,5 +1,6 @@
 package com.lyms.platform.operate.web.result;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -134,6 +135,32 @@ public class BabyBasicResult {
     //基本信息里的出院诊断
     private String cyzd;
 
+    /**
+     * 秦皇岛-出院诊断模块整合(住院号，住院时间，出院诊断)
+     */
+    //出院诊断list<map>
+    private List<Map<String,Object>> cyzdList;
+
+    public List<Map<String, Object>> getCyzdList() {
+        return cyzdList;
+    }
+
+    public void setCyzdList(List<Map<String, Object>> cyzdList) {
+        this.cyzdList = cyzdList;
+    }
+    /***********************************************************/
+
+    //秦皇岛-新增检查页面需要预产期
+    private Date birthDueDate;
+
+    public Date getBirthDueDate() {
+        return birthDueDate;
+    }
+
+    public void setBirthDueDate(Date birthDueDate) {
+        this.birthDueDate = birthDueDate;
+    }
+
     public String getCyzd() {
         return cyzd;
     }
-- 
1.8.3.1