From c80844ac1e0a8bb06bf20a83e08a0104709456dd Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Fri, 15 Jul 2022 14:25:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E4=BA=A7=E5=A6=87=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E4=BA=A7=E5=A6=87-=E5=88=86=E5=A8=A9?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/operate/web/result/QuanChanResult.java   | 10 ++++++++++
 .../platform/operate/web/worker/QuanChanPatientWorker.java     |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
index 293a587..373cd38 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
@@ -114,6 +114,16 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
      */
     //空或者1为正常  2为补录
     private String normal;
+    //分娩时间
+    private String dueDate;
+
+    public String getDueDate() {
+        return dueDate;
+    }
+
+    public void setDueDate(String dueDate) {
+        this.dueDate = dueDate;
+    }
 
     public String getNormal() {
         return normal;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java
index 8b36427..321dc9d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java
@@ -370,6 +370,8 @@ public class QuanChanPatientWorker implements Callable <List <QuanChanResult>> {
 
                 chanResult.sethScore(patients.getRiskScore());
                 chanResult.setNormal(StringUtils.isNotEmpty(patients.getNormal())?"2".equals(patients.getNormal())?"补录":"正常":"正常");
+                //分娩时间
+                chanResult.setDueDate(DateUtil.getyyyy_MM_dd(patients.getDueDate()));
                 data.add(chanResult);
                 logger.debug(stopWatch.toString());
             }
-- 
1.8.3.1