添加时间查询

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/VisitController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.work.controller;
 
+import java.sql.Timestamp;
 import java.util.Arrays;
 import java.util.List;
 

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/dto/PatientCardDto.java

@@ -1,10 +1,12 @@
 package com.ruoyi.web.work.domain.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.ruoyi.common.core.domain.BaseData;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.sql.Date;
 import java.sql.Timestamp;
 
 @Data
@@ -27,7 +29,7 @@ public class PatientCardDto extends BaseData {
 
 
     @ApiModelProperty(value = "出院时间")
-    private Timestamp dischargeTime;
+    private String dischargeTime;
 
 
     @ApiModelProperty(value = "就诊ID")
@@ -43,6 +45,14 @@ public class PatientCardDto extends BaseData {
     @ApiModelProperty(value = "患者姓名")
     private String patientName;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "查询开始时间")
+    private Date startTime;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "查询结束时间")
+    private Date endTime;
+
 
 }
 

ruoyi-admin/src/main/resources/mapper/work/VisitMapper.xml

@@ -65,6 +65,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND v.physician like concat('%', #{physician}, '%')
             </if>
             <if test="deptId !=null and deptId != 0">AND (v.dept_id = #{deptId} OR v.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, parent_id) ))</if>
+            <if test="startTime!=null and endTime!=null ">
+                AND v.discharge_time BETWEEN #{startTime} AND DATE_ADD(#{endTime},INTERVAL 1 day)
+            </if>
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
@@ -79,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectVisitsByPatId" resultType="com.ruoyi.web.work.domain.Visit">
         select * from tb_visit where pat_id=#{patId}
         <if test="startTime != null and endTime != null">
-            AND admission_time BETWEEN #{startTime} AND #{endTime}
+            AND admission_time BETWEEN #{startTime} AND DATE_ADD(#{endTime},INTERVAL 1 day)
         </if>
     </select>