Merge branch 'dev/20200603_1.3.1' of http://192.168.2.236:10080/gaodm/mrqc-sys into dev/20200603_1.3.1

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

@@ -1,14 +1,11 @@
 package com.diagbot.vo;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.diagbot.enums.SysTypeEnum;
 import com.diagbot.util.SysUserUtils;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotNull;
-
 /**
  * @author wangfeng
  * @Description:
@@ -24,4 +21,5 @@ public class QcCasesEntryHospitalVO extends Page {
     private String name;
     private Integer isReject;
     private Integer isUsed;
+    private Integer ruleType;
 }

src/main/resources/mapper/QcCasesEntryHospitalMapper.xml

@@ -28,7 +28,8 @@
         b.msg As msg,
         b.score as score,
         b.is_reject As isReject,
-        b.is_used AS isUsed
+        b.is_used AS isUsed,
+        a.rule_type
         from
         qc_cases_entry a
         join qc_cases_entry_hospital b
@@ -50,6 +51,9 @@
         <if test="isUsed != null ">
             AND b.is_used =#{isUsed}
         </if>
+        <if test="ruleType != null">
+            AND a.rule_type = #{ruleType}
+        </if>
         ORDER BY a.cases_id,a.order_no DESC
     </select>
     <select id="findQcCasesEntryAll" resultType="com.diagbot.dto.QcCasesEntryFindDTO">