质控核查前端请求对象注释添加

src/main/java/com/diagbot/vo/CheckJobPageVO.java

@@ -14,23 +14,33 @@ import java.util.List;
  */
 @Data
 public class CheckJobPageVO extends Page implements Serializable {
-    //生成开始时间
+    private static final long serialVersionUID = 1L;
+    //生成任务开始时间
+    @ApiModelProperty("生成任务开始时间，格式为：yyyy-MM-dd")
     private String startTime;
     //生成任务结束时间
+    @ApiModelProperty("生成任务结束时间，格式为：yyyy-MM-dd")
     private String endTime;
     //出院开始时间
+    @ApiModelProperty("出院开始时间，格式为：yyyy-MM-dd")
     private String behosDateStart;
     //出院结束时间
+    @ApiModelProperty("出院结束时间，格式为：yyyy-MM-dd")
     private String behosDateEnd;
     //任务类型
+    @ApiModelProperty("任务类型 0-科室任务 1-院级 2-质控科")
     private String jobType;
     //核查用户id
+    @ApiModelProperty("核查用户id")
     private String checkId;
     //病人姓名
+    @ApiModelProperty("病人姓名")
     private String name;
     //病人住院序号
+    @ApiModelProperty("病人住院序号")
     private String behospitalCode;
     //主诊断医生
+    @ApiModelProperty("主诊断医生")
     private String doctorName;
     //科室id集合
     @ApiModelProperty(hidden = true)

src/main/java/com/diagbot/vo/CheckJobVO.java

@@ -3,6 +3,7 @@ package com.diagbot.vo;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.List;
@@ -14,15 +15,20 @@ import java.util.List;
  */
 @Data
 public class CheckJobVO {
-    //生成开始时间
+    //生成任务开始时间
+    @ApiModelProperty("生成任务开始时间，格式为：yyyy-MM-dd")
     private String startTime;
     //生成任务结束时间
+    @ApiModelProperty("生成任务结束时间，格式为：yyyy-MM-dd")
     private String endTime;
     //出院开始时间
+    @ApiModelProperty("出院开始时间，格式为：yyyy-MM-dd")
     private String behosDateStart;
     //出院结束时间
+    @ApiModelProperty("出院结束时间，格式为：yyyy-MM-dd")
     private String behosDateEnd;
     //核查用户id
+    @ApiModelProperty("核查用户id")
     private String checkId;
     //任务类型
     @ApiModelProperty(hidden = true)

src/main/java/com/diagbot/vo/CheckWorkPageVO.java

@@ -23,67 +23,80 @@ public class CheckWorkPageVO extends Page implements Serializable {
     /**
      * 出院开始时间
      */
+    @ApiModelProperty("出院开始时间")
     private Date startDate;
 
     /**
      * 出院结束时间
      */
+    @ApiModelProperty("出院结束时间")
     private Date endDate;
 
     /**
      * 生成状态[0-未生成 1-已生成（默认未生成）]
      */
+    @ApiModelProperty("生成状态[0-未生成 1-已生成（默认未生成）]")
     private String creatStatus="0";
 
     /**
      * 医院ID
      */
+
     @ApiModelProperty(hidden = true)
     private Long hospitalId;
 
     /**
      * 病人住院序号
      */
+    @ApiModelProperty("病人住院序号")
     private String behospitalCode;
 
     /**
      * 科室
      */
+    @ApiModelProperty("科室")
     private String department;
 
     /**
      * 病历等级
      */
+    @ApiModelProperty("病历等级")
     private String level;
 
     /**
      * 病人姓名
      */
+    @ApiModelProperty("病人姓名")
     private String name;
 
     /**
      * 医生姓名
      */
+    @ApiModelProperty("医生姓名")
     private String doctorName;
 
     /**
      * 主诊断
      */
+    @ApiModelProperty("主诊断")
     private String diagnose;
 
     /**
      * 最小天数
      */
+    @ApiModelProperty("最小天数")
     private Integer sDay;
 
     /**
      * 最大天数
      */
+    @ApiModelProperty("最大天数")
     private Integer lDay;
 
     /**
      * 是否归档（0：未归档，1：已归档）
      */
+    @ApiModelProperty("是否归档（0：未归档，1：已归档）")
     private String isPlacefile = "1";
 
 }

src/main/java/com/diagbot/vo/DistributionJobVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -12,16 +13,22 @@ import java.util.List;
 @Data
 public class DistributionJobVO {
     //病人住院序号集合
+    @ApiModelProperty("病人住院序号集合")
     private List<String> behospitalCodes;
     //医院id
+    @ApiModelProperty(hidden = true)
     private String hospitalId;
     //分配用户id
+    @ApiModelProperty(hidden = true)
     private String jobDistributor;
     //核查用户id
+    @ApiModelProperty("核查用户id")
     private String checkId;
     //核查用户姓名
+    @ApiModelProperty("核查用户姓名")
     private String checkName;
-    //操作类型 分配或取消 0-分配，1-取消分配分配或取消 0-分配，1-取消分配
+    //操作类型 分配或取消 0-分配，1-取消分配
+    @ApiModelProperty("操作类型 分配或取消 0-分配，1-取消分配")
     private String distributionType;
 
 

src/main/java/com/diagbot/vo/MedCheckWorkAddVO.java

@@ -19,11 +19,16 @@ import java.util.List;
 public class MedCheckWorkAddVO {
     @ApiModelProperty(hidden = true)
     private Long hospitalId;            //医院id
+    @ApiModelProperty("病历id集合")
     private List<String> behospitalCodeList = new ArrayList<>(); // 病历id
     @ApiModelProperty(hidden = true)
     private String jobCreator;         // 创建用户编号
+    @ApiModelProperty("任务类型 0-科室任务 1-院级 1-质控科")
     private Integer jobType;           // 任务类型 0-科室任务 1-院级 1-质控科
+    @ApiModelProperty("操作类型 0-取消，1-添加")
     private Integer checkStatus;        // 操作类型 0-取消，1-添加
+    @ApiModelProperty("操作时间")
     private String createTime;          // 操作时间
+    @ApiModelProperty("核查类型 0病历，1病案首页,2全部 默认")
     private Integer checkType;          // 核查类型 0病历，1病案首页,2全部 默认
 }

src/main/resources/mapper/MedCheckInfoMapper.xml

@@ -27,8 +27,11 @@
     </resultMap>
     <!--通过核查人员id获取核查人员的核查任务数-->
     <select id="getJobNumByUserId" resultType="com.diagbot.dto.DeptCheckUserDTO">
-        SELECT check_id doctorId, count(*) as jobNum
-        from med_check_info
+        SELECT
+        check_id doctorId,
+        count(*) as jobNum
+        from
+        med_check_info
         where is_deleted = 'N' and job_distribution_name is not null
         <if test="jobType != null and jobType != ''">
             and job_type = #{jobType}
@@ -44,22 +47,44 @@
 
     <!--获取待分配核查任务列表-->
     <select id="getCheckList" resultType="com.diagbot.dto.CheckJobDTO">
-        SELECT a.behospital_code behospitalCode,a.beh_dept_name behospitalDept,
-        a.doctor_name attendingDoctor,a.leave_hospital_date leaveHospitalDate,
-        a.`name`,b.`value`,a.id from
-        (select a.behospital_code,a.`name`,a.beh_dept_name,a.doctor_name,a.leave_hospital_date,a.hospital_id,
-            a.beh_dept_id,b.id from med_behospital_info a ,med_check_info b
+        SELECT
+        a.behospital_code behospitalCode,
+        a.beh_dept_name behospitalDept,
+        a.doctor_name attendingDoctor,
+        a.leave_hospital_date leaveHospitalDate,
+        a.`name`,
+        b.`value`,
+        a.id
+        from
+        (select
+            a.behospital_code,
+            a.`name`,
+            a.beh_dept_name,
+            a.doctor_name,
+            a.leave_hospital_date,
+            a.hospital_id,
+            a.beh_dept_id,
+            b.id
+            from
+            med_behospital_info a ,med_check_info b
               where a.behospital_code = b.behospital_code and a.hospital_id = b.hospital_id and a.is_deleted = 'N'
                 and b.is_deleted = 'N' and b.job_distribution_name is NULL  and b.`status` = 0
                 <if test="jobType !=null and jobType != ''">
                     and b.job_type = #{jobType}
                 </if>
-                <if test="startTime !=null and startTime != '' and endTime !=null and endTime != ''">
-                    and b.job_create_time BETWEEN #{startTime} AND #{endTime}
+                <if test="startTime != null and startTime != ''">
+                    <![CDATA[ AND b.job_create_time >= #{startTime}]]>
+                </if>
+                <if test="endTime != null and endTime != ''">
+                    <![CDATA[ AND b.job_create_time < #{endTime}]]>
                 </if>
-                <if test="behosDateStart !=null and behosDateStart != '' and behosDateEnd !=null and behosDateEnd != ''">
-                    and a.leave_hospital_date BETWEEN #{behosDateStart} AND #{behosDateEnd}
+
+                <if test="behosDateStart != null and behosDateStart != ''">
+                    <![CDATA[ AND a.leave_hospital_date >= #{behosDateStart}]]>
                 </if>
+                <if test="behosDateEnd != null and behosDateEnd != ''">
+                    <![CDATA[ AND a.leave_hospital_date < #{behosDateEnd}]]>
+                 </if>
                 <if test="doctorName !=null and doctorName != ''">
                     and a.doctor_name = #{doctorName}
                 </if>
@@ -89,22 +114,44 @@
 
     <!--获取指定核查人员的核查任务-->
     <select id="getCheckListByUserId" resultType="com.diagbot.dto.CheckJobDTO">
-        SELECT a.behospital_code behospitalCode,a.beh_dept_name behospitalDept,
-        a.doctor_name attendingDoctor,a.leave_hospital_date leaveHospitalDate,
-        a.`name`,b.`value`,a.id from
-        (select a.behospital_code,a.`name`,a.beh_dept_name,a.doctor_name,a.leave_hospital_date,a.hospital_id,
-        a.beh_dept_id,b.id from med_behospital_info a ,med_check_info b
-        where a.behospital_code = b.behospital_code and a.hospital_id = b.hospital_id and a.is_deleted = 'N'
-        and b.is_deleted = 'N' and b.`status` = 0
-        <if test="startTime !=null and startTime != '' and endTime !=null and endTime != ''">
-            and b.job_create_time BETWEEN #{startTime} AND #{endTime}
-        </if>
-        <if test="behosDateStart !=null and behosDateStart != '' and behosDateEnd !=null and behosDateEnd != ''">
-            and a.leave_hospital_date BETWEEN #{behosDateStart} AND #{behosDateEnd}
-        </if>
-        <if test="checkId !=null and checkId != ''">
-            and b.check_id = #{checkId}
-        </if>) a LEFT JOIN med_behospital_type b on a.behospital_code = b.behospital_code
+        SELECT
+        a.behospital_code behospitalCode,
+        a.beh_dept_name behospitalDept,
+        a.doctor_name attendingDoctor,
+        a.leave_hospital_date leaveHospitalDate,
+        a.`name`,b.`value`,
+        a.id
+        from
+        (select
+            a.behospital_code,
+            a.`name`,
+            a.beh_dept_name,
+            a.doctor_name,
+            a.leave_hospital_date,
+            a.hospital_id,
+            a.beh_dept_id,
+            b.id
+            from
+            med_behospital_info a ,med_check_info b
+            where a.behospital_code = b.behospital_code and a.hospital_id = b.hospital_id and a.is_deleted = 'N'
+            and b.is_deleted = 'N' and b.`status` = 0
+            <if test="startTime != null and startTime != ''">
+                <![CDATA[ AND b.job_create_time >= #{startTime}]]>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                <![CDATA[ AND b.job_create_time < #{endTime}]]>
+            </if>
+
+            <if test="behosDateStart != null and behosDateStart != ''">
+                <![CDATA[ AND a.leave_hospital_date >= #{behosDateStart}]]>
+            </if>
+            <if test="behosDateEnd != null and behosDateEnd != ''">
+                <![CDATA[ AND a.leave_hospital_date < #{behosDateEnd}]]>
+            </if>
+            <if test="checkId !=null and checkId != ''">
+                and b.check_id = #{checkId}
+            </if>
+        ) a LEFT JOIN med_behospital_type b on a.behospital_code = b.behospital_code
         and a.hospital_id = b.hospital_id and b.is_deleted = 'N' ORDER BY b.`value` DESC ,a.leave_hospital_date DESC
     </select>
     <select id="getCheckWorkPage" resultType="com.diagbot.dto.CheckWorkDTO">