From 34ebd61ec156c2e22a931cdc16beb0d0f26eacf0 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 16 Aug 2016 16:05:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E7=BD=AEparentid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/lyms/platform/pojo/PostReviewModel.java       | 6 +++---
 .../src/main/java/com/lyms/platform/query/PostReviewQuery.java      | 4 ++--
 .../com/lyms/platform/operate/web/request/PostReviewRequest.java    | 3 ++-
 .../src/main/java/com/lyms/platform/operate/web/result/AntData.java | 4 ++--
 .../com/lyms/platform/operate/web/result/PostReviewListResult.java  | 2 +-
 .../java/com/lyms/platform/operate/web/result/PostReviewResult.java | 3 ++-
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java
index 434a0e6..31b6270 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java
@@ -82,7 +82,7 @@ public class PostReviewModel extends BaseModel {
     //产检 医生
     private String prodDoctor;
     //产检日期
-    private String checkTime;
+    private Date checkTime;
     //下次产检时间
     private String nextCheckTime;
 
@@ -123,11 +123,11 @@ public class PostReviewModel extends BaseModel {
         this.boneDensity = boneDensity;
     }
 
-    public String getCheckTime() {
+    public Date getCheckTime() {
         return checkTime;
     }
 
-    public void setCheckTime(String checkTime) {
+    public void setCheckTime(Date checkTime) {
         this.checkTime = checkTime;
     }
 
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PostReviewQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PostReviewQuery.java
index 9ae81ab..f3984e3 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/PostReviewQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/PostReviewQuery.java
@@ -101,7 +101,7 @@ public class PostReviewQuery extends BaseQuery implements IConvertToNativeQuery
         boolean isAddStart = Boolean.FALSE;
         Criteria c = null;
         if (null != start) {
-            c = Criteria.where("created").gte(start);
+            c = Criteria.where("checkTime").gte(start);
             isAddStart = Boolean.TRUE;
         }
 
@@ -109,7 +109,7 @@ public class PostReviewQuery extends BaseQuery implements IConvertToNativeQuery
             if (isAddStart) {
                 c=c.lte(end);
             } else {
-                c = Criteria.where("created").lte(end);
+                c = Criteria.where("checkTime").lte(end);
             }
             isAddStart = Boolean.TRUE;
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java
index 757692c..23b12e2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java
@@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.request;
 import com.lyms.platform.common.base.IBasicRequestConvert;
 import com.lyms.platform.common.core.annotation.form.FormParam;
 import com.lyms.platform.common.core.annotation.form.Form;
+import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.pojo.PostReviewModel;
 import org.hibernate.validator.constraints.NotEmpty;
@@ -339,7 +340,7 @@ public class PostReviewRequest   implements IBasicRequestConvert<PostReviewModel
         postReviewModel.setTreatOpinion(treatOpinion);
         postReviewModel.setDirOpinion(dirOpinion);
         postReviewModel.setProdDoctor(prodDoctor);
-        postReviewModel.setCheckTime(checkTime);
+        postReviewModel.setCheckTime(DateUtil.parseYMD(checkTime));
         postReviewModel.setNextCheckTime(JsonUtil.obj2JsonString(nextCheckTime));
         return postReviewModel;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java
index d950714..64be62a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java
@@ -100,9 +100,9 @@ public class AntData {
 
     public AntData(PostReviewModel postReviewModel,String hospitalName,Date dueDate) {
         this.id=postReviewModel.getId();
-        int days = DateUtil.daysBetween(dueDate,DateUtil.parseYMD(postReviewModel.getCheckTime()));
+        int days = DateUtil.daysBetween(dueDate,postReviewModel.getCheckTime());
         this.dueWeek= StringUtils.dueWeek(days);
-        this.checkTime=postReviewModel.getCheckTime();
+        this.checkTime=DateUtil.getyyyy_MM_dd(postReviewModel.getCheckTime());
         this.title="产后复查";
         this.type="5";
         this.hospitalName=hospitalName;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java
index 0675a2b..7778e33 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java
@@ -190,7 +190,7 @@ public class PostReviewListResult {
         public AntData(PostReviewModel model, String hospitalName) {
             this.id = model.getId();
             this.dueWeek = model.getDay();
-            this.checkTime = model.getCheckTime();
+            this.checkTime = DateUtil.getyyyy_MM_dd(model.getCheckTime());
             this.hospitalId = model.getHospitalId();
             this.hospitalName = hospitalName;
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewResult.java
index 5e507c0..87b1281 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewResult.java
@@ -1,5 +1,6 @@
 package com.lyms.platform.operate.web.result;
 
+import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.pojo.MaternalDeliverModel;
 import com.lyms.platform.pojo.Patients;
@@ -114,7 +115,7 @@ public class PostReviewResult implements Serializable{
         setTreatOpinion(postReviewModel.getTreatOpinion());
         setDirOpinion(postReviewModel.getDirOpinion());
         setProdDoctor(postReviewModel.getProdDoctor());
-        setCheckTime(postReviewModel.getCheckTime());
+        setCheckTime(DateUtil.getyyyy_MM_dd(postReviewModel.getCheckTime()));
         setNextCheckTime(JsonUtil.str2Obj(postReviewModel.getNextCheckTime(),Map.class));
         return this;
     }
-- 
1.8.3.1