From 3bbd6d18df0570c33350095c37dcfd3f7bbe240e Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 13 Jan 2017 17:28:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E4=BD=9C=E5=BA=9F=E4=BA=A7?=
 =?UTF-8?q?=E6=A3=80=E5=8A=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/operate/web/result/AntExManagerResult.java | 2 +-
 .../java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java
index 4c5c7f6..1f671df 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java
@@ -100,7 +100,7 @@ public class AntExManagerResult {
         setPid(e.getPid());
         setParentId(e.getParentId());
         setId(e.getId());
-        setCheckTime(DateUtil.getyyyy_MM_dd(e.getCheckTime()));
+//        setCheckTime(DateUtil.getyyyy_MM_dd(e.getCheckTime()));
         setName(e.getName());
         setAge(DateUtil.getAge(e.getBrith()) + "");
         setPhone(StringUtils.encryPhone(e.getPhone()));
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java
index 76e9b6a..55d6467 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java
@@ -16,6 +16,7 @@ import com.lyms.platform.pojo.AntExRecordModel;
 import com.lyms.platform.query.AntExRecordQuery;
 import org.apache.commons.lang.math.NumberUtils;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
@@ -37,6 +38,8 @@ public class AntExRecordWorker implements Callable<List<AntExManagerResult>> {
 
     private BasicConfigService basicConfigService;
 
+    public static SimpleDateFormat y_m_d = new SimpleDateFormat("yyyy-MM-dd");
+
     public AntExRecordWorker(List<AntExRecordModel> record,
                              boolean isRegion,
                              OrganizationService organizationService,
@@ -62,6 +65,7 @@ public class AntExRecordWorker implements Callable<List<AntExManagerResult>> {
             try {
                 AntExManagerResult antExManagerResult = new AntExManagerResult();
                 antExManagerResult.convertToResult(e);
+                antExManagerResult.setCheckTime(y_m_d.format(e.getCheckTime()));
                 if (isRegion) {
                     //产检医院
                     if (StringUtils.isNotEmpty(e.getHospitalId())) {
-- 
1.8.3.1