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

---
 .../operate/web/request/AntExAddRequest.java       | 83 ++++++++++++----------
 1 file changed, 46 insertions(+), 37 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
index 3c4ca3d..55d250f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
@@ -266,17 +266,17 @@ public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminatio
     private String configItemId;
 
     //甲状腺功能 添加
-    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;
 
     /**
      * 腹围 1-未测 2-拒测
@@ -393,51 +393,51 @@ public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminatio
         this.ndbSelectOtherVal = ndbSelectOtherVal;
     }
 
-    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;
     }
 
@@ -1207,25 +1207,34 @@ public class AntExAddRequest implements IBasicRequestConvert<AntenatalExaminatio
         examinationModel.setHivkt(hivkt);
         examinationModel.setSupplement(supplement);
         examinationModel.setConfigItemId(configItemId);
-        java.text.DecimalFormat df = new java.text.DecimalFormat("#.##");
-        if (null != fTFour) {
-            examinationModel.setfTFour(df.format(fTFour));
-        }
-        if (null != fTthree) {
-            examinationModel.setfTthree(df.format(fTthree));
-        }
-        if (null != tSH) {
-            examinationModel.settSH(df.format(tSH));
-        }
-        if (null != tpaAb) {
-            examinationModel.setTpaAb(df.format(tpaAb));
-        }
-        if (null != aTSHR) {
-            examinationModel.setaTSHR(df.format(aTSHR));
-        }
-        if (null != tgAb) {
-            examinationModel.setTgAb(df.format(tgAb));
-        }
+//        java.text.DecimalFormat df = new java.text.DecimalFormat("#.##");
+//        if (null != fTFour) {
+//            examinationModel.setfTFour(df.format(fTFour));
+//        }
+//        if (null != fTthree) {
+//            examinationModel.setfTthree(df.format(fTthree));
+//        }
+//        if (null != tSH) {
+//            examinationModel.settSH(df.format(tSH));
+//        }
+//        if (null != tpaAb) {
+//            examinationModel.setTpaAb(df.format(tpaAb));
+//        }
+//        if (null != aTSHR) {
+//            examinationModel.setaTSHR(df.format(aTSHR));
+//        }
+//        if (null != tgAb) {
+//            examinationModel.setTgAb(df.format(tgAb));
+//        }
+
+
+        examinationModel.setfTFour(fTFour);
+        examinationModel.setfTthree(fTthree);
+        examinationModel.settSH(tSH);
+        examinationModel.setTpaAb(tpaAb);
+        examinationModel.setaTSHR(aTSHR);
+        examinationModel.setTgAb(tgAb);
+
 
         if (StringUtils.isNotEmpty(fuweiSelect)) {
             examinationModel.setFuweiSelect(fuweiSelect);
-- 
1.8.3.1