病历列表查询条件调整

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

@@ -82,6 +82,11 @@ public class BehospitalPageVO extends Page implements Serializable {
      */
     private String deptName;
 
+    /**
+     * 住院科室id
+     */
+    private String deptId;
+
     /**
      * 主诊断
      */
@@ -92,6 +97,11 @@ public class BehospitalPageVO extends Page implements Serializable {
      */
     private String doctorName;
 
+    /**
+     * 医生id
+     */
+    private String doctorId;
+
     @ApiModelProperty(hidden = true)
     private Long userId;
 

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -1063,15 +1063,19 @@
         <if test="deptName != null and deptName != ''">
             and t.beh_dept_name = #{deptName}
         </if>
+        <if test="deptId != null and deptId != ''">
+            and t.beh_dept_Id = #{deptId}
+        </if>
         <if test="doctorName != null and doctorName != ''">
             and CONCAT(
             IFNULL(t.doctor_name,''),IFNULL(t.beh_doctor_name,''),IFNULL(t.director_doctor_name,''))
             like CONCAT('%',#{doctorName},'%')
         </if>
         <if test="doctorCode != null and doctorCode != ''">
-            and (t.doctor_id = #{doctorCode}
-            or t.beh_doctor_id = #{doctorCode}
-            or t.director_doctor_id = #{doctorCode})
+            and t.doctor_id = #{doctorCode}
+        </if>
+        <if test="doctorId != null and doctorId != ''">
+            and t.doctor_id = #{doctorId}
         </if>
         <if test="name != null and name != ''">
             and t.name like CONCAT('%',#{name},'%')
@@ -4540,13 +4544,14 @@
             OR a.director_doctor_name like CONCAT('%',#{doctorName},'%'))
         </if>
         <if test="doctorCode != null and doctorCode != ''">
-            AND (a.doctor_id like CONCAT('%',#{doctorCode},'%')
-            OR a.beh_doctor_id like CONCAT('%',#{doctorCode},'%')
-            OR a.director_doctor_id like CONCAT('%',#{doctorCode},'%'))
+            AND a.doctor_id = #{doctorCode}
         </if>
         <if test="deptName != null and deptName != ''">
             and a.beh_dept_name = #{deptName}
         </if>
+        <if test="deptId != null and deptId != ''">
+            and a.beh_dept_id = #{deptId}
+        </if>
         <if test="name != null and name != ''">
             AND a.name like CONCAT('%',#{name},'%')
         </if>
@@ -4615,13 +4620,14 @@
             OR a.director_doctor_name like CONCAT('%',#{doctorName},'%'))
         </if>
         <if test="doctorCode != null and doctorCode != ''">
-            AND (a.doctor_id like CONCAT('%',#{doctorCode},'%')
-            OR a.beh_doctor_id like CONCAT('%',#{doctorCode},'%')
-            OR a.director_doctor_id like CONCAT('%',#{doctorCode},'%'))
+            and a.doctor_id = #{doctorCode}
         </if>
         <if test="deptName != null and deptName != ''">
             and a.beh_dept_name = #{deptName}
         </if>
+        <if test="deptId != null and deptId != ''">
+            and a.beh_dept_id = #{deptId}
+        </if>
         <if test="name != null and name != ''">
             AND a.name like CONCAT('%',#{name},'%')
         </if>
@@ -4635,6 +4641,7 @@
         t1.behDeptId = t2.behDeptId
         AND t1.behDeptName = t2.behDeptName
         AND t1.doctor_id = t2.doctorId
+        AND t1.doctorName = t2.doctorName
         ORDER BY
         t1.behDeptName,
         t1.doctorName,
@@ -5570,7 +5577,9 @@
             AND a.doctor_id = #{qcResultShortPageVO.doctorId}
         </if>
         <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
-            AND a.doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
+            AND (a.doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
+            OR a.beh_doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
+            OR a.director_doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' ))
         </if>
         <if test="qcResultShortPageVO.isReject != null">
             AND c.is_reject = #{qcResultShortPageVO.isReject}
@@ -7477,6 +7486,9 @@
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
             AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
+        <if test="qcResultShortPageVO.deptId != null and qcResultShortPageVO.deptId != ''">
+            AND a.beh_dept_id = #{qcResultShortPageVO.deptId}
+        </if>
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
         </if>
@@ -7484,9 +7496,7 @@
             AND a.NAME LIKE CONCAT( '%', #{qcResultShortPageVO.patName}, '%' )
         </if>
         <if test="qcResultShortPageVO.doctorId != null and qcResultShortPageVO.doctorId != ''">
-            AND (a.doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.beh_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.director_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' ))
+            AND a.doctor_id = #{qcResultShortPageVO.doctorId}
         </if>
         <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
             AND (a.doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
@@ -9130,6 +9140,9 @@
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
             AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
+        <if test="qcResultShortPageVO.deptId != null and qcResultShortPageVO.deptId != ''">
+            AND a.beh_dept_id = #{qcResultShortPageVO.deptId}
+        </if>
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
         </if>
@@ -9137,9 +9150,7 @@
             AND a.NAME LIKE CONCAT( '%', #{qcResultShortPageVO.patName}, '%' )
         </if>
         <if test="qcResultShortPageVO.doctorId != null and qcResultShortPageVO.doctorId != ''">
-            AND (a.doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.beh_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.director_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' ))
+            AND a.doctor_id = #{qcResultShortPageVO.doctorId}
         </if>
         <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
             AND (a.doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
@@ -9385,6 +9396,9 @@
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
             AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
+        <if test="qcResultShortPageVO.deptId != null and qcResultShortPageVO.deptId != ''">
+            AND a.beh_dept_id = #{qcResultShortPageVO.deptId}
+        </if>
         <if test="qcResultShortPageVO.behospitalCode != null and qcResultShortPageVO.behospitalCode != ''">
             AND a.behospital_code LIKE CONCAT( '%', #{qcResultShortPageVO.behospitalCode}, '%' )
         </if>
@@ -9392,9 +9406,7 @@
             AND a.NAME LIKE CONCAT( '%', #{qcResultShortPageVO.patName}, '%' )
         </if>
         <if test="qcResultShortPageVO.doctorId != null and qcResultShortPageVO.doctorId != ''">
-            AND (a.doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.beh_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.director_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' ))
+            AND a.doctor_id = #{qcResultShortPageVO.doctorId}
         </if>
         <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
             AND (a.doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
@@ -9663,7 +9675,9 @@
             AND a.doctor_id = #{qcResultShortPageVO.doctorId}
         </if>
         <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
-            AND a.doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
+            AND (a.doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
+            OR a.beh_doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
+            OR a.director_doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' ))
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND b.`level` = #{qcResultShortPageVO.level}
@@ -9964,7 +9978,9 @@
             AND a.doctor_id = #{qcResultShortPageVO.doctorId}
         </if>
         <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
-            AND a.doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
+            AND (a.doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
+            OR a.beh_doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
+            OR a.director_doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' ))
         </if>
         <if test="qcResultShortPageVO.isReject != null">
             AND c.is_reject = #{qcResultShortPageVO.isReject}
@@ -11319,8 +11335,13 @@
         <if test="isPlacefile != null and isPlacefile != ''">
             and a.is_placefile = #{isPlacefile}
         </if>
+        <if test="doctorId != null and doctorId != ''">
+            AND a.doctor_id = #{doctorId}
+        </if>
         <if test="doctorName != null and doctorName != ''">
-            AND a.doctor_name like CONCAT('%', #{doctorName}, '%')
+            AND (a.doctor_name LIKE CONCAT( '%', #{doctorName}, '%' )
+            OR a.beh_doctor_name LIKE CONCAT( '%', #{doctorName}, '%' )
+            OR a.director_doctor_name LIKE CONCAT( '%', #{doctorName}, '%' ))
         </if>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
@@ -11353,9 +11374,6 @@
         <if test="patName != null and patName != ''">
             AND a.NAME LIKE CONCAT( '%', #{patName}, '%' )
         </if>
-        <if test="doctorId != null and doctorId != ''">
-            AND a.doctor_id = #{doctorId}
-        </if>
         )be
         left join med_check_info mci
         on mci.is_deleted = 'N'
@@ -11423,7 +11441,9 @@
             and a.beh_dept_name = #{deptName}
         </if>
         <if test="doctorName != null and doctorName != ''">
-            AND a.doctor_name like CONCAT('%', #{doctorName}, '%')
+            AND (a.doctor_name LIKE CONCAT( '%', #{doctorName}, '%' )
+            OR a.beh_doctor_name LIKE CONCAT( '%', #{doctorName}, '%' )
+            OR a.director_doctor_name LIKE CONCAT( '%', #{doctorName}, '%' ))
         </if>
         <if test="doctorId != null and doctorId != ''">
             AND a.doctor_id = #{doctorId}
@@ -12100,6 +12120,9 @@
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
             AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
+        <if test="qcResultShortPageVO.deptId != null and qcResultShortPageVO.deptId != ''">
+            AND a.beh_dept_id = #{qcResultShortPageVO.deptId}
+        </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND b.`level` = #{qcResultShortPageVO.level}
         </if>
@@ -12116,7 +12139,9 @@
             AND a.doctor_id = #{qcResultShortPageVO.doctorId}
         </if>
         <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
-            AND a.doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
+            AND (a.doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
+            OR a.beh_doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
+            OR a.director_doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' ))
         </if>
         <if test="qcResultShortPageVO.casesEntryId != null ">
             AND d.id = #{qcResultShortPageVO.casesEntryId}
@@ -12833,7 +12858,7 @@
             AND a.ward_name LIKE CONCAT( '%', #{qcResultShortPageVO.wardName}, '%' )
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
+            AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         <if test="qcResultShortPageVO.deptId != null and qcResultShortPageVO.deptId != ''">
             AND a.beh_dept_id = #{qcResultShortPageVO.deptId}
@@ -12848,7 +12873,9 @@
             AND a.doctor_id = #{qcResultShortPageVO.doctorId}
         </if>
         <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
-            AND a.doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
+            AND (a.doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
+            OR a.beh_doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
+            OR a.director_doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' ))
         </if>
         )be
         left join med_check_info mci
@@ -13067,7 +13094,7 @@
             AND a.ward_name LIKE CONCAT( '%', #{qcResultShortPageVO.wardName}, '%' )
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND a.beh_dept_name LIKE CONCAT( '%', #{qcResultShortPageVO.deptName}, '%' )
+            AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
         <if test="qcResultShortPageVO.deptId != null and qcResultShortPageVO.deptId != ''">
             AND a.beh_dept_id = #{qcResultShortPageVO.deptId}
@@ -13085,7 +13112,9 @@
             AND a.doctor_id = #{qcResultShortPageVO.doctorId}
         </if>
         <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
-            AND a.doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
+            AND (a.doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
+            OR a.beh_doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
+            OR a.director_doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' ))
         </if>
         <if test="qcResultShortPageVO.casesEntryId != null ">
             AND d.id = #{qcResultShortPageVO.casesEntryId}
@@ -13793,6 +13822,9 @@
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
             AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
+        <if test="qcResultShortPageVO.deptId != null and qcResultShortPageVO.deptId != ''">
+            AND a.beh_dept_id = #{qcResultShortPageVO.deptId}
+        </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND b.`level` = #{qcResultShortPageVO.level}
         </if>
@@ -13803,9 +13835,7 @@
             AND a.NAME LIKE CONCAT( '%', #{qcResultShortPageVO.patName}, '%' )
         </if>
         <if test="qcResultShortPageVO.doctorId != null and qcResultShortPageVO.doctorId != ''">
-            AND (a.doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.beh_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.director_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' ))
+            AND a.doctor_id = #{qcResultShortPageVO.doctorId}
         </if>
         <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
             AND (a.doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
@@ -14026,6 +14056,9 @@
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
             AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
+        <if test="qcResultShortPageVO.deptId != null and qcResultShortPageVO.deptId != ''">
+            AND a.beh_dept_id = #{qcResultShortPageVO.deptId}
+        </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND b.`level` = #{qcResultShortPageVO.level}
         </if>
@@ -14039,9 +14072,7 @@
             AND d.NAME = #{qcResultShortPageVO.casesEntryName}
         </if>
         <if test="qcResultShortPageVO.doctorId != null and qcResultShortPageVO.doctorId != ''">
-            AND (a.doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.beh_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.director_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' ))
+            AND a.doctor_id = #{qcResultShortPageVO.doctorId}
         </if>
         <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
             AND (a.doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
@@ -15265,7 +15296,10 @@
             </if>
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
-            AND m1.beh_dept_name like CONCAT('%', #{qcResultShortPageVO.deptName}, '%')
+            AND m1.beh_dept_name = #{qcResultShortPageVO.deptName}
+        </if>
+        <if test="qcResultShortPageVO.deptId != null and qcResultShortPageVO.deptId != ''">
+            AND m1.beh_dept_id = #{qcResultShortPageVO.deptId}
         </if>
         GROUP BY
         m1.behospital_code
@@ -15323,6 +15357,9 @@
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
             AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
+        <if test="qcResultShortPageVO.deptId != null and qcResultShortPageVO.deptId != ''">
+            AND a.beh_dept_id = #{qcResultShortPageVO.deptId}
+        </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND c.`level` = #{qcResultShortPageVO.level}
         </if>
@@ -15333,9 +15370,7 @@
             AND a.NAME LIKE CONCAT( '%', #{qcResultShortPageVO.patName}, '%' )
         </if>
         <if test="qcResultShortPageVO.doctorId != null and qcResultShortPageVO.doctorId != ''">
-            AND (a.doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.beh_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.director_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' ))
+            AND a.doctor_id = #{qcResultShortPageVO.doctorId}
         </if>
         <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
             AND (a.doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
@@ -15710,6 +15745,9 @@
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
             AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
+        <if test="qcResultShortPageVO.deptId != null and qcResultShortPageVO.deptId != ''">
+            AND a.beh_dept_id = #{qcResultShortPageVO.deptId}
+        </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND b.`level` = #{qcResultShortPageVO.level}
         </if>
@@ -15720,9 +15758,7 @@
             AND a.NAME LIKE CONCAT( '%', #{qcResultShortPageVO.patName}, '%' )
         </if>
         <if test="qcResultShortPageVO.doctorId != null and qcResultShortPageVO.doctorId != ''">
-            AND (a.doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.beh_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.director_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' ))
+            AND a.doctor_id = #{qcResultShortPageVO.doctorId}
         </if>
         <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
             AND (a.doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
@@ -15789,8 +15825,6 @@
         SELECT
         f1.behDeptId,
         f1.behDeptName,
-        f1.wardName,
-        f1.medoupName,
         f1.doctorName,
         f1.patName,
         f1.behospitalCode,
@@ -15823,8 +15857,6 @@
         </if>
         t.behDeptId,
         t.behDeptName,
-        t.wardName,
-        t.medoupName,
         t.hospitalId,
         t.checkStatus,
         t.mrStatus,
@@ -15857,7 +15889,6 @@
         t1.placefile_date AS placefileDate,
         t1.gmt_create AS gradeTime,
         t1.diagnose,
-        t1.medoupName,
         t1.ward_name AS wardName,
         t2.age,
         t1.file_code AS fileCode,
@@ -15871,7 +15902,6 @@
         (
         SELECT
         be.*,
-        t3.name as medoupName,
         ifnull( mci.STATUS, 0 ) AS checkStatus,
         ifnull( hm_mci.STATUS, 0 ) AS mrStatus,
         mci.check_name AS chName,
@@ -15939,9 +15969,6 @@
         <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
             AND m1.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
-        <if test="qcResultShortPageVO.wardName != null and qcResultShortPageVO.wardName != ''">
-            AND m1.ward_name LIKE CONCAT( '%', #{qcResultShortPageVO.wardName}, '%' )
-        </if>
         <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile == 0">
             <if test="qcResultShortPageVO.startDate != null ">
                 <![CDATA[ AND m1.behospital_date >= #{qcResultShortPageVO.startDate}]]>
@@ -15989,9 +16016,6 @@
         <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
-        <if test="qcResultShortPageVO.wardName != null and qcResultShortPageVO.wardName != ''">
-            AND a.ward_name LIKE CONCAT( '%', #{qcResultShortPageVO.wardName}, '%' )
-        </if>
         <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile == 0">
             <if test="qcResultShortPageVO.startDate != null ">
                 <![CDATA[ AND a.behospital_date >= #{qcResultShortPageVO.startDate}]]>
@@ -16045,11 +16069,6 @@
         AND hm_mci.check_type = 1
         AND be.hospital_id = hm_mci.hospital_id
         AND be.behospital_code = hm_mci.behospital_code
-        LEFT JOIN bas_doctor_info t2 ON be.doctor_id = t2.doctor_id
-        and be.hospital_id = t2.hospital_id
-        AND t2.is_deleted = 'N'
-        LEFT JOIN sys_medoup t3 ON t2.group_id = t3.`code`
-        AND t3.is_deleted = 'N'
         ) t1
         LEFT JOIN med_home_page t2 ON t1.hospital_id = t2.hospital_id
         AND t1.behospital_code = t2.behospital_code
@@ -16069,9 +16088,6 @@
         <if test="qcResultShortPageVO.checkStatus != null">
             AND t.checkStatus = #{qcResultShortPageVO.checkStatus}
         </if>
-        <if test="qcResultShortPageVO.medoupName != null and qcResultShortPageVO.medoupName!=''">
-            AND t.medoupName LIKE CONCAT( '%', #{qcResultShortPageVO.medoupName}, '%' )
-        </if>
         <if test="qcResultShortPageVO.mrStatus != null">
             AND t.mrStatus = #{qcResultShortPageVO.mrStatus}
         </if>
@@ -16123,7 +16139,6 @@
         t1.placefile_date AS placefileDate,
         t1.gmt_create AS gradeTime,
         t1.diagnose,
-        t1.medoupName,
         t1.ward_name AS wardName,
         t2.age,
         t1.file_code AS fileCode,
@@ -16137,7 +16152,6 @@
         (
         SELECT
         be.*,
-        t3.name as medoupName,
         ifnull( mci.STATUS, 0 ) AS checkStatus,
         ifnull( hm_mci.STATUS, 0 ) AS mrStatus,
         mci.check_name AS chName,
@@ -16205,9 +16219,6 @@
         <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
             AND m1.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
-        <if test="qcResultShortPageVO.wardName != null and qcResultShortPageVO.wardName != ''">
-            AND m1.ward_name LIKE CONCAT( '%', #{qcResultShortPageVO.wardName}, '%' )
-        </if>
         <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile == 0">
             <if test="qcResultShortPageVO.startDate != null ">
                 <![CDATA[ AND m1.behospital_date >= #{qcResultShortPageVO.startDate}]]>
@@ -16255,9 +16266,6 @@
         <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
-        <if test="qcResultShortPageVO.wardName != null and qcResultShortPageVO.wardName != ''">
-            AND a.ward_name LIKE CONCAT( '%', #{qcResultShortPageVO.wardName}, '%' )
-        </if>
         <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile == 0">
             <if test="qcResultShortPageVO.startDate != null ">
                 <![CDATA[ AND a.behospital_date >= #{qcResultShortPageVO.startDate}]]>
@@ -16311,11 +16319,6 @@
         AND hm_mci.check_type = 1
         AND be.hospital_id = hm_mci.hospital_id
         AND be.behospital_code = hm_mci.behospital_code
-        LEFT JOIN bas_doctor_info t2 ON be.doctor_id = t2.doctor_id
-        and be.hospital_id = t2.hospital_id
-        AND t2.is_deleted = 'N'
-        LEFT JOIN sys_medoup t3 ON t2.group_id = t3.`code`
-        AND t3.is_deleted = 'N'
         ) t1
         LEFT JOIN med_home_page t2 ON t1.hospital_id = t2.hospital_id
         AND t1.behospital_code = t2.behospital_code
@@ -16328,9 +16331,6 @@
         <if test="qcResultShortPageVO.checkStatus != null">
             AND t.checkStatus = #{qcResultShortPageVO.checkStatus}
         </if>
-        <if test="qcResultShortPageVO.medoupName != null and qcResultShortPageVO.medoupName!=''">
-            AND t.medoupName LIKE CONCAT( '%', #{qcResultShortPageVO.medoupName}, '%' )
-        </if>
         <if test="qcResultShortPageVO.mrStatus != null">
             AND t.mrStatus = #{qcResultShortPageVO.mrStatus}
         </if>
@@ -16542,6 +16542,9 @@
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
             AND m1.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
+        <if test="qcResultShortPageVO.deptId != null and qcResultShortPageVO.deptId != ''">
+            AND m1.beh_dept_id = #{qcResultShortPageVO.deptId}
+        </if>
         GROUP BY
         m1.behospital_code
         ORDER BY
@@ -16598,6 +16601,9 @@
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
             AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
+        <if test="qcResultShortPageVO.deptId != null and qcResultShortPageVO.deptId != ''">
+            AND a.beh_dept_id = #{qcResultShortPageVO.deptId}
+        </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND c.`level` = #{qcResultShortPageVO.level}
         </if>
@@ -16608,9 +16614,7 @@
             AND a.NAME LIKE CONCAT( '%', #{qcResultShortPageVO.patName}, '%' )
         </if>
         <if test="qcResultShortPageVO.doctorId != null and qcResultShortPageVO.doctorId != ''">
-            AND (a.doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.beh_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.director_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' ))
+            AND a.doctor_id = #{qcResultShortPageVO.doctorId}
         </if>
         <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
             AND (a.doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
@@ -16820,6 +16824,9 @@
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
             AND m1.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
+        <if test="qcResultShortPageVO.deptId != null and qcResultShortPageVO.deptId != ''">
+            AND m1.beh_dept_id = #{qcResultShortPageVO.deptId}
+        </if>
         GROUP BY
         m1.behospital_code
         ORDER BY
@@ -16876,6 +16883,9 @@
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
             AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
+        <if test="qcResultShortPageVO.deptId != null and qcResultShortPageVO.deptId != ''">
+            AND a.beh_dept_id = #{qcResultShortPageVO.deptId}
+        </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND c.`level` = #{qcResultShortPageVO.level}
         </if>
@@ -16886,9 +16896,7 @@
             AND a.NAME LIKE CONCAT( '%', #{qcResultShortPageVO.patName}, '%' )
         </if>
         <if test="qcResultShortPageVO.doctorId != null and qcResultShortPageVO.doctorId != ''">
-            AND (a.doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.beh_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.director_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' ))
+            AND a.doctor_id = #{qcResultShortPageVO.doctorId}
         </if>
         <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
             AND (a.doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
@@ -16965,8 +16973,6 @@
         SELECT
         f1.behDeptId,
         f1.behDeptName,
-        f1.wardName,
-        f1.medoupName,
         f1.doctorName,
         f1.patName,
         f1.behospitalCode,
@@ -16995,8 +17001,6 @@
         t.leaveHospitalDate AS leaveHospitalDate,
         qi.score_res AS score,
         t.scoreBn,
-        t.wardName,
-        t.medoupName,
         <if test="qcResultShortPageVO.radioCheck !=null and qcResultShortPageVO.radioCheck == 1">
         qd.msg AS msg,
         qc.NAME AS caseName,
@@ -17036,7 +17040,6 @@
         t1.placefile_date AS placefileDate,
         t1.gmt_create AS gradeTime,
         t1.diagnose,
-        t1.medoupName,
         t1.ward_name AS wardName,
         t2.age,
         t1.file_code AS fileCode,
@@ -17050,7 +17053,6 @@
         (
         SELECT
         be.*,
-        t3.name as medoupName,
         ifnull( mci.STATUS, 0 ) AS checkStatus,
         ifnull( hm_mci.STATUS, 0 ) AS mrStatus,
         mci.check_name AS chName,
@@ -17119,9 +17121,6 @@
         <if test="qcResultShortPageVO.diagnose != null and qcResultShortPageVO.diagnose != ''">
             AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
         </if>
-        <if test="qcResultShortPageVO.wardName != null and qcResultShortPageVO.wardName != ''">
-            AND a.ward_name LIKE CONCAT( '%', #{qcResultShortPageVO.wardName}, '%' )
-        </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
             AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
@@ -17158,11 +17157,6 @@
         and be.hospital_id = e.hospital_id
         AND e.is_deleted = 'N'
         and e.cases_id = 243
-        LEFT JOIN bas_doctor_info t2 ON be.doctor_id = t2.doctor_id
-        and be.hospital_id = t2.hospital_id
-        AND t2.is_deleted = 'N'
-        LEFT JOIN sys_medoup t3 ON t2.group_id = t3.`code`
-        AND t3.is_deleted = 'N'
         ) t1
         LEFT JOIN med_home_page t2 ON t1.hospital_id = t2.hospital_id
         AND t1.behospital_code = t2.behospital_code
@@ -17182,9 +17176,6 @@
         <if test="qcResultShortPageVO.checkStatus != null">
             AND t.checkStatus = #{qcResultShortPageVO.checkStatus}
         </if>
-        <if test="qcResultShortPageVO.medoupName != null and qcResultShortPageVO.medoupName!=''">
-            AND t.medoupName LIKE CONCAT( '%', #{qcResultShortPageVO.medoupName}, '%' )
-        </if>
         <if test="qcResultShortPageVO.mrStatus != null">
             AND t.mrStatus = #{qcResultShortPageVO.mrStatus}
         </if>
@@ -17236,7 +17227,6 @@
         t1.placefile_date AS placefileDate,
         t1.gmt_create AS gradeTime,
         t1.diagnose,
-        t1.medoupName,
         t1.ward_name AS wardName,
         t2.age,
         t1.file_code AS fileCode,
@@ -17250,7 +17240,6 @@
         (
         SELECT
         be.*,
-        t3.name as medoupName,
         ifnull( mci.STATUS, 0 ) AS checkStatus,
         ifnull( hm_mci.STATUS, 0 ) AS mrStatus,
         mci.check_name AS chName,
@@ -17296,9 +17285,6 @@
         <if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile != ''">
             and a.is_placefile = #{qcResultShortPageVO.isPlacefile}
         </if>
-        <if test="qcResultShortPageVO.wardName != null and qcResultShortPageVO.wardName != ''">
-            AND a.ward_name LIKE CONCAT( '%', #{qcResultShortPageVO.wardName}, '%' )
-        </if>
         <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
             AND a.hospital_id = #{qcResultShortPageVO.hospitalId}
         </if>
@@ -17323,7 +17309,6 @@
         </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
             AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
-
         </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND c.`level` = #{qcResultShortPageVO.level}
@@ -17361,18 +17346,10 @@
         LEFT JOIN med_qcresult_info qi ON qi.is_deleted = 'N'
         AND t.hospitalId = qi.hospital_id
         AND t.behospitalCode = qi.behospital_code
-        LEFT JOIN bas_doctor_info t2 ON be.doctor_id = t2.doctor_id
-        and be.hospital_id = t2.hospital_id
-        AND t2.is_deleted = 'N'
-        LEFT JOIN sys_medoup t3 ON t2.group_id = t3.`code`
-        AND t3.is_deleted = 'N'
         where 1=1
         <if test="qcResultShortPageVO.checkStatus != null">
             AND t.checkStatus = #{qcResultShortPageVO.checkStatus}
         </if>
-        <if test="qcResultShortPageVO.medoupName != null and qcResultShortPageVO.medoupName!=''">
-            AND t.medoupName LIKE CONCAT( '%', #{qcResultShortPageVO.medoupName}, '%' )
-        </if>
         <if test="qcResultShortPageVO.mrStatus != null">
             AND t.mrStatus = #{qcResultShortPageVO.mrStatus}
         </if>
@@ -17576,6 +17553,9 @@
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
             AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
+        <if test="qcResultShortPageVO.deptId != null and qcResultShortPageVO.deptId != ''">
+            AND a.beh_dept_id = #{qcResultShortPageVO.deptId}
+        </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND c.`level` = #{qcResultShortPageVO.level}
         </if>
@@ -17586,9 +17566,7 @@
             AND a.NAME LIKE CONCAT( '%', #{qcResultShortPageVO.patName}, '%' )
         </if>
         <if test="qcResultShortPageVO.doctorId != null and qcResultShortPageVO.doctorId != ''">
-            AND (a.doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.beh_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.director_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' ))
+            AND a.doctor_id = #{qcResultShortPageVO.doctorId}
         </if>
         <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
             AND (a.doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )
@@ -17782,6 +17760,9 @@
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
             AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
+        <if test="qcResultShortPageVO.deptId != null and qcResultShortPageVO.deptId != ''">
+            AND a.beh_dept_id = #{qcResultShortPageVO.deptId}
+        </if>
         <if test="qcResultShortPageVO.level != null and qcResultShortPageVO.level != ''">
             AND c.`level` = #{qcResultShortPageVO.level}
         </if>
@@ -17792,9 +17773,7 @@
             AND a.NAME LIKE CONCAT( '%', #{qcResultShortPageVO.patName}, '%' )
         </if>
         <if test="qcResultShortPageVO.doctorId != null and qcResultShortPageVO.doctorId != ''">
-            AND (a.doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.beh_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' )
-            OR a.director_doctor_id LIKE CONCAT( '%', #{qcResultShortPageVO.doctorId}, '%' ))
+            AND a.doctor_id = #{qcResultShortPageVO.doctorId}
         </if>
         <if test="qcResultShortPageVO.doctorName != null and qcResultShortPageVO.doctorName != ''">
             AND (a.doctor_name LIKE CONCAT( '%', #{qcResultShortPageVO.doctorName}, '%' )