diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/req/TRecordResultReq.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/req/TRecordResultReq.java
index 6ba4492..a89157d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/req/TRecordResultReq.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/req/TRecordResultReq.java
@@ -26,7 +26,8 @@ public class TRecordResultReq
@ApiModelProperty("医院id")
private Long hospitalId;
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM")
+ @ApiModelProperty("初诊日期查询 到月份")
private Date createTime;
@ApiModelProperty("注册日期排序(必传):asc 正序,desc 倒序")
@@ -38,10 +39,10 @@ public class TRecordResultReq
@ApiModelProperty("状态")
private String status;
- @ApiModelProperty("初诊日期开始时间")
+ @ApiModelProperty("待诊日期开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
- @ApiModelProperty("初诊日期结束时间")
+ @ApiModelProperty("待诊日期结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
diff --git a/ruoyi-system/src/main/resources/mapper/system/TRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TRecordMapper.xml
index 553fb9a..1da9734 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TRecordMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TRecordMapper.xml
@@ -198,9 +198,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and tp.age = #{age}
and tp.sex = #{sex}
and tp.identifier like concat('%', #{identifier}, '%')
+
+ and DATE_FORMAT(tp.create_time,'%Y-%m') = DATE_FORMAT(#{createTime},'%Y-%m')
+
- AND tp.create_time between DATE_FORMAT(#{startTime},'%Y-%m-%d %H:%i:%s') and DATE_FORMAT(#{endTime},'%Y-%m-%d %H:%i:%s')
+ AND tr.create_time between DATE_FORMAT(#{startTime},'%Y-%m-%d %H:%i:%s') and DATE_FORMAT(#{endTime},'%Y-%m-%d %H:%i:%s')
+
order by tr.create_time ${doctorOder}, tp.create_time ${firstVisitOder}