From 01f4fb71fead4d84e50c0af6ea18aec714a93277 Mon Sep 17 00:00:00 2001
From: wtt <1872109740@qq.com>
Date: Tue, 26 Jan 2021 11:42:10 +0800
Subject: [PATCH] update

---
 .../main/java/com/lyms/platform/pojo/Patients.java   | 10 ++++++++++
 .../operate/web/facade/BookbuildingFacade.java       |  5 +++++
 .../web/request/YunBookbuildingAddRequest.java       | 20 ++++++++++++++++++++
 3 files changed, 35 insertions(+)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
index 5d0b591..82d5320 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
@@ -233,6 +233,8 @@ public class Patients extends BaseModel {
     private String triageOrderNo;
 
     private Date nextCheckTime;
+    //前端计算出来的孕周
+    private String cDueWeek;
 
     private Integer patientLevel;
     //最后一次产检医生职工ID
@@ -807,6 +809,14 @@ public class Patients extends BaseModel {
         this.lastMenstrualPeriodBasisDate = lastMenstrualPeriodBasisDate;
     }
 
+    public String getcDueWeek() {
+        return cDueWeek;
+    }
+
+    public void setcDueWeek(String cDueWeek) {
+        this.cDueWeek = cDueWeek;
+    }
+
     public String getFace() {
         return face;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
index 760a5e3..a72f262 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
@@ -324,6 +324,8 @@ public class BookbuildingFacade {
          Patients patient = getPatientsData(yunRequest);
         patient.setYyzyfmHospitalId(yunRequest.getYyzyfmHospitalId());
 
+        patient.setNextCheckTime(DateUtil.parseYMD(yunRequest.getNextCheckTime()));
+        patient.setcDueWeek(yunRequest.getcDueWeek());//前端计算出来的孕周
 
         //承德市妇幼通过就诊卡号查询到病人id保存下来
         if ("2100001291".equals(patient.getHospitalId()) && StringUtils.isNotEmpty(yunRequest.getVcCardNo())) {
@@ -1162,6 +1164,9 @@ public class BookbuildingFacade {
 
         Patients patient = getPatientsData(yunRequest);
         patient.setYyzyfmHospitalId(yunRequest.getYyzyfmHospitalId());
+        patient.setNextCheckTime(DateUtil.parseYMD(yunRequest.getNextCheckTime()));
+        patient.setcDueWeek(yunRequest.getcDueWeek());//前端计算出来的孕周
+
         patient.setModified(new Date());
         patient.setBuildDays(DateUtil.getDays(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()), DateUtil.parseYMD(yunRequest.getBookbuildingDate())));
 //        patient.setHospitalId(autoMatchFacade.getHospitalId(userId));
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java
index c47ba8a..a501bea 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java
@@ -13,6 +13,10 @@ import java.util.Map;
  */
 @Form
 public class YunBookbuildingAddRequest {
+    //下次产检时间
+    private String nextCheckTime;
+    //前端计算出来的孕周
+    private String cDueWeek;
 
     /*20201130  null历史||1 不是特殊产筛建档, 2 衡水特殊产筛建档 */
     private String screening;
@@ -645,6 +649,22 @@ public class YunBookbuildingAddRequest {
         this.lowerHairOgrId = lowerHairOgrId;
     }
 
+    public String getNextCheckTime() {
+        return nextCheckTime;
+    }
+
+    public void setNextCheckTime(String nextCheckTime) {
+        this.nextCheckTime = nextCheckTime;
+    }
+
+    public String getcDueWeek() {
+        return cDueWeek;
+    }
+
+    public void setcDueWeek(String cDueWeek) {
+        this.cDueWeek = cDueWeek;
+    }
+
     public String getTownOrgId() {
         return townOrgId;
     }
-- 
1.8.3.1