更新

src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -2223,14 +2223,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         return ret;
     }
 
-    /**
-     * 入院记录，手术记录，出院记录，病案首页24小时完成率
-     * @param filterVO
-     * @return
-     */
-    public Map<String, Long> medicalRecordIndicator(FilterVO filterVO){
-       return baseMapper.medicalRecordIndicator(filterVO);
-    }
+
     /**
      * 手术费，抗菌药物，手术和病理费等含有人数
      * @param filterVO
@@ -2240,7 +2233,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         return   baseMapper.selectOperationNum(filterVO);
     }
     /**
-     * 病理CT/MR触发多规则人数
+     * 触发规则人数
      * @param filterVO
      * @return
      */

src/main/java/com/diagbot/facade/ConsoleFacade.java

@@ -404,7 +404,7 @@ public class ConsoleFacade {
         int operationPathologyNum = getOperationPathologyNum(filterVO);
         Integer operationPathologyInteger = Integer.valueOf(operationPathologyNum);
         operationPathologyFeeNum=operationPathologyFeeNum+operationPathologyInteger;
-        Map<String, Long> recordIndicatorMap = behospitalInfoFacade.medicalRecordIndicator(filterVO);
+        Map<String, Long> recordIndicatorMap = behospitalInfoFacade.triggeringRules(filterVO);
         //各指标未完成人数情况
         Long operationCount = recordIndicatorMap.get(QualityContent.SSJLWCC_24H);
         Long InHospitalRecords = recordIndicatorMap.get(QualityContent.RYJLWWC_24H);

src/main/java/com/diagbot/service/BehospitalInfoService.java

@@ -655,13 +655,7 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
      * @return
      */
     public List<ExportExcelByDeptDTO> qcCheckMRPageExportByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO);
-    /**
-     * 入院，手术，出院 24小时完成情况
-     *
-     * @param filterVO
-     * @return
-     */
-    public Map<String, Long> medicalRecordIndicator(@Param("filterVO")FilterVO filterVO);
+
 
     /**
      * 手术费，抗菌药物，手术和病理费等含有人数
@@ -671,7 +665,7 @@ public interface BehospitalInfoService extends IService<BehospitalInfo> {
     public Map<String,Long> selectOperationNum(@Param("filterVO")FilterVO filterVO);
 
     /**
-     * 病理CT/MR触发多规则人数
+     * 触发规则人数
      * @param filterVO
      * @return
      */

src/main/java/com/diagbot/service/impl/BehospitalInfoServiceImpl.java

@@ -1094,15 +1094,7 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
     public List<ExportExcelByDeptDTO> qcCheckMRPageExportByDept(@Param("qcResultShortPageVO") QcResultShortPageVO qcResultShortPageVO) {
         return baseMapper.qcCheckMRPageExportByDept(qcResultShortPageVO);
     }
-    /**
-     * 入院，手术，出院 24小时完成情况
-     *
-     * @param filterVO
-     * @return
-     */
-    public Map<String, Long> medicalRecordIndicator(@Param("filterVO")FilterVO filterVO) {
-        return baseMapper.medicalRecordIndicator(filterVO);
-    }
+
     /**
      * 手术费，抗菌药物，手术和病理费等含有人数
      *
@@ -1115,7 +1107,7 @@ public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper,
     }
 
     /**
-     * 病理CT/MR触发多规则人数
+     * 触发规则人数
      * @param filterVO
      * @return
      */

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -17549,91 +17549,6 @@
         AND f1.doctorName = f2.doctorName
     </select>
 
-    <!-- 入院，手术，出院病案情况-->
-    <select id="medicalRecordIndicator" parameterType="com.diagbot.vo.FilterVO" resultType="java.util.Map">
-        SELECT
-        count(
-        DISTINCT
-        CASE
-        WHEN q.type=5 THEN
-        a.behospital_code
-        ELSE
-        NULL
-        END
-        ) AS 'operationNote',
-        count(
-        DISTINCT
-        CASE
-        WHEN q.type = 4 THEN
-        a.behospital_code
-        ELSE
-        NULL
-        END
-        ) AS 'residentAdmitNote',
-        count(
-        DISTINCT
-        CASE
-        WHEN q.type = 6 THEN
-        a.behospital_code
-        ELSE
-        NULL
-        END
-        ) AS 'dischargeRecord',
-        count(
-        DISTINCT
-        CASE
-        WHEN q.type = 7 THEN
-        a.behospital_code
-        ELSE
-        NULL
-        END
-        ) AS 'medicalRecord'
-        FROM
-        (
-        SELECT
-        a.behospital_code,
-        a.cases_entry_id,
-        a.hospital_id
-        FROM
-        (
-        SELECT
-        a.behospital_code,
-        c.cases_entry_id,
-        a.hospital_id
-        FROM
-        (
-        SELECT
-        a.behospital_code,
-        a.hospital_id
-        FROM
-        med_behospital_info a,
-        med_qcresult_info c
-        WHERE
-        a.is_deleted = 'N'
-        AND c.is_deleted = 'N'
-        AND a.is_placefile = #{filterVO.isPlacefile}
-        <if test="filterVO.startDate != null and  filterVO.endDate != null">
-            <![CDATA[ and a.leave_hospital_date >= #{filterVO.startDate}]]>
-            <![CDATA[ AND a
-
-            .leave_hospital_date <= #{filterVO.endDate}]]>
-        </if>
-        <![CDATA[ and  a.qc_type_id <>'0' ]]>
-        AND a.behospital_code = c.behospital_code
-        AND a.hospital_id = #{filterVO.hospitalId}
-        AND a.hospital_id = c.hospital_id
-        ) a
-        LEFT JOIN med_qcresult_detail c ON c.is_deleted = 'N'
-        AND a.behospital_code = c.behospital_code
-        AND a.hospital_id = c.hospital_id
-        ) a
-        JOIN qc_cases_entry d ON d.id = a.cases_entry_id
-        AND d.is_deleted = 'N'
-        ) a
-        LEFT JOIN qc_cases_relevance_entry q ON a.cases_entry_id = q.relevance_id
-        AND a.hospital_id = q.hospital_id
-
-    </select>
 
     <!--  时间段出院，住院， 手术费，抗菌药物，手术和病理费等含有人数 -->
     <select id="selectOperationNum" parameterType="com.diagbot.vo.FilterVO" resultType="java.util.Map">
@@ -17742,7 +17657,43 @@
         ELSE
         NULL
         END
-        ) AS 'antibiosisNum'
+        ) AS 'antibiosisNum',
+        count(
+        DISTINCT
+        CASE
+        WHEN q.type=5 THEN
+        a.behospital_code
+        ELSE
+        NULL
+        END
+        ) AS 'operationNote',
+        count(
+        DISTINCT
+        CASE
+        WHEN q.type = 4 THEN
+        a.behospital_code
+        ELSE
+        NULL
+        END
+        ) AS 'residentAdmitNote',
+        count(
+        DISTINCT
+        CASE
+        WHEN q.type = 6 THEN
+        a.behospital_code
+        ELSE
+        NULL
+        END
+        ) AS 'dischargeRecord',
+        count(
+        DISTINCT
+        CASE
+        WHEN q.type = 7 THEN
+        a.behospital_code
+        ELSE
+        NULL
+        END
+        ) AS 'medicalRecord'
         FROM
         (
         SELECT