diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/TRecordResp.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/TRecordResp.java index 146b708..0891056 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/TRecordResp.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/resp/TRecordResp.java @@ -47,6 +47,9 @@ public class TRecordResp @Excel(name = "上传时间", width = 30, dateFormat = "yyyy-MM-dd") private Date uploadTime; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date waitingTime; + /** 舌下 */ @Excel(name = "舌下") private String imgSx; @@ -80,7 +83,7 @@ public class TRecordResp private String disease; @JsonFormat(pattern = "yyyy-MM-dd") - private Date createTime; + private Date firstTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date aiResultReturnTime; @@ -278,14 +281,14 @@ public class TRecordResp this.disease = disease; } - public Date getCreateTime() + public Date getFirstTime() { - return createTime; + return firstTime; } - public void setCreateTime(Date createTime) + public void setFirstTime(Date firstTime) { - this.createTime = createTime; + this.firstTime = firstTime; } public Date getAiResultReturnTime() @@ -307,4 +310,14 @@ public class TRecordResp { this.aiResultModifyTime = aiResultModifyTime; } + + public Date getWaitingTime() + { + return waitingTime; + } + + public void setWaitingTime(Date waitingTime) + { + this.waitingTime = waitingTime; + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/TRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TRecordMapper.xml index 537ef68..47b903f 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TRecordMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TRecordMapper.xml @@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" tr.update_result2 AS updateResult2, tr.update_time AS updateTime, tr.upload_time AS uploadTime, + tr.create_time AS waitingTime, tr.ai_result_return_time AS aiResultReturnTime, tr.ai_result_modify_time AS aiResultModifyTime, td.NAME AS doctorName, @@ -48,7 +49,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" tp.sex, tp.age, tp.disease, - tp.create_time AS createTime + tp.img_sx AS imgSx, + tp.img_sm AS imgSm, + tp.create_time AS firstTime FROM t_record tr LEFT JOIN t_doctor td ON tr.doctor_id = td.id @@ -66,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" tr.update_result2 AS updateResult2, tr.update_time AS updateTime, tr.upload_time AS uploadTime, + tr.create_time AS waitingTime, tr.ai_result_return_time AS aiResultReturnTime, tr.ai_result_modify_time AS aiResultModifyTime, td.NAME AS doctorName, @@ -74,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" tp.sex, tp.age, tp.disease, - tp.create_time AS createTime + tp.create_time AS firstTime FROM t_record tr LEFT JOIN t_doctor td ON tr.doctor_id = td.id