From f83cd42716044bb669ec840f9770a2fc2742fb8d Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Mon, 17 Sep 2018 14:47:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mainOrm/master/TServiceTimeRecord.xml     | 3 +++
 .../java/com/lyms/platform/query/TServiceTimeRecordQuery.java    | 9 +++++++++
 .../lyms/platform/operate/web/facade/PatientServiceFacade.java   | 2 +-
 .../platform/operate/web/facade/PatientServiceSysFacade.java     | 2 +-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/platform-biz-service/src/main/resources/mainOrm/master/TServiceTimeRecord.xml b/platform-biz-service/src/main/resources/mainOrm/master/TServiceTimeRecord.xml
index 906e22f..403d965 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/TServiceTimeRecord.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/TServiceTimeRecord.xml
@@ -52,6 +52,9 @@
             <if test="endTime != null">
                 <![CDATA[ and endTime <= #{endTime,jdbcType=TIMESTAMP} ]]>
             </if>
+            <if test="gEndTime != null">
+                <![CDATA[ and endTime > #{gEndTime,jdbcType=TIMESTAMP} ]]>
+            </if>
 
         </where>
     </sql>
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/TServiceTimeRecordQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/TServiceTimeRecordQuery.java
index a470f63..7f33fe1 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/TServiceTimeRecordQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/TServiceTimeRecordQuery.java
@@ -20,6 +20,15 @@ public class TServiceTimeRecordQuery extends BaseQuery {
     private Integer memberId;
     private String foreignId;//
     private String patientId;
+    private Date gEndTime;
+
+    public Date getgEndTime() {
+        return gEndTime;
+    }
+
+    public void setgEndTime(Date gEndTime) {
+        this.gEndTime = gEndTime;
+    }
 
     public Date getCreateTime() {
         return createTime;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
index 6169022..c6de669 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
@@ -594,7 +594,7 @@ public class PatientServiceFacade {
         TServiceTimeRecordQuery  stquery = new TServiceTimeRecordQuery();
         stquery.setForeignId(patientId);
         stquery.setSort(" createTime desc");
-        stquery.setEndTime(new Date());
+        stquery.setgEndTime(new Date());
         String serType = "";
         List<TServiceTimeRecord> tsList =  serviceTimeRecordService.selectServiceTimeRecords(stquery);
         if (CollectionUtils.isNotEmpty(tsList))
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java
index e857ec1..6238fda 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java
@@ -223,7 +223,7 @@ public class PatientServiceSysFacade implements SysBaseFacade {
         BaseResponse baseResponse = new BaseResponse();
 
         try {
-            TServiceTimeRecord serviceTimeRecord = JsonUtil.str2Obj(synForm, TServiceTimeRecord.class);
+            TServiceTimeRecord serviceTimeRecord = JsonUtil.jkstr2Obj(synForm, TServiceTimeRecord.class);
             serviceTimeRecordService.addServiceTimeRecord(serviceTimeRecord);
         }
         catch (Exception e)
-- 
1.8.3.1