From cbb00a9ba0b050356ddf6a353c6962b3f74a8c2d Mon Sep 17 00:00:00 2001
From: shiyang <shiyang@lymsh.com>
Date: Thu, 19 Aug 2021 00:08:20 +0800
Subject: [PATCH] update

---
 .../operate/web/facade/BabyCheckFacade.java        |  1 +
 .../web/result/AntenatalExaminationResult.java     | 21 +++++++++++-
 .../operate/web/result/AntexChuResult.java         | 20 +++++++++++
 .../operate/web/result/BabyCheckResult.java        | 39 ++++++++++++++++------
 .../result/DischargeAbstractBabyQueryModel.java    | 34 +++++++++++++++++++
 5 files changed, 103 insertions(+), 12 deletions(-)

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 31c5fa4..6293443 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
@@ -2321,6 +2321,7 @@ public class BabyCheckFacade extends BaseServiceImpl {
         model.setYhipJoint(checkModel.getYhipJoint());
         //新加中医指导
         model.setTcmGuide(checkModel.getTcmGuide());
+        model.setWcOtherHighRisk(checkModel.getWcOtherHighRisk());
 
         return model;
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
index 630397d..e20a136 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
@@ -6,6 +6,7 @@ import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.operate.web.facade.HosptialHighRiskFacade;
 import com.lyms.platform.pojo.AntenatalExaminationModel;
+import com.mchange.v2.uid.UidUtils;
 import scala.actors.threadpool.Arrays;
 
 import java.util.Iterator;
@@ -535,6 +536,21 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
     //操作人id
     private String operaterUserId;
 
+    /**
+     * 围场孕妇产检新加字段
+     */
+    //孕妇NT
+    private String wcNt;
+
+    public String getWcNt() {
+        return wcNt;
+    }
+
+    public void setWcNt(String wcNt) {
+        this.wcNt = wcNt;
+    }
+    /************************/
+
     public String getOperaterUserId() {
         return operaterUserId;
     }
@@ -1289,7 +1305,10 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
         setHivkt(destModel.getHivkt());
         setBamnio(destModel.getBamnio());
         setOperaterUserId(destModel.getOperaterUserId());
-
+        //围场孕妇产检新加字段nt
+        if(StringUtils.isNotEmpty(destModel.getWcNt())){
+            setWcNt(destModel.getWcNt());
+        }
         return this;
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
index 1a11368..2deef03 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
@@ -656,6 +656,21 @@ public class AntexChuResult {
     //患者签名
     private String patientSign;
 
+    /**
+     * 围场孕妇产检新加字段
+     */
+    //孕妇NT
+    private String wcNt;
+
+    public String getWcNt() {
+        return wcNt;
+    }
+
+    public void setWcNt(String wcNt) {
+        this.wcNt = wcNt;
+    }
+    /***********************************************/
+
     public String getDoctorSign() {
         return doctorSign;
     }
@@ -2265,6 +2280,11 @@ public class AntexChuResult {
             setMonthCompliance(antExChuModel.getMonthCompliance());
             setCheckResult(antExChuModel.getCheckResult());
             setOperaterUserId(antExChuModel.getOperaterUserId());
+
+            //围场孕妇产检新加字段-孕妇NT
+            if(StringUtils.isNotEmpty(antExChuModel.getWcNt())){
+                setWcNt(antExChuModel.getWcNt());
+            }
         }
         return this;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java
index fb73844..d60a4bb 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java
@@ -609,17 +609,6 @@ public class BabyCheckResult {
     private Integer endCase;
     private String outcome;
 
-    /**新增字段 中医指导**/
-    //中医指导
-    private String tcmGuide;
-
-    public String getTcmGuide() {
-        return tcmGuide;
-    }
-
-    public void setTcmGuide(String tcmGuide) {
-        this.tcmGuide = tcmGuide;
-    }
 
     //儿童疾病
     private List<Map> diseases;
@@ -740,6 +729,34 @@ public class BabyCheckResult {
     private String socialContactIA;
     private String socialContactDQ;
 
+    /**新增字段 中医指导**/
+    //中医指导
+    private String tcmGuide;
+
+    public String getTcmGuide() {
+        return tcmGuide;
+    }
+
+    public void setTcmGuide(String tcmGuide) {
+        this.tcmGuide = tcmGuide;
+    }
+    /****************************/
+
+    /**
+     * 围场-儿童建档和儿童体检 添加字段
+     */
+    //儿童高危-其它高危
+    private String wcOtherHighRisk;
+
+    public String getWcOtherHighRisk() {
+        return wcOtherHighRisk;
+    }
+
+    public void setWcOtherHighRisk(String wcOtherHighRisk) {
+        this.wcOtherHighRisk = wcOtherHighRisk;
+    }
+
+    /********************************************/
 
     public String getExerciseIA() {
         return exerciseIA;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractBabyQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractBabyQueryModel.java
index 1eae424..2dc2a81 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractBabyQueryModel.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractBabyQueryModel.java
@@ -176,6 +176,40 @@ public class DischargeAbstractBabyQueryModel {
      */
     private String orderScreenDescription;
 
+    /**
+     * 围场出院小结页面新增字段
+     */
+    //耳聋基因筛查  0：未筛查，1：已筛查
+    private Integer deafnessGene;
+    //筛查日期
+    private String deafnessGeneDate;
+    //检查医生
+    private String deafnessCheckDoctor;
+
+    public Integer getDeafnessGene() {
+        return deafnessGene;
+    }
+
+    public void setDeafnessGene(Integer deafnessGene) {
+        this.deafnessGene = deafnessGene;
+    }
+
+    public String getDeafnessGeneDate() {
+        return deafnessGeneDate;
+    }
+
+    public void setDeafnessGeneDate(String deafnessGeneDate) {
+        this.deafnessGeneDate = deafnessGeneDate;
+    }
+
+    public String getDeafnessCheckDoctor() {
+        return deafnessCheckDoctor;
+    }
+
+    public void setDeafnessCheckDoctor(String deafnessCheckDoctor) {
+        this.deafnessCheckDoctor = deafnessCheckDoctor;
+    }
+
     public String getIsHighRisk() {
         return isHighRisk;
     }
-- 
1.8.3.1