Commit f83cd42716044bb669ec840f9770a2fc2742fb8d

Authored by liquanyu
1 parent 33db60f926

服务

Showing 4 changed files with 14 additions and 2 deletions

platform-biz-service/src/main/resources/mainOrm/master/TServiceTimeRecord.xml View file @ f83cd42
... ... @@ -52,6 +52,9 @@
52 52 <if test="endTime != null">
53 53 <![CDATA[ and endTime <= #{endTime,jdbcType=TIMESTAMP} ]]>
54 54 </if>
  55 + <if test="gEndTime != null">
  56 + <![CDATA[ and endTime > #{gEndTime,jdbcType=TIMESTAMP} ]]>
  57 + </if>
55 58  
56 59 </where>
57 60 </sql>
platform-dal/src/main/java/com/lyms/platform/query/TServiceTimeRecordQuery.java View file @ f83cd42
... ... @@ -20,6 +20,15 @@
20 20 private Integer memberId;
21 21 private String foreignId;//
22 22 private String patientId;
  23 + private Date gEndTime;
  24 +
  25 + public Date getgEndTime() {
  26 + return gEndTime;
  27 + }
  28 +
  29 + public void setgEndTime(Date gEndTime) {
  30 + this.gEndTime = gEndTime;
  31 + }
23 32  
24 33 public Date getCreateTime() {
25 34 return createTime;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java View file @ f83cd42
... ... @@ -594,7 +594,7 @@
594 594 TServiceTimeRecordQuery stquery = new TServiceTimeRecordQuery();
595 595 stquery.setForeignId(patientId);
596 596 stquery.setSort(" createTime desc");
597   - stquery.setEndTime(new Date());
  597 + stquery.setgEndTime(new Date());
598 598 String serType = "";
599 599 List<TServiceTimeRecord> tsList = serviceTimeRecordService.selectServiceTimeRecords(stquery);
600 600 if (CollectionUtils.isNotEmpty(tsList))
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java View file @ f83cd42
... ... @@ -223,7 +223,7 @@
223 223 BaseResponse baseResponse = new BaseResponse();
224 224  
225 225 try {
226   - TServiceTimeRecord serviceTimeRecord = JsonUtil.str2Obj(synForm, TServiceTimeRecord.class);
  226 + TServiceTimeRecord serviceTimeRecord = JsonUtil.jkstr2Obj(synForm, TServiceTimeRecord.class);
227 227 serviceTimeRecordService.addServiceTimeRecord(serviceTimeRecord);
228 228 }
229 229 catch (Exception e)