From f1acd7d6dae4816159bf8c4f6cb1a7c4fa20abe3 Mon Sep 17 00:00:00 2001
From: wtt <1872109740@qq.com>
Date: Sat, 23 Jan 2021 16:19:24 +0800
Subject: [PATCH] update

---
 .../operate/web/facade/BabyBookbuildingFacade.java |  2 ++
 .../platform/operate/web/facade/ViewFacade.java    |  3 +++
 .../operate/web/result/BabyBuildResult.java        | 23 +++++++++++++++++++++-
 .../operate/web/result/BabyPageResult.java         | 23 +++++++++++++++++++++-
 4 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
index f1c03f6..bfeefb3 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
@@ -1659,6 +1659,8 @@ public class BabyBookbuildingFacade {
             result = getBabyBuildResult(model);
             result.setYlSelect(model.getYlSelect());
             result.setNextDate(DateUtil.getyyyy_MM_dd(model.getNextDate()));
+            result.setIsUNHS(model.getIsUNHS());
+            result.setHearScrResult(model.getHearScrResult());
 
             result.setZhlbxqState(model.getZhlbxqState());
             result.setKouqNew(model.getKouqNew());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
index 07fd327..07920f9 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
@@ -5235,6 +5235,9 @@ public class ViewFacade {
 
             result = result.convertToResult(model);
             result.setYlSelect(model.getYlSelect());
+            result.setIsUNHS(model.getIsUNHS());
+            result.setHearScrResult(model.getHearScrResult());
+
             result.setNextDate(DateUtil.getyyyy_MM_dd(model.getNextDate()));
             result.setBnationId(model.getBnationId() == null ? "" : getBasicConfig(model.getBnationId()));//民族
             result.setEncoded(model.getEncoded());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java
index b455463..ff88b7a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java
@@ -12,7 +12,12 @@ public class BabyBuildResult {
     private String ylSelect;
     //下次预约
     private String nextDate;
-
+    // 听力是否筛查（20210122 张洁滦平需求，出院小结听力是否筛查 就是 baby耳声发射）
+    private Integer isUNHS;
+    /**
+     * 听筛结果 1-双耳通过，2-右侧未通过，3-左侧为通过，4-双侧未通过
+     */
+    private Integer hearScrResult;
 
     // 听性脑干新的 "tgstate": true(true 通过 false 未通过) "scstate": 1(1 未筛查 2 已筛查)
     private Map<String,Object> txngNew;
@@ -1060,6 +1065,22 @@ public class BabyBuildResult {
         return eljy;
     }
 
+    public Integer getIsUNHS() {
+        return isUNHS;
+    }
+
+    public void setIsUNHS(Integer isUNHS) {
+        this.isUNHS = isUNHS;
+    }
+
+    public Integer getHearScrResult() {
+        return hearScrResult;
+    }
+
+    public void setHearScrResult(Integer hearScrResult) {
+        this.hearScrResult = hearScrResult;
+    }
+
     public void setEljy(Integer eljy) {
         this.eljy = eljy;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
index fa517cb..8011f8b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
@@ -26,7 +26,12 @@ public class BabyPageResult  implements IBasicResultConvert<BabyPageResult,BabyM
     private String ylSelect;
     //下次预约
     private String nextDate;
-
+    // 听力是否筛查（20210122 张洁滦平需求，出院小结听力是否筛查 就是 baby耳声发射）
+    private Integer isUNHS;
+    /**
+     * 听筛结果 1-双耳通过，2-右侧未通过，3-左侧为通过，4-双侧未通过
+     */
+    private Integer hearScrResult;
 
     // 听性脑干新的 "tgstate": true(true 通过 false 未通过) "scstate": 1(1 未筛查 2 已筛查)
     private Map<String,Object> txngNew;
@@ -1279,6 +1284,22 @@ public class BabyPageResult  implements IBasicResultConvert<BabyPageResult,BabyM
         return kouqNew;
     }
 
+    public Integer getIsUNHS() {
+        return isUNHS;
+    }
+
+    public void setIsUNHS(Integer isUNHS) {
+        this.isUNHS = isUNHS;
+    }
+
+    public Integer getHearScrResult() {
+        return hearScrResult;
+    }
+
+    public void setHearScrResult(Integer hearScrResult) {
+        this.hearScrResult = hearScrResult;
+    }
+
     public void setKouqNew(Map <String, Object> kouqNew) {
         this.kouqNew = kouqNew;
     }
-- 
1.8.3.1