From 804cf3a43f619ae2e4bcec698c678f9172e1d363 Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Sat, 20 Jun 2020 16:14:36 +0800
Subject: [PATCH] update

---
 .../platform/operate/web/facade/SieveFacade.java   |  2 +-
 .../web/request/SieveApplyOrderAddRequest.java     | 22 +++++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

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 dc11884..b7a9588 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
@@ -1046,6 +1046,7 @@ public class SieveFacade {
                 result.put("nasalBone", sieveApply.getNasalBone());
                 result.put("monozygous", sieveApply.getMonozygous());
                 result.put("patientType", sieveApply.getPatientType());
+                result.put("caiyangyunzhou", sieveApply.getCaiyangyunzhou());
 
 
                 result.put("id", sieveApply.getId());
@@ -1089,7 +1090,6 @@ public class SieveFacade {
                 result.put("fetusAbnormalInfo", sieveApply.getFetusAbnormalInfo());
                 result.put("sieveModel", sieveApply.getSieveModel());
                 result.put("ultrasonicNtWeek", sieveApply.getUltrasonicNtWeek());
-                result.put("caiyangyunzhou", sieveApply.getCaiyangyunzhou());
                 result.put("ultrasonicNtVal", sieveApply.getUltrasonicNtVal());
                 result.put("serumScreeningRisk", sieveApply.getSerumScreeningRisk());
                 result.put("syndrome21", sieveApply.getSyndrome21());
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 3081262..063eb29 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
@@ -286,7 +286,7 @@ public class SieveApplyOrderAddRequest implements IBasicRequestConvert<SieveAppl
     private Integer aRMethod;
     //辅助生殖之提取日期  若输入了ARMethod，此项必填
     private String extractionDate;
-    // 辅助生殖之移植日期 若输入了ARMethod，此项必填
+    // 辅助生殖之移植日期 若输入了ARMethod，此项必填applyDoctorName
     private String transferDate;
     //辅助生殖之捐赠者生日 若输入了ARMethod，此项必填
     private String donorBirthDate;
@@ -296,6 +296,26 @@ public class SieveApplyOrderAddRequest implements IBasicRequestConvert<SieveAppl
     private Integer monozygous;
     //孕妇筛查类型  0：一般；1：早中联合筛查孕妇
     private Integer patientType;
+    //采样孕周，打印功能使用
+    private String caiyangyunzhou;
+
+    private String hospitalId;
+
+    public String getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(String hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+
+    public String getCaiyangyunzhou() {
+        return caiyangyunzhou;
+    }
+
+    public void setCaiyangyunzhou(String caiyangyunzhou) {
+        this.caiyangyunzhou = caiyangyunzhou;
+    }
 
     public String getPatientID() {
         return patientID;
-- 
1.8.3.1