From 733423bc14122e2e570a39437e04a4cea6d74bfa Mon Sep 17 00:00:00 2001
From: chenfei <18955928961@163.com>
Date: Thu, 11 Aug 2022 10:17:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=B1=E8=AF=8A=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/system/domain/req/TRecordResultReq.java | 7 ++++---
 .../src/main/resources/mapper/system/TRecordMapper.xml     | 6 +++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

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"
             <if test="age !=null">and tp.age = #{age} </if>
             <if test="sex !=null">and tp.sex = #{sex} </if>
             <if test="identifier !=null">and tp.identifier like concat('%', #{identifier}, '%')</if>
+            <if test="createTime != null">
+               and  DATE_FORMAT(tp.create_time,'%Y-%m') = DATE_FORMAT(#{createTime},'%Y-%m')
+            </if>
             <if test="startTime != null and endTime != null">
-                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')
             </if>
+            <if test="startTime != null and endTime != null"></if>
             <if test="doctorOder !=null and firstVisitOder!=null" >order by  tr.create_time ${doctorOder}, tp.create_time ${firstVisitOder}</if>
         </where>
     </select>