From a64bfc8c73de954763bbe7baeb768f572ebe8305 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 20 Jun 2017 14:09:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9C=80=E5=90=8E=E4=B8=80?=
 =?UTF-8?q?=E6=AC=A1=E9=A1=BF=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/result/AntenatalExaminationResult.java     | 67 +++++++++++++++++++
 .../operate/web/result/AntexChuResult.java         | 78 ++++++++++++++++++++++
 2 files changed, 145 insertions(+)

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 9dbf785..bb30782 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
@@ -86,6 +86,67 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
     private int hasSieve;
     private String cDueWeek;
 
+    //            //早孕期病毒检测
+           private String zyqbdjc;
+//            //nt检查
+            private String ntjc;
+           //产前筛查
+            private String cjsc;
+//            //胎儿系统排畸b吵
+           private String textpjbc;
+            //75gODTT
+            private String s75gdgtt;
+//            //甲状腺功能
+           private String jzxgn;
+
+    public String getZyqbdjc() {
+        return zyqbdjc;
+    }
+
+    public void setZyqbdjc(String zyqbdjc) {
+        this.zyqbdjc = zyqbdjc;
+    }
+
+    public String getNtjc() {
+        return ntjc;
+    }
+
+    public void setNtjc(String ntjc) {
+        this.ntjc = ntjc;
+    }
+
+    public String getCjsc() {
+        return cjsc;
+    }
+
+    public void setCjsc(String cjsc) {
+        this.cjsc = cjsc;
+    }
+
+    public String getTextpjbc() {
+        return textpjbc;
+    }
+
+    public void setTextpjbc(String textpjbc) {
+        this.textpjbc = textpjbc;
+    }
+
+    public String getS75gdgtt() {
+        return s75gdgtt;
+    }
+
+    public void setS75gdgtt(String s75gdgtt) {
+        this.s75gdgtt = s75gdgtt;
+    }
+
+    public String getJzxgn() {
+        return jzxgn;
+    }
+
+    public void setJzxgn(String jzxgn) {
+        this.jzxgn = jzxgn;
+    }
+
     public String getDiagnosisOther() {
         return diagnosisOther;
     }
@@ -156,6 +217,12 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
         setBloodSugar2(destModel.getBloodSugar2());
         setBloodSugar3(destModel.getBloodSugar3());
         setBloodSugar4(destModel.getBloodSugar4());
+        setZyqbdjc(destModel.getZyqbd());
+        setNtjc(destModel.getNtjc());
+        setCjsc(destModel.getCjsc());
+        setTextpjbc(destModel.getTextpjbc());
+        setS75gdgtt(destModel.getS75gdgtt());
+        setJzxgn(destModel.getJzxgn());
         try {
             setBp(JsonUtil.str2Obj(destModel.getBp(), java.util.Map.class));
         } catch (Exception e) {
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 f8d08f2..cf2389c 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
@@ -230,6 +230,19 @@ public class AntexChuResult {
     private int hasRefer;
     //是否有产筛
     private int hasSieve;
+
+    //早孕期病毒检测
+    private String zyqbdjc;
+    //nt检查
+    private String ntjc;
+    //产前筛查
+    private String cjsc;
+    //胎儿系统排畸b吵
+    private String textpjbc;
+    //75gODTT
+    private String s75gdgtt;
+    //甲状腺功能
+    private String jzxgn;
     /**
      * 其他的诊断意见
      */
@@ -801,6 +814,53 @@ public class AntexChuResult {
         this.xqjq = xqjq;
     }
 
+    public String getZyqbdjc() {
+        return zyqbdjc;
+    }
+
+    public void setZyqbdjc(String zyqbdjc) {
+        this.zyqbdjc = zyqbdjc;
+    }
+
+    public String getNtjc() {
+        return ntjc;
+    }
+
+    public void setNtjc(String ntjc) {
+        this.ntjc = ntjc;
+    }
+
+    public String getCjsc() {
+        return cjsc;
+    }
+
+    public void setCjsc(String cjsc) {
+        this.cjsc = cjsc;
+    }
+
+    public String getTextpjbc() {
+        return textpjbc;
+    }
+
+    public void setTextpjbc(String textpjbc) {
+        this.textpjbc = textpjbc;
+    }
+
+    public String getS75gdgtt() {
+        return s75gdgtt;
+    }
+
+    public void setS75gdgtt(String s75gdgtt) {
+        this.s75gdgtt = s75gdgtt;
+    }
+
+    public String getJzxgn() {
+        return jzxgn;
+    }
+
+    public void setJzxgn(String jzxgn) {
+        this.jzxgn = jzxgn;
+    }
 
     public Map getYdfmw() {
         return ydfmw;
@@ -968,6 +1028,24 @@ public class AntexChuResult {
             setBarCode(antExChuModel.getBarCode());
             setId(antExChuModel.getId());
             setParentId(antExChuModel.getParentId());
+//            //早孕期病毒检测
+//            private String zyqbdjc;
+//            //nt检查
+//            private String ntjc;
+//            //产前筛查
+//            private String cjsc;
+//            //胎儿系统排畸b吵
+//            private String textpjbc;
+//            //75gODTT
+//            private String s75gdgtt;
+//            //甲状腺功能
+//            private String jzxgn;
+            setZyqbdjc(antExChuModel.getZyqbd());
+            setNtjc(antExChuModel.getNtjc());
+            setCjsc(antExChuModel.getCjsc());
+            setTextpjbc(antExChuModel.getTextpjbc());
+            setS75gdgtt(antExChuModel.getS75gdgtt());
+            setJzxgn(antExChuModel.getJzxgn());
             try {
                 setPastHistory(JsonUtil.jkstr2Obj(antExChuModel.getPastHistory(), Map.class));
             } catch (Exception e) {
-- 
1.8.3.1