From a88621174df1af8339e49cf84827553cdf89c7e7 Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Wed, 2 Sep 2020 11:44:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E7=AD=9B=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/pojo/SieveApplyOrderModel.java   | 23 +++++++++++-----------
 .../web/request/SieveApplyOrderAddRequest.java     | 22 +++++++++++----------
 .../operate/web/result/SieveListResult2.java       | 22 +++++++++++----------
 3 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java
index aa6e8e5..e659b5e 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java
@@ -281,11 +281,11 @@ public class SieveApplyOrderModel extends BaseModel {
     private Integer smoking;
     //I-型糖尿病  <空>：未知；0：无;1:有
     private Integer insulin;
-    private Integer hC;
+    private Double hC;
     //B超孕天 如果7W2D，此处应填5
     private Integer mannualEntry;
     //如果有NT，则必须有
-    private Integer nT;
+    private Double nT;
     //送检单位编号 30个字符以内，只能包含字母，数字，下划线和短杠
     private String responsibleCode;
     //既往T21  <空>：未知；0：无;1:有
@@ -445,14 +445,22 @@ public class SieveApplyOrderModel extends BaseModel {
         this.insulin = insulin;
     }
 
-    public Integer gethC() {
+    public Double gethC() {
         return hC;
     }
 
-    public void sethC(Integer hC) {
+    public void sethC(Double hC) {
         this.hC = hC;
     }
 
+    public Double getnT() {
+        return nT;
+    }
+
+    public void setnT(Double nT) {
+        this.nT = nT;
+    }
+
     public Integer getMannualEntry() {
         return mannualEntry;
     }
@@ -461,13 +469,6 @@ public class SieveApplyOrderModel extends BaseModel {
         this.mannualEntry = mannualEntry;
     }
 
-    public Integer getnT() {
-        return nT;
-    }
-
-    public void setnT(Integer nT) {
-        this.nT = nT;
-    }
 
     public String getResponsibleCode() {
         return responsibleCode;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java
index 558845b..2645756 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java
@@ -275,11 +275,11 @@ public class SieveApplyOrderAddRequest implements IBasicRequestConvert<SieveAppl
     private Integer smoking;
     //I-型糖尿病  <空>：未知；0：无;1:有
     private Integer insulin;
-    private Integer hC;
+    private Double hC;
     //B超孕天 如果7W2D，此处应填5
     private Integer mannualEntry;
     //如果有NT，则必须有
-    private Integer nT;
+    private Double nT;
     //送检单位编号 30个字符以内，只能包含字母，数字，下划线和短杠
     private String responsibleCode;
     //既往T21  <空>：未知；0：无;1:有
@@ -431,14 +431,22 @@ public class SieveApplyOrderAddRequest implements IBasicRequestConvert<SieveAppl
         this.insulin = insulin;
     }
 
-    public Integer gethC() {
+    public Double gethC() {
         return hC;
     }
 
-    public void sethC(Integer hC) {
+    public void sethC(Double hC) {
         this.hC = hC;
     }
 
+    public Double getnT() {
+        return nT;
+    }
+
+    public void setnT(Double nT) {
+        this.nT = nT;
+    }
+
     public Integer getMannualEntry() {
         return mannualEntry;
     }
@@ -447,13 +455,7 @@ public class SieveApplyOrderAddRequest implements IBasicRequestConvert<SieveAppl
         this.mannualEntry = mannualEntry;
     }
 
-    public Integer getnT() {
-        return nT;
-    }
 
-    public void setnT(Integer nT) {
-        this.nT = nT;
-    }
 
     public String getResponsibleCode() {
         return responsibleCode;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult2.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult2.java
index a06e66c..28d057b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult2.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult2.java
@@ -35,7 +35,7 @@ public class SieveListResult2 implements IBasicResultConvert<SieveListResult2, S
     private String crl;
     //B超信息  bpd
     private String bpd;
-    private Integer hC;
+    private Double hC;
     //B超孕天 如果7W2D，此处应填51
     private Integer mannualEntry;
     //I-型糖尿病  <空>：未知；0：无;1:有
@@ -45,7 +45,7 @@ public class SieveListResult2 implements IBasicResultConvert<SieveListResult2, S
     //孕妇编号 30个字符以内，只能包含字母，数字，下划线和短杠
     private String patientID;
     //如果有NT，则必须有
-    private Integer nT;
+    private Double nT;
     //送检单位编号 30个字符以内，只能包含字母，数字，下划线和短杠
     private String responsibleCode;
     //既往T21  <空>：未知；0：无;1:有
@@ -217,14 +217,22 @@ public class SieveListResult2 implements IBasicResultConvert<SieveListResult2, S
         this.noOfFetuses = noOfFetuses;
     }
 
-    public Integer gethC() {
+    public Double gethC() {
         return hC;
     }
 
-    public void sethC(Integer hC) {
+    public void sethC(Double hC) {
         this.hC = hC;
     }
 
+    public Double getnT() {
+        return nT;
+    }
+
+    public void setnT(Double nT) {
+        this.nT = nT;
+    }
+
     public Integer getMannualEntry() {
         return mannualEntry;
     }
@@ -257,13 +265,7 @@ public class SieveListResult2 implements IBasicResultConvert<SieveListResult2, S
         this.patientID = patientID;
     }
 
-    public Integer getnT() {
-        return nT;
-    }
 
-    public void setnT(Integer nT) {
-        this.nT = nT;
-    }
 
     public String getResponsibleCode() {
         return responsibleCode;
-- 
1.8.3.1