Переглянути джерело

病历列表科室导出sql逻辑调整

chengyao 3 роки тому
батько
коміт
4a76a358ed
1 змінених файлів з 4 додано та 12 видалено
  1. 4 12
      src/main/resources/mapper/BehospitalInfoMapper.xml

+ 4 - 12
src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -9227,6 +9227,7 @@
         AND t.hospitalId = qi.hospital_id
         AND t.behospitalCode = qi.behospital_code
         LEFT JOIN bas_doctor_info t2 ON t.doctorId = t2.doctor_id
+        AND t.hospitalId = t2.hospital_id
         AND t2.is_deleted = 'N'
         LEFT JOIN sys_medoup t3 ON t2.group_id = t3.`code`
         AND t3.is_deleted = 'N'
@@ -9238,9 +9239,6 @@
             AND qd.cases_id = qc.id
         </if>
         where 1=1
-        <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
-            AND t2.hospital_id = #{qcResultShortPageVO.hospitalId}
-        </if>
         <if test="qcResultShortPageVO.medoupName != null and qcResultShortPageVO.medoupName != ''">
             AND t3.name LIKE CONCAT( '%', #{qcResultShortPageVO.medoupName}, '%' )
         </if>
@@ -9478,13 +9476,11 @@
         AND t.hospitalId = qi.hospital_id
         AND t.behospitalCode = qi.behospital_code
         LEFT JOIN bas_doctor_info t2 ON t.doctorId = t2.doctor_id
+        AND t.hospitalId = 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.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
-            AND t2.hospital_id = #{qcResultShortPageVO.hospitalId}
-        </if>
         <if test="qcResultShortPageVO.medoupName != null and qcResultShortPageVO.medoupName != ''">
             AND t3.name LIKE CONCAT( '%', #{qcResultShortPageVO.medoupName}, '%' )
         </if>
@@ -12916,6 +12912,7 @@
         AND t.hospitalId = qi.hospital_id
         AND t.behospitalCode = qi.behospital_code
         LEFT JOIN bas_doctor_info t2 ON t.doctorId = t2.doctor_id
+        AND t.hospitalId = t2.hospital_id
         AND t2.is_deleted = 'N'
         LEFT JOIN sys_medoup t3 ON t2.group_id = t3.`code`
         AND t3.is_deleted = 'N'
@@ -12930,9 +12927,6 @@
             AND qd.cases_entry_id = qce.id
         </if>
         where 1=1
-        <if test="qcResultShortPageVO.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
-            AND t2.hospital_id = #{qcResultShortPageVO.hospitalId}
-        </if>
         <if test="qcResultShortPageVO.medoupName != null and qcResultShortPageVO.medoupName != ''">
             AND t3.name LIKE CONCAT( '%', #{qcResultShortPageVO.medoupName}, '%' )
         </if>
@@ -13149,13 +13143,11 @@
         AND t.hospitalId = qi.hospital_id
         AND t.behospitalCode = qi.behospital_code
         LEFT JOIN bas_doctor_info t2 ON t.doctorId = t2.doctor_id
+        AND t.hospitalId = 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.hospitalId != null and qcResultShortPageVO.hospitalId != ''">
-            AND t2.hospital_id = #{qcResultShortPageVO.hospitalId}
-        </if>
         <if test="qcResultShortPageVO.medoupName != null and qcResultShortPageVO.medoupName != ''">
             AND t3.name LIKE CONCAT( '%', #{qcResultShortPageVO.medoupName}, '%' )
         </if>