From 673606deb2e61c721c32cee5ca5bdc3fc1e48237 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Mon, 10 Jul 2017 11:07:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=A3=80=E5=8C=BB=E7=94=9F=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/AntexDoctorStatistController.java |  4 ++++
 .../operate/web/result/AntextDoctorPatient.java      | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntexDoctorStatistController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntexDoctorStatistController.java
index bf21d46..bccf986 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntexDoctorStatistController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntexDoctorStatistController.java
@@ -184,6 +184,7 @@ public class AntexDoctorStatistController extends BaseController {
 
             if (ac.getCheckTime().after(doctorPatient.getCheckTime())) {
                 doctorPatient.setCheckTime(ac.getCheckTime());
+                doctorPatient.setCheckTimeStr(DateUtil.getyyyy_MM_dd(ac.getCheckTime()));
                 doctorPatient.setCheckDoctor(ac.getProdDoctor());
             }
         }
@@ -193,6 +194,7 @@ public class AntexDoctorStatistController extends BaseController {
             doctorPatient.setAllCjNum(doctorPatient.getAllCjNum() + 1);
             if (aec.getCheckDate().after(doctorPatient.getCheckTime())) {
                 doctorPatient.setCheckTime(aec.getCheckDate());
+                doctorPatient.setCheckTimeStr(DateUtil.getyyyy_MM_dd(aec.getCheckDate()));
                 doctorPatient.setCheckDoctor(aec.getCheckDoctor());
             }
         }
@@ -265,9 +267,11 @@ public class AntexDoctorStatistController extends BaseController {
                 //计算孕周
                 adp.setcDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(DateUtil.daysBetween(patients.getLastMenses(), new Date())));
                 adp.setDueFmDate(patients.getDueDate());
+                adp.setDueFmDateStr(DateUtil.getyyyy_MM_dd(patients.getDueDate()));
             } else if (patients.getType() == 3) {//3-产妇
                 adp.setcDueWeek("已分娩");
                 adp.setDueFmDate(patients.getFmDate());
+                adp.setDueFmDateStr(DateUtil.getyyyy_MM_dd(patients.getFmDate()));
             }
             adp.setCheckTime(ac.getCheckTime());
             adp.setpName(patients.getUsername());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntextDoctorPatient.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntextDoctorPatient.java
index 1fce121..b0bbbe6 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntextDoctorPatient.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntextDoctorPatient.java
@@ -27,11 +27,31 @@ public class AntextDoctorPatient {
     private String cDueWeek;
     //预产期或分娩日期
     private Date dueFmDate;
+    //预产期或分娩日期
+    private String dueFmDateStr;
     //产检时间
     private Date checkTime;
+    //产检时间
+    private String checkTimeStr;
     //产检医生
     private String checkDoctor;
 
+    public String getDueFmDateStr() {
+        return dueFmDateStr;
+    }
+
+    public void setDueFmDateStr(String dueFmDateStr) {
+        this.dueFmDateStr = dueFmDateStr;
+    }
+
+    public String getCheckTimeStr() {
+        return checkTimeStr;
+    }
+
+    public void setCheckTimeStr(String checkTimeStr) {
+        this.checkTimeStr = checkTimeStr;
+    }
+
     public Date getCheckTime() {
         return checkTime;
     }
-- 
1.8.3.1