From 9873b031fc109ade6dc36148ec9c22954bb424d7 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Fri, 12 Jul 2019 10:24:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=B8=E5=9F=8E=E5=88=9D=E8=AF=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/request/AntExcAddRequest.java      | 88 ++++++++++++----------
 1 file changed, 48 insertions(+), 40 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
index 3e78d5a..120d361 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
@@ -377,17 +377,17 @@ public class AntExcAddRequest implements IBasicRequestConvert<AntExChuModel> {
 
 
     //甲状腺功能 添加
-    private Double fTthree;
+    private String fTthree;
 
-    private Double fTFour;
+    private String fTFour;
 
-    private Double tSH;
+    private String tSH;
 
-    private Double tpaAb;
+    private String tpaAb;
 
-    private Double tgAb;
+    private String tgAb;
 
-    private Double aTSHR;
+    private String aTSHR;
 
     //妊娠方法
     private Integer pregnancyMethod;
@@ -503,51 +503,51 @@ public class AntExcAddRequest implements IBasicRequestConvert<AntExChuModel> {
         this.edemaSelect = edemaSelect;
     }
 
-    public Double getfTthree() {
+    public String getfTthree() {
         return fTthree;
     }
 
-    public void setfTthree(Double fTthree) {
+    public void setfTthree(String fTthree) {
         this.fTthree = fTthree;
     }
 
-    public Double getfTFour() {
+    public String getfTFour() {
         return fTFour;
     }
 
-    public void setfTFour(Double fTFour) {
+    public void setfTFour(String fTFour) {
         this.fTFour = fTFour;
     }
 
-    public Double gettSH() {
+    public String gettSH() {
         return tSH;
     }
 
-    public void settSH(Double tSH) {
+    public void settSH(String tSH) {
         this.tSH = tSH;
     }
 
-    public Double getTpaAb() {
+    public String getTpaAb() {
         return tpaAb;
     }
 
-    public void setTpaAb(Double tpaAb) {
+    public void setTpaAb(String tpaAb) {
         this.tpaAb = tpaAb;
     }
 
-    public Double getTgAb() {
+    public String getTgAb() {
         return tgAb;
     }
 
-    public void setTgAb(Double tgAb) {
+    public void setTgAb(String tgAb) {
         this.tgAb = tgAb;
     }
 
-    public Double getaTSHR() {
+    public String getaTSHR() {
         return aTSHR;
     }
 
-    public void setaTSHR(Double aTSHR) {
+    public void setaTSHR(String aTSHR) {
         this.aTSHR = aTSHR;
     }
 
@@ -2098,28 +2098,36 @@ public class AntExcAddRequest implements IBasicRequestConvert<AntExChuModel> {
         antExChuModel.setFuwei(fuwei);
         antExChuModel.setTireNumber1(tireNumber1);
         antExChuModel.setPlacentas(placentas);
-        /**
-         * 产检项
-         * */
-        java.text.DecimalFormat df = new java.text.DecimalFormat("#.##");
-        if (null != fTFour) {
-            antExChuModel.setfTFour(df.format(fTFour));
-        }
-        if (null != fTthree) {
-            antExChuModel.setfTthree(df.format(fTthree));
-        }
-        if (null != tSH) {
-            antExChuModel.settSH(df.format(tSH));
-        }
-        if (null != tpaAb) {
-            antExChuModel.setTpaAb(df.format(tpaAb));
-        }
-        if (null != aTSHR) {
-            antExChuModel.setaTSHR(df.format(aTSHR));
-        }
-        if (null != tgAb) {
-            antExChuModel.setTgAb(df.format(tgAb));
-        }
+//        /**
+//         * 产检项
+//         * */
+//        java.text.DecimalFormat df = new java.text.DecimalFormat("#.##");
+//        if (null != fTFour) {
+//            antExChuModel.setfTFour(df.format(fTFour));
+//        }
+//        if (null != fTthree) {
+//            antExChuModel.setfTthree(df.format(fTthree));
+//        }
+//        if (null != tSH) {
+//            antExChuModel.settSH(df.format(tSH));
+//        }
+//        if (null != tpaAb) {
+//            antExChuModel.setTpaAb(df.format(tpaAb));
+//        }
+//        if (null != aTSHR) {
+//            antExChuModel.setaTSHR(df.format(aTSHR));
+//        }
+//        if (null != tgAb) {
+//            antExChuModel.setTgAb(df.format(tgAb));
+//        }
+
+        antExChuModel.setfTFour(fTFour);
+        antExChuModel.setfTthree(fTthree);
+        antExChuModel.settSH(tSH);
+        antExChuModel.setTpaAb(tpaAb);
+        antExChuModel.setaTSHR(aTSHR);
+        antExChuModel.setTgAb(tgAb);
+
 
         if (null != bp) {
             antExChuModel.setBp(JsonUtil.obj2JsonString(bp));
-- 
1.8.3.1