Merge remote-tracking branch 'origin/dev/20200618_1.3.6' into test

src/main/resources/mapper/QcresultInfoMapper.xml

@@ -1050,7 +1050,7 @@
             AND e.name like CONCAT('%', #{filterPageVO.name},'%')
         </if>
         <if test="filterPageVO.deptName != null and filterPageVO.deptName != ''">
-            AND a.beh_dept_name like CONCAT('%', #{filterPageVO.deptName},'%')
+            AND a.beh_dept_name = #{filterPageVO.deptName}
         </if>
         <if test="filterPageVO.ruleType != null">
             AND e.rule_type = #{filterPageVO.ruleType}
@@ -1106,7 +1106,7 @@
             AND e.name like CONCAT('%', #{filterPageVO.name},'%')
         </if>
         <if test="filterPageVO.deptName != null and filterPageVO.deptName != ''">
-            AND a.beh_dept_name like CONCAT('%', #{filterPageVO.deptName},'%')
+            AND a.beh_dept_name  =  #{filterPageVO.deptName}
         </if>
         <if test="filterPageVO.ruleType != null">
             AND e.rule_type = #{filterPageVO.ruleType}
@@ -1428,14 +1428,14 @@
             AND e.name like CONCAT('%', #{filterPageByDeptVO.name},'%')
         </if>
         <if test="filterPageByDeptVO.deptName != null and filterPageByDeptVO.deptName != ''">
-            AND a.beh_dept_name like CONCAT('%', #{filterPageByDeptVO.deptName},'%')
+            AND a.beh_dept_name =  #{filterPageByDeptVO.deptName}
         </if>
         <if test="filterPageByDeptVO.doctorName != null and filterPageByDeptVO.doctorName != ''">
             <if test="filterPageByDeptVO.doctorName=='未知'">
                 AND (a.doctor_name is null OR a.doctor_name='')
             </if>
             <if test="filterPageByDeptVO.doctorName!='未知'">
-                AND a.doctor_name like CONCAT('%', #{filterPageByDeptVO.doctorName},'%')
+                AND a.doctor_name = #{filterPageByDeptVO.doctorName}
             </if>
         </if>
         <if test="filterPageByDeptVO.ruleType != null ">
@@ -1499,14 +1499,14 @@
             AND e.name like CONCAT('%', #{filterPageByDeptVO.name},'%')
         </if>
         <if test="filterPageByDeptVO.deptName != null and filterPageByDeptVO.deptName != ''">
-            AND a.beh_dept_name like CONCAT('%', #{filterPageByDeptVO.deptName},'%')
+            AND a.beh_dept_name =  #{filterPageByDeptVO.deptName}
         </if>
         <if test="filterPageByDeptVO.doctorName != null and filterPageByDeptVO.doctorName != ''">
             <if test="filterPageByDeptVO.doctorName=='未知'">
                 AND (a.doctor_name is null OR a.doctor_name='')
             </if>
             <if test="filterPageByDeptVO.doctorName!='未知'">
-                AND a.doctor_name like CONCAT('%', #{filterPageByDeptVO.doctorName},'%')
+                AND a.doctor_name = #{filterPageByDeptVO.doctorName}
             </if>
         </if>
         <if test="filterPageByDeptVO.ruleType != null ">