缺陷统计验证med_qcresult_info是否删除

src/main/resources/mapper/QcresultInfoMapper.xml

@@ -172,25 +172,29 @@
     <!-- 条目缺陷分组统计 -->
     <select id="entryCountGroupByEntry" parameterType="com.diagbot.vo.FilterVO" resultType="com.diagbot.dto.NumDTO">
         SELECT
-        d.id,
-        d.NAME,
+        e.id,
+        e.NAME,
         count(*) AS num
         FROM
         med_behospital_info a,
         med_home_page b,
-        med_qcresult_detail c,
-        qc_cases_entry d
+        med_qcresult_info c,
+        med_qcresult_detail d,
+        qc_cases_entry e
         WHERE
         a.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND d.is_deleted = 'N'
+        AND e.is_deleted = 'N'
         AND a.hospital_id = b.hospital_id
         AND a.hospital_id = c.hospital_id
+        AND a.hospital_id = d.hospital_id
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = c.behospital_code
-        AND c.cases_id = d.cases_id
-        AND c.cases_entry_id = d.id
+        AND a.behospital_code = d.behospital_code
+        AND d.cases_id = e.cases_id
+        AND d.cases_entry_id = e.id
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
@@ -202,8 +206,8 @@
             <![CDATA[AND a.leave_hospital_date < DATE(#{endDate})]]>
         </if>
         GROUP BY
-        d.id,
-        d.NAME
+        e.id,
+        e.NAME
     </select>
 
     <!-- 质控平均分按科室统计 -->
@@ -345,34 +349,38 @@
     <!-- 条目缺陷分组统计 -->
     <select id="entryCountGroupByEntryAndDept" parameterType="com.diagbot.vo.FilterVO" resultType="com.diagbot.dto.DeptNumDTO">
         SELECT
-        d.id,
-        d.NAME,
+        e.id,
+        e.NAME,
         a.beh_dept_id AS deptId,
         a.beh_dept_name AS deptName,
         count(*) AS num
         FROM
         med_behospital_info a,
         med_home_page b,
-        med_qcresult_detail c,
-        qc_cases_entry d,
-        sys_user_dept e
+        med_qcresult_info c,
+        med_qcresult_detail d,
+        qc_cases_entry e,
+        sys_user_dept f
         WHERE
         a.is_deleted = 'N'
         AND b.is_deleted = 'N'
         AND c.is_deleted = 'N'
         AND d.is_deleted = 'N'
         AND e.is_deleted = 'N'
+        AND f.is_deleted = 'N'
         AND a.hospital_id = b.hospital_id
         AND a.hospital_id = c.hospital_id
-        AND a.hospital_id = e.hospital_id
+        AND a.hospital_id = d.hospital_id
+        AND a.hospital_id = f.hospital_id
         AND a.behospital_code = b.behospital_code
         AND a.behospital_code = c.behospital_code
-        AND c.cases_id = d.cases_id
-        AND c.cases_entry_id = d.id
-        AND a.beh_dept_id = e.dept_id
+        AND a.behospital_code = d.behospital_code
+        AND d.cases_id = e.cases_id
+        AND d.cases_entry_id = e.id
+        AND a.beh_dept_id = f.dept_id
         <![CDATA[AND a.qc_type_id <>0 ]]>
         <if test="userId!=null">
-            AND e.user_id = #{userId}
+            AND f.user_id = #{userId}
         </if>
         <if test="hospitalId != null and hospitalId != ''">
             AND a.hospital_id = #{hospitalId}
@@ -384,8 +392,8 @@
             <![CDATA[AND a.leave_hospital_date < DATE(#{endDate})]]>
         </if>
         GROUP BY
-        d.id,
-        d.NAME,
+        e.id,
+        e.NAME,
         a.beh_dept_id,
         a.beh_dept_name
     </select>