添加出院日期分页查询

src/main/java/com/docus/server/collect/dto/TBasicQrDto.java

@@ -0,0 +1,45 @@
+package com.docus.server.collect.dto;
+
+import com.docus.server.collect.service.dto.ReportFileInfoDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 患者基础信息
+ *
+ * @author WYBDEV
+ */
+@Data
+@ApiModel(value = "患者基础信息查询条件")
+public class TBasicQrDto {
+    @ApiModelProperty(value = "病案主键")
+    private String patientId;
+    @ApiModelProperty(value = "住院号")
+    private String inpatientNo;
+    @ApiModelProperty(value = "住院次数")
+    private Integer admissTimes;
+
+    @ApiModelProperty(value = "出院日期查询，开始时间 yyyy-MM-dd")
+    private String disDateStart;
+
+    @ApiModelProperty(value = "出院日期查询，结束时间 yyyy-MM-dd")
+    private String disDateEnd;
+
+    @ApiModelProperty(value = "记账号")
+    private String jzh;
+
+    @ApiModelProperty(value = "省中医患者主索引号")
+    private String empId;
+
+    public TBasicQrDto() {
+    }
+
+    public TBasicQrDto(ReportFileInfoDTO fileInfoDTO) {
+        this.jzh = fileInfoDTO.getJzh();
+        this.patientId = fileInfoDTO.getPatientId();
+        this.inpatientNo = fileInfoDTO.getInpatientNo();
+        this.admissTimes = fileInfoDTO.getAdmisstimes();
+        ;
+    }
+}

src/main/java/com/docus/server/collect/infrastructure/mapper/DownloadTaskMapper.java

@@ -1,6 +1,7 @@
 package com.docus.server.collect.infrastructure.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.docus.server.collect.dto.TBasicQrDto;
 import com.docus.server.collect.entity.DownloadTask;
 import com.docus.server.collect.entity.TBasic;
 import org.apache.ibatis.annotations.Mapper;
@@ -17,6 +18,23 @@ public interface DownloadTaskMapper extends BaseMapper<DownloadTask> {
      * @return 病案基础信息
      */
     List<TBasic> getBasicInfo(@Param("basic") TBasic tBasic);
+
+    /**
+     * 根据病案查询条件，查询病案数量
+     * @param qrDto 查询条件
+     * @return 病案数量
+     */
+    int countBasicInfo(@Param("dto") TBasicQrDto qrDto);
+
+    /**
+     * 根据条件，分页查询病案
+     * @param qrDto 查询条件
+     * @param offset 分页参数从第几条开始
+     * @param size  每页显示条数
+     * @return 病案基础信息
+     */
+    List<TBasic> pageBasicInfo(@Param("dto") TBasicQrDto qrDto,@Param("offset") long offset,@Param("size") long size);
+
     /**
      * 根据病案的来源，病案文件的唯一标识，从文件表得到文件下载任务id（也是文件id）
      * @param patientId 病案主键

src/main/resources/mapper/TBasicMapper.xml

@@ -3,20 +3,23 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.docus.server.collect.infrastructure.mapper.DownloadTaskMapper">
+    <sql id="basicInfoColumns">
+            patient_id as patientId,
+            admiss_times as admissTimes,
+            inpatient_no as inpatientNo,
+            admiss_id as admissId,
+            admiss_date as admissDate,
+            dis_date as disDate,
+            admiss_dept_name as admissDeptName,
+            dis_dept_name as disDeptName ,
+            jzh,
+            name,
+            emp_id as empId
+    </sql>
 
     <select id="getBasicInfo" resultType="com.docus.server.collect.entity.TBasic">
         select
-            `patient_id` as patientId,
-            `admiss_times` as admissTimes,
-            `inpatient_no` as inpatientNo,
-            `admiss_id` as admissId,
-            `admiss_date` as admissDate,
-            `dis_date` as disDate,
-            `admiss_dept_name` as admissDeptName,
-            `dis_dept_name` as disDeptName ,
-            `jzh`,
-            `name`,
-            `emp_id` as empId
+            <include refid="basicInfoColumns"></include>
         FROM
             `docus_medicalrecord`.`t_basic`
         WHERE
@@ -38,6 +41,63 @@
             </if>
         limit 2
     </select>
+
+    <select id="countBasicInfo" resultType="java.lang.Integer">
+            select
+                   count(1)
+            from `docus_medicalrecord`.`t_basic`
+            WHERE
+                is_cancel=0
+            <if test="dto.patientId != null and dto.patientId != ''">
+                and `patient_id` = #{dto.patientId}
+            </if>
+            <if test="dto.jzh != null and dto.jzh != ''">
+                and `jzh` = #{dto.jzh}
+            </if>
+            <if test="dto.empId != null and dto.empId != ''">
+                and `emp_id` = #{dto.empId}
+            </if>
+            <if test="dto.inpatientNo != null and dto.inpatientNo != ''">
+                and `inpatient_no` = #{dto.inpatientNo}
+            </if>
+            <if test="dto.admisstimes != null">
+                and `admiss_times` = #{dto.admissTimes}
+            </if>
+            <if test="dto.admisstimes != null">
+                and `dis_date` between #{dto.disDateStart} AND #{dto.disDateEnd}
+            </if>
+
+    </select>
+    <select id="pageBasicInfo" resultType="com.docus.server.collect.entity.TBasic">
+        select
+            <include refid="basicInfoColumns"></include>
+        from `docus_medicalrecord`.`t_basic`
+        WHERE
+            is_cancel=0
+            <if test="dto.patientId != null and dto.patientId != ''">
+                and `patient_id` = #{dto.patientId}
+            </if>
+            <if test="dto.jzh != null and dto.jzh != ''">
+                and `jzh` = #{dto.jzh}
+            </if>
+            <if test="dto.empId != null and dto.empId != ''">
+                and `emp_id` = #{dto.empId}
+            </if>
+            <if test="dto.inpatientNo != null and dto.inpatientNo != ''">
+                and `inpatient_no` = #{dto.inpatientNo}
+            </if>
+            <if test="dto.admisstimes != null">
+                and `admiss_times` = #{dto.admissTimes}
+            </if>
+            <if test="dto.admisstimes != null">
+                and `dis_date` between #{dto.disDateStart} AND #{dto.disDateEnd}
+            </if>
+            <if test="dto.admisstimes != null">
+                and `dis_date` between #{dto.disDateStart} AND #{dto.disDateEnd}
+            </if>
+        LIMIT ${offset},${size}
+    </select>
+
     <select id="getDownloadTaskIdFromSanAssort" resultType="java.lang.Long">
         SELECT
             `id`
@@ -59,4 +119,5 @@
             and `serialnum` = #{serialNum}
         order by `create_time` desc limit 1
     </select>
+
 </mapper>