Merge remote-tracking branch 'origin/dev/20200616_1.3.5' into test

doc/010.20200617v1.3.5/qc_initv1.3.5.sql

@@ -26,3 +26,5 @@ INSERT INTO `sys_role_permission`(`id`, `is_deleted`, `gmt_create`, `gmt_modifie
 INSERT INTO `sys_menu_permission`(`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `menu_id`, `permission_id`, `remark`) VALUES (66, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 20, 94, '数据报表明细-条目缺陷占比-条目缺陷占比质控详情页（全院）');
 INSERT INTO `sys_menu_permission`(`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `menu_id`, `permission_id`, `remark`) VALUES (67, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', 27, 95, '数据报表明细（科室）-条目缺陷占比-条目缺陷占比质控详情页（科室）');
 
+
+ALTER TABLE `med_behospital_info` ADD INDEX `idx_beh_dept_id` (`beh_dept_id`) USING BTREE;

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

@@ -52,4 +52,14 @@ public class QcResultShortPageVO extends Page {
     private Date startDate;
     @NotNull(message = "请输入截止时间")
     private Date endDate;
+
+    /**
+     * 单项否决
+     */
+    private Integer isReject;
+
+    /**
+     * 规则类型(0：无，1：空项，2：错误)
+     */
+    private Integer ruleType;
 }

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

@@ -217,6 +217,8 @@ public class ConsoleByDeptController {
                     "behDeptName：科室名称 <br>" +
                     "doctorName：主治医生名称 <br>" +
                     "level： 病历等级 <br>" +
+                    "isReject： 单项否决 1-否决，0-非<br>" +
+                    "ruleType： 规则类型 0：无，1：空项，2：错误<br>" +
                     "startDate： 起始时间 <br>" +
                     "endDate： 截止时间 <br>")
     @PostMapping("/qcResultShortByDeptPage")

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

@@ -458,6 +458,8 @@ public class ConsoleController {
                     "casesEntryId： 条目id <br>" +
                     "behDeptName：科室名称 <br>" +
                     "level： 病历等级 <br>" +
+                    "isReject： 单项否决 1-否决，0-非<br>" +
+                    "ruleType： 规则类型 0：无，1：空项，2：错误<br>" +
                     "startDate： 起始时间 <br>" +
                     "endDate： 截止时间 <br>")
     @PostMapping("/qcResultShortPage")

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -2793,6 +2793,12 @@
         <if test="qcResultShortPageVO.casesEntryId != null and qcResultShortPageVO.casesEntryId != ''">
             AND d.id = #{qcResultShortPageVO.casesEntryId}
         </if>
+        <if test="qcResultShortPageVO.isReject != null and qcResultShortPageVO.isReject != ''">
+            AND c.is_reject = #{qcResultShortPageVO.isReject}
+        </if>
+        <if test="qcResultShortPageVO.ruleType != null and qcResultShortPageVO.ruleType != ''">
+            AND d.rule_type = #{qcResultShortPageVO.ruleType}
+        </if>
         ) t1
         LEFT JOIN med_home_page t2 ON t1.hospital_id = t2.hospital_id
         AND t1.behospital_code = t2.behospital_code
@@ -2881,6 +2887,12 @@
         <if test="qcResultShortPageVO.casesEntryId != null and qcResultShortPageVO.casesEntryId != ''">
             AND d.id = #{qcResultShortPageVO.casesEntryId}
         </if>
+        <if test="qcResultShortPageVO.isReject != null and qcResultShortPageVO.isReject != ''">
+            AND c.is_reject = #{qcResultShortPageVO.isReject}
+        </if>
+        <if test="qcResultShortPageVO.ruleType != null and qcResultShortPageVO.ruleType != ''">
+            AND d.rule_type = #{qcResultShortPageVO.ruleType}
+        </if>
         ) t1
         LEFT JOIN med_home_page t2 ON t1.hospital_id = t2.hospital_id
         AND t1.behospital_code = t2.behospital_code