From 057d64a68456069cfb04f810e30fd9e968963247 Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Mon, 21 Dec 2020 14:08:43 +0800
Subject: [PATCH] update

---
 .../lyms/platform/pojo/SieveApplyOrderModel.java    | 21 ++++++++++++++++++++-
 .../platform/operate/web/facade/SieveFacade.java    |  3 +++
 .../web/request/SieveApplyOrderAddRequest.java      | 21 +++++++++++++++++++++
 3 files changed, 44 insertions(+), 1 deletion(-)

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 e659b5e..df18be3 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
@@ -145,7 +145,10 @@ public class SieveApplyOrderModel extends BaseModel {
      * 胎数 0/单胎 1/双胎 2/多胎 3/异常
      */
     private String fetusNum;
-
+    //异常多胎
+    private String fetusDuo;
+    //异常单胎
+    private String fetusDan;
     /**
      * 异常说明
      */
@@ -389,6 +392,22 @@ public class SieveApplyOrderModel extends BaseModel {
         return pAPPAType;
     }
 
+    public String getFetusDuo() {
+        return fetusDuo;
+    }
+
+    public void setFetusDuo(String fetusDuo) {
+        this.fetusDuo = fetusDuo;
+    }
+
+    public String getFetusDan() {
+        return fetusDan;
+    }
+
+    public void setFetusDan(String fetusDan) {
+        this.fetusDan = fetusDan;
+    }
+
     public void setpAPPAType(Boolean pAPPAType) {
         this.pAPPAType = pAPPAType;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
index 0c7ea65..d6f13b4 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
@@ -1428,6 +1428,9 @@ public class SieveFacade {
                 if (StringUtils.isNotEmpty(lymsSieveId)) {
                     result.put("lymsSieveId", lymsSieveId);
                 }
+                result.put("fetusDan", sieveApply.getFetusDan());
+                result.put("fetusDuo", sieveApply.getFetusDuo());
+
                 result.put("timeOfFetuses", sieveApply.getTimeOfFetuses());
                 result.put("diabetes", sieveApply.getDiabetes());
                 result.put("addTSH", sieveApply.getAddTSH());
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 2645756..dc1f31f 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
@@ -146,6 +146,10 @@ public class SieveApplyOrderAddRequest implements IBasicRequestConvert<SieveAppl
      * 胎数 1/单胎 2/双胎 3/多胎 4/异常
      */
     private String fetusNum;
+    //异常多胎
+    private String fetusDuo;
+    //异常单胎
+    private String fetusDan;
 
     /**
      * 异常说明
@@ -455,7 +459,21 @@ public class SieveApplyOrderAddRequest implements IBasicRequestConvert<SieveAppl
         this.mannualEntry = mannualEntry;
     }
 
+    public String getFetusDuo() {
+        return fetusDuo;
+    }
+
+    public void setFetusDuo(String fetusDuo) {
+        this.fetusDuo = fetusDuo;
+    }
 
+    public String getFetusDan() {
+        return fetusDan;
+    }
+
+    public void setFetusDan(String fetusDan) {
+        this.fetusDan = fetusDan;
+    }
 
     public String getResponsibleCode() {
         return responsibleCode;
@@ -580,6 +598,9 @@ public class SieveApplyOrderAddRequest implements IBasicRequestConvert<SieveAppl
     @Override
     public SieveApplyOrderModel convertToDataModel() {
         SieveApplyOrderModel sieveApplyOrderModel =  new SieveApplyOrderModel();
+        sieveApplyOrderModel.setFetusDan(fetusDuo);
+        sieveApplyOrderModel.setFetusDuo(fetusDan);
+
         sieveApplyOrderModel.setParentId(parentId);
         sieveApplyOrderModel.setApplyDoctor(applyDoctor);
         sieveApplyOrderModel.setCheckItem(JsonUtil.array2JsonString(check));
-- 
1.8.3.1