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 @@
+
+ #{gEndTime,jdbcType=TIMESTAMP} ]]>
+
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 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)