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

src/main/resources/mapper/QcresultInfoMapper.xml

@@ -1035,7 +1035,7 @@
             AND d.cases_id = #{filterPageVO.casesId}
         </if>
         <if test="filterPageVO.casesName != null and filterPageVO.casesName != ''">
-            AND e.cases_name like CONCAT('%', #{filterPageVO.casesName},'%')
+            AND e.cases_name = #{filterPageVO.casesName}
         </if>
         <if test="filterPageVO.hospitalId != null and filterPageVO.hospitalId != ''">
             AND a.hospital_id = #{filterPageVO.hospitalId}
@@ -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}
@@ -1091,7 +1091,7 @@
             AND d.cases_id = #{filterPageVO.casesId}
         </if>
         <if test="filterPageVO.casesName != null and filterPageVO.casesName != ''">
-            AND e.cases_name like CONCAT('%', #{filterPageVO.casesName},'%')
+            AND e.cases_name = #{filterPageVO.casesName}
         </if>
         <if test="filterPageVO.hospitalId != null and filterPageVO.hospitalId != ''">
             AND a.hospital_id = #{filterPageVO.hospitalId}
@@ -1102,11 +1102,8 @@
         <if test="filterPageVO.endDate != null and filterPageVO.endDate != ''">
             <![CDATA[AND a.leave_hospital_date < DATE(#{filterPageVO.endDate})]]>
         </if>
-        <if test="filterPageVO.name != null and filterPageVO.name != ''">
-            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}
@@ -1410,7 +1407,7 @@
             AND d.cases_id = #{filterPageByDeptVO.casesId}
         </if>
         <if test="filterPageByDeptVO.casesName != null and filterPageByDeptVO.casesName != ''">
-            AND e.cases_name like CONCAT('%', #{filterPageByDeptVO.casesName},'%')
+            AND e.cases_name = #{filterPageByDeptVO.casesName}
         </if>
         <if test="filterPageByDeptVO.userId!=null">
             AND f.user_id = #{filterPageByDeptVO.userId}
@@ -1428,14 +1425,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 ">
@@ -1481,7 +1478,7 @@
             AND d.cases_id = #{filterPageByDeptVO.casesId}
         </if>
         <if test="filterPageByDeptVO.casesName != null and filterPageByDeptVO.casesName != ''">
-            AND e.cases_name like CONCAT('%', #{filterPageByDeptVO.casesName},'%')
+            AND e.cases_name = #{filterPageByDeptVO.casesName}
         </if>
         <if test="filterPageByDeptVO.userId!=null">
             AND f.user_id = #{filterPageByDeptVO.userId}
@@ -1495,18 +1492,15 @@
         <if test="filterPageByDeptVO.endDate != null and filterPageByDeptVO.endDate != ''">
             <![CDATA[AND a.leave_hospital_date < DATE(#{filterPageByDeptVO.endDate})]]>
         </if>
-        <if test="filterPageByDeptVO.name != null and filterPageByDeptVO.name != ''">
-            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 ">