Merge branch 'dev/20211015_2.1.1' into test

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -5521,6 +5521,9 @@
         <if test="qcResultShortPageVO.casesId != null">
             AND d.cases_id = #{qcResultShortPageVO.casesId}
         </if>
+        <if test="qcResultShortPageVO.doctorId != null and qcResultShortPageVO.doctorId != ''">
+            AND a.doctor_id = #{qcResultShortPageVO.doctorId}
+        </if>
         <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
             AND(case
             when e.attending_doctor != '' and e.attending_doctor is not null then e.attending_doctor
@@ -11184,6 +11187,9 @@
         <if test="qcResultShortPageVO.casesId != null">
             AND d.cases_id = #{qcResultShortPageVO.casesId}
         </if>
+        <if test="qcResultShortPageVO.doctorId != null and qcResultShortPageVO.doctorId != ''">
+            AND a.doctor_id = #{qcResultShortPageVO.doctorId}
+        </if>
         <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
             AND(case
             when e.attending_doctor != '' and e.attending_doctor is not null then e.attending_doctor
@@ -11438,6 +11444,9 @@
         <if test="qcResultShortPageVO.deptId != null and qcResultShortPageVO.deptId != ''">
             AND a.beh_dept_id  = #{qcResultShortPageVO.deptId}
         </if>
+        <if test="qcResultShortPageVO.doctorId != null and qcResultShortPageVO.doctorId != ''">
+            AND a.doctor_id = #{qcResultShortPageVO.doctorId}
+        </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND b.`level` = #{qcResultShortPageVO.level}
         </if>
@@ -12838,6 +12847,9 @@
         <if test="qcResultPageVO.isPlacefile != null and qcResultPageVO.isPlacefile != ''">
             and a.is_placefile = #{qcResultPageVO.isPlacefile}
         </if>
+        <if test="qcResultPageVO.doctorId != null and qcResultPageVO.doctorId != ''">
+            AND a.doctor_id = #{qcResultPageVO.doctorId}
+        </if>
         <if test="qcResultPageVO.hospitalId != null and qcResultPageVO.hospitalId != ''">
             AND a.hospital_id = #{qcResultPageVO.hospitalId}
         </if>
@@ -12985,6 +12997,9 @@
         <if test="qcResultPageVO.deptId != null and qcResultPageVO.deptId != ''">
             AND a.beh_dept_id = #{qcResultPageVO.deptId}
         </if>
+        <if test="qcResultPageVO.doctorId != null and qcResultPageVO.doctorId != ''">
+            AND a.doctor_id = #{qcResultPageVO.doctorId}
+        </if>
         <if test="qcResultPageVO.behospitalCode != null and qcResultPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultPageVO.behospitalCode}, '%' )
         </if>
@@ -14092,6 +14107,9 @@
         <if test="qcResultShortPageVO.deptId != null and qcResultShortPageVO.deptId != ''">
             AND a.beh_dept_id = #{qcResultShortPageVO.deptId}
         </if>
+        <if test="qcResultShortPageVO.doctorId != null and qcResultShortPageVO.doctorId != ''">
+            AND a.doctor_id = #{qcResultShortPageVO.doctorId}
+        </if>
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
         </if>
@@ -14291,6 +14309,9 @@
         <if test="qcResultShortPageVO.deptId != null and qcResultShortPageVO.deptId != ''">
             AND a.beh_dept_id = #{qcResultShortPageVO.deptId}
         </if>
+        <if test="qcResultShortPageVO.doctorId != null and qcResultShortPageVO.doctorId != ''">
+            AND a.doctor_id = #{qcResultShortPageVO.doctorId}
+        </if>
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
         </if>