病案首页不合格数病历号(内页)时间格式调整。

src/main/java/com/diagbot/facade/ConsoleFacade.java

@@ -1177,12 +1177,12 @@ public class ConsoleFacade {
     /**
      * 不合格数病历号（内页）
      *
-     * @param qcResultShortPageVO
+     * @param qcResultPageVO
      * @return
      */
-    public IPage<QcResultShortDTO> badLevelPage(QcResultShortPageVO qcResultShortPageVO) {
-        filterFacade.badLevelPageVOSet(qcResultShortPageVO);
-        return behospitalInfoFacade.badLevelPage(qcResultShortPageVO);
+    public IPage<QcResultShortDTO> badLevelPage(QcResultPageVO qcResultPageVO) {
+        filterFacade.badLevelPageVOSet(qcResultPageVO);
+        return behospitalInfoFacade.badLevelPage(qcResultPageVO);
     }
 
     /**

src/main/java/com/diagbot/facade/FilterFacade.java

@@ -5,6 +5,7 @@ import com.diagbot.util.DateUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.SysUserUtils;
 import com.diagbot.vo.*;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -248,15 +249,15 @@ public class FilterFacade {
     /**
      * 不合格数病历号入参拼接
      *
-     * @param qcResultShortPageVO
+     * @param qcResultPageVO
      */
-    public void badLevelPageVOSet(QcResultShortPageVO qcResultShortPageVO) {
+    public void badLevelPageVOSet(QcResultPageVO qcResultPageVO) {
         String hospitalId = SysUserUtils.getCurrentHospitalID();
         String userId = SysUserUtils.getCurrentPrincipleID();
-        qcResultShortPageVO.setHospitalId(hospitalId);
-        qcResultShortPageVO.setUserId(Long.valueOf(userId));
-        if (qcResultShortPageVO.getBehDeptName().equals("全院")) {
-            qcResultShortPageVO.setBehDeptName("");
+        qcResultPageVO.setHospitalId(hospitalId);
+        qcResultPageVO.setUserId(Long.valueOf(userId));
+        if (qcResultPageVO.getBehDeptName().equals("全院")|| StringUtils.isEmpty(qcResultPageVO.getBehDeptName())) {
+            qcResultPageVO.setBehDeptName("");
         }
         /*long interval = qcResultShortPageVO.getEndDate().getTime() + 1000;
         qcResultShortPageVO.setEndDate(new Date(Long.valueOf(interval)));*/

src/main/java/com/diagbot/mapper/BehospitalInfoMapper.java

@@ -352,10 +352,10 @@ public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
     /**
      * 不合格数病历号（内页）
      *
-     * @param qcResultShortPageVO
+     * @param qcResultPageVO
      * @return
      */
-    public IPage<QcResultShortDTO> badLevelPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
+    public IPage<QcResultShortDTO> badLevelPage(@Param("qcResultPageVO") QcResultPageVO qcResultPageVO);
 
 
     /**

src/main/java/com/diagbot/service/BehospitalInfoService.java

@@ -332,10 +332,10 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
 
     /**
      * 不合格数病历号（内页）
-     * @param qcResultShortPageVO
+     * @param qcResultPageVO
      * @return
      */
-    public IPage<QcResultShortDTO> badLevelPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
+    public IPage<QcResultShortDTO> badLevelPage(@Param("qcResultPageVO") QcResultPageVO qcResultPageVO);
 
     /**
      * 未整改病历缺陷评分详情页导出

src/main/java/com/diagbot/service/impl/BehospitalInfoServiceImpl.java

@@ -497,12 +497,12 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
     /**
      * 不合格数病历号（内页）
      *
-     * @param qcResultShortPageVO
+     * @param qcResultPageVO
      * @return
      */
     @Override
-    public IPage<QcResultShortDTO> badLevelPage(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO) {
-        return baseMapper.badLevelPage(qcResultShortPageVO);
+    public IPage<QcResultShortDTO> badLevelPage(@Param("qcResultPageVO") QcResultPageVO qcResultPageVO) {
+        return baseMapper.badLevelPage(qcResultPageVO);
     }
 
     /**

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

@@ -0,0 +1,132 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2020/6/16 17:00
+ */
+@Getter
+@Setter
+public class QcResultPageVO extends Page {
+    @ApiModelProperty(hidden = true)
+    private Long userId;
+    @ApiModelProperty(hidden = true)
+    private String hospitalId;
+    /**
+     * 病历号
+     */
+    private String behospitalCode;
+    /**
+     * 病人姓名
+     */
+    private String patName;
+    /**
+     * 条目名称
+     */
+    private String casesEntryName;
+    /**
+     * 条目id
+     */
+    private Long casesEntryId;
+    /**
+     * 模块名称
+     */
+    private String casesName;
+    /**
+     * 模块id
+     */
+    private Long casesId;
+    /**
+     * 科室名称
+     */
+    private String behDeptName;
+    /**
+     * 医生姓名
+     */
+    private String doctorName;
+    /**
+     * 医生编号
+     */
+    private String doctorId;
+    /**
+     * 病历等级
+     */
+    private String level;
+    @NotNull(message = "请输入起始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd  HH:mm:ss")
+    private String startDate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd  HH:mm:ss")
+    @NotNull(message = "请输入截止时间")
+    private String endDate;
+
+    /**
+     * 单项否决
+     */
+    private Integer isReject;
+
+    /**
+     * 规则类型(0：无，1：空项，2：错误)
+     */
+    private Integer ruleType;
+
+    /**
+     * 离院人员类型（0/null：总人数，1：死亡人数，2：新生儿，3：手术病人数，4：非医嘱离院病人，5:31日再入院病人）
+     */
+    private Integer leaveHosType;
+
+    /**
+     * 核查状态（1：已核查，0：未核查）
+     */
+    private Integer checkStatus;
+    /**
+     * 首页核查状态（1：已核查，0：未核查）
+     */
+    private Integer mrStatus;
+    /**
+     * 病历核查人员
+     */
+    private String chName;
+    /**
+     * 首页核查人员
+     */
+    private String mrName;
+    /**
+     * 病历核查起始时间
+     */
+    private Date chTimeStart;
+    /**
+     * 病历核查截止时间
+     */
+    private Date chTimeEnd;
+    /**
+     * 首页核查起始时间
+     */
+    private Date mrTimeStart;
+    /**
+     * 首页核查截止时间
+     */
+    private Date mrTimeEnd;
+    /**
+     * 是否归档（0：未归档，1：已归档）
+     */
+    private String isPlacefile = "1";
+
+    /**
+     * 住院超过31日标志
+     */
+    private Integer beHosGT31Days;
+
+    /**
+     * 改善标志（1：病案首页改善病历，2：病案首页改善至合格病历，3：病案首页改善至满分病历）
+     */
+    private Integer improveType;
+}

src/main/java/com/diagbot/web/ConsoleController.java

@@ -469,8 +469,8 @@ public class ConsoleController {
                     "isPlacefile： 是否归档（0：未归档，1：已归档） <br>")
     @PostMapping("/badLevelPage")
     @SysLogger("badLevelPage")
-    public RespDTO<IPage<QcResultShortDTO>> badLevelPage(@RequestBody @Valid QcResultShortPageVO qcResultShortPageVO) {
-        return RespDTO.onSuc(consoleFacade.badLevelPage(qcResultShortPageVO));
+    public RespDTO<IPage<QcResultShortDTO>> badLevelPage(@RequestBody @Valid QcResultPageVO qcResultPageVO) {
+        return RespDTO.onSuc(consoleFacade.badLevelPage(qcResultPageVO));
     }
 
 

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -6798,61 +6798,60 @@
         AND a.behospital_code = e.behospital_code
         AND a.qc_type_id != 0
         AND e.`level`='不合格'
-        <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile != ''">
-            and a.is_placefile = #{qcResultShortPageVO.isPlacefile}
+        <if test="qcResultPageVO.isPlacefile != null and qcResultPageVO.isPlacefile != ''">
+            and a.is_placefile = #{qcResultPageVO.isPlacefile}
         </if>
-        <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
-            AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
+        <if test="qcResultPageVO.hospitalId != null and qcResultPageVO.hospitalId != ''">
+            AND a.hospital_id = #{qcResultPageVO.hospitalId}
         </if>
-        <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile == 0">
-            <if test="qcResultShortPageVO.startDate != null ">
-                <![CDATA[ AND a.behospital_date >= #{qcResultShortPageVO.startDate}]]>
+        <if test="qcResultPageVO.isPlacefile != null and qcResultPageVO.isPlacefile == 0">
+            <if test="qcResultPageVO.startDate != null ">
+                <![CDATA[ AND a.behospital_date >= #{qcResultPageVO.startDate}]]>
             </if>
-            <if test="qcResultShortPageVO.endDate != null ">
-                <![CDATA[ AND a.behospital_date <= #{qcResultShortPageVO.endDate}]]>
+            <if test="qcResultPageVO.endDate != null ">
+                <![CDATA[ AND a.behospital_date <= #{qcResultPageVO.endDate}]]>
             </if>
         </if>
-        <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile == 1">
-            <if test="qcResultShortPageVO.startDate != null ">
-                <![CDATA[ AND a.leave_hospital_date >= #{qcResultShortPageVO.startDate}]]>
+        <if test="qcResultPageVO.isPlacefile != null and qcResultPageVO.isPlacefile == 1">
+            <if test="qcResultPageVO.startDate != null ">
+                <![CDATA[ AND a.leave_hospital_date >= #{qcResultPageVO.startDate}]]>
             </if>
-            <if test="qcResultShortPageVO.endDate != null">
-                <![CDATA[ AND a.leave_hospital_date <= #{qcResultShortPageVO.endDate}]]>
+            <if test="qcResultPageVO.endDate != null">
+                <![CDATA[ AND a.leave_hospital_date <= #{qcResultPageVO.endDate}]]>
             </if>
         </if>
-        <if test="qcResultShortPageVO.behDeptName != null and qcResultShortPageVO.behDeptName != ''">
-            AND a.beh_dept_name = #{qcResultShortPageVO.behDeptName}
+        <if test="qcResultPageVO.behDeptName != null and qcResultPageVO.behDeptName != ''">
+            AND a.beh_dept_name = #{qcResultPageVO.behDeptName}
         </if>
-        <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
-            AND b.`level` = #{qcResultShortPageVO.level}
+        <if test="qcResultPageVO.level != null and qcResultPageVO.level != ''">
+        <if test="qcResultPageVO.behospitalCode != null and qcResultPageVO.behospitalCode != ''">
+            AND a.behospital_code LIKE CONCAT( '%', #{qcResultPageVO.behospitalCode}, '%' )
         </if>
-        <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
-            AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
         </if>
-        <if test="qcResultShortPageVO.patName != null and qcResultShortPageVO.patName != ''">
-            AND a.NAME LIKE CONCAT( '%', #{qcResultShortPageVO.patName}, '%' )
+        <if test="qcResultPageVO.patName != null and qcResultPageVO.patName != ''">
+            AND a.NAME LIKE CONCAT( '%', #{qcResultPageVO.patName}, '%' )
         </if>
-        <if test="qcResultShortPageVO.casesEntryName != null and qcResultShortPageVO.casesEntryName != ''">
-            AND d.NAME = #{qcResultShortPageVO.casesEntryName}
+        <if test="qcResultPageVO.casesEntryName != null and qcResultPageVO.casesEntryName != ''">
+            AND d.NAME = #{qcResultPageVO.casesEntryName}
         </if>
-        <if test="qcResultShortPageVO.doctorId != null and qcResultShortPageVO.doctorId != ''">
-            AND (a.doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.beh_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.director_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' ))
+        <if test="qcResultPageVO.doctorId != null and qcResultPageVO.doctorId != ''">
+            AND (a.doctor_id LIKE CONCAT( '%', #{qcResultPageVO.doctorId}, '%' )
+            OR a.beh_doctor_id LIKE CONCAT( '%', #{qcResultPageVO.doctorId}, '%' )
+            OR a.director_doctor_id LIKE CONCAT( '%', #{qcResultPageVO.doctorId}, '%' ))
         </if>
-        <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
-            AND (a.doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
-            OR a.beh_doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
-            OR a.director_doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' ))
+        <if test="qcResultPageVO.doctorName != null and qcResultPageVO.doctorName != ''">
+            AND (a.doctor_name LIKE CONCAT( '%', #{qcResultPageVO.doctorName}, '%' )
+            OR a.beh_doctor_name LIKE CONCAT( '%', #{qcResultPageVO.doctorName}, '%' )
+            OR a.director_doctor_name LIKE CONCAT( '%', #{qcResultPageVO.doctorName}, '%' ))
         </if>
-        <if test="qcResultShortPageVO.casesEntryId != null ">
-            AND d.id = #{qcResultShortPageVO.casesEntryId}
+        <if test="qcResultPageVO.casesEntryId != null ">
+            AND d.id = #{qcResultPageVO.casesEntryId}
         </if>
-        <if test="qcResultShortPageVO.isReject != null">
-            AND c.is_reject = #{qcResultShortPageVO.isReject}
+        <if test="qcResultPageVO.isReject != null">
+            AND c.is_reject = #{qcResultPageVO.isReject}
         </if>
-        <if test="qcResultShortPageVO.ruleType != null">
-            AND d.rule_type = #{qcResultShortPageVO.ruleType}
+        <if test="qcResultPageVO.ruleType != null">
+            AND d.rule_type = #{qcResultPageVO.ruleType}
         </if>
         )be
         left join med_check_info mci
@@ -6871,29 +6870,29 @@
         AND t2.is_deleted = 'N'
         ) t
         where 1=1
-        <if test="qcResultShortPageVO.checkStatus != null">
-            AND t.checkStatus = #{qcResultShortPageVO.checkStatus}
+        <if test="qcResultPageVO.checkStatus != null">
+            AND t.checkStatus = #{qcResultPageVO.checkStatus}
         </if>
-        <if test="qcResultShortPageVO.mrStatus != null">
-            AND t.mrStatus = #{qcResultShortPageVO.mrStatus}
+        <if test="qcResultPageVO.mrStatus != null">
+            AND t.mrStatus = #{qcResultPageVO.mrStatus}
         </if>
-        <if test="qcResultShortPageVO.chName != null and qcResultShortPageVO.chName!=''">
-            AND t.chName like concat('%', #{qcResultShortPageVO.chName}, '%')
+        <if test="qcResultPageVO.chName != null and qcResultPageVO.chName!=''">
+            AND t.chName like concat('%', #{qcResultPageVO.chName}, '%')
         </if>
-        <if test="qcResultShortPageVO.mrName != null and qcResultShortPageVO.mrName!=''">
-            AND t.mrName like concat('%', #{qcResultShortPageVO.mrName}, '%')
+        <if test="qcResultPageVO.mrName != null and qcResultPageVO.mrName!=''">
+            AND t.mrName like concat('%', #{qcResultPageVO.mrName}, '%')
         </if>
-        <if test="qcResultShortPageVO.chTimeStart != null ">
-            <![CDATA[ AND t.chTime >= #{qcResultShortPageVO.chTimeStart}]]>
+        <if test="qcResultPageVO.chTimeStart != null ">
+            <![CDATA[ AND t.chTime >= #{qcResultPageVO.chTimeStart}]]>
         </if>
-        <if test="qcResultShortPageVO.chTimeEnd != null ">
-            <![CDATA[ AND t.chTime <= #{qcResultShortPageVO.chTimeEnd}]]>
+        <if test="qcResultPageVO.chTimeEnd != null ">
+            <![CDATA[ AND t.chTime <= #{qcResultPageVO.chTimeEnd}]]>
         </if>
-        <if test="qcResultShortPageVO.mrTimeStart != null ">
-            <![CDATA[ AND t.mrTime >= #{qcResultShortPageVO.mrTimeStart}]]>
+        <if test="qcResultPageVO.mrTimeStart != null ">
+            <![CDATA[ AND t.mrTime >= #{qcResultPageVO.mrTimeStart}]]>
         </if>
-        <if test="qcResultShortPageVO.mrTimeEnd != null ">
-            <![CDATA[ AND t.mrTime <= #{qcResultShortPageVO.mrTimeEnd}]]>
+        <if test="qcResultPageVO.mrTimeEnd != null ">
+            <![CDATA[ AND t.mrTime <= #{qcResultPageVO.mrTimeEnd}]]>
         </if>
     </select>
     <!-- 未整改病历质控评分页（内页）-->