提交

liusheng

2 天以前 a2efbead9c6871e740f70f13d1b0c0dc455d4b28

 smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml

@@ -280,11 +280,26 @@
                #{leavehospitaldistrictcode}
            </foreach>
        </if>

        <if test="hospitaldistrictcodeList != null and hospitaldistrictcodeList.size()>0">
            AND b.hospitaldistrictcode IN
            <foreach collection="hospitaldistrictcodeList" item="hospitaldistrictcode" open="(" separator=","
                     close=")">
                #{hospitaldistrictcode}
            </foreach>
        </if>
        <if test="leaveldeptcodes != null and leaveldeptcodes.size()>0">
            AND b.leaveldeptcode IN
            <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
                     close=")">
                #{leaveldeptcode}
            </foreach>
        </if>
        <if test="deptcodeList != null and deptcodeList.size()>0">
            AND b.deptcode IN
            <foreach collection="deptcodeList" item="deptcode" open="(" separator=","
                     close=")">
                #{deptcode}
            </foreach>
        </if>
        GROUP BY
@@ -855,73 +870,73 @@
    <select id="selectPatMedInhospCount" parameterType="com.smartor.domain.PatMedReq"
            resultType="com.smartor.domain.PatMedRes">
        SELECT SUM(rc) AS rc,
               SUM(rs) AS rs,
               SUM(scsf) AS scsf,
               SUM(zcsf) AS zcsf,
               SUM(zbsf) AS zbsf
        SUM(rs) AS rs,
        SUM(scsf) AS scsf,
        SUM(zcsf) AS zcsf,
        SUM(zbsf) AS zbsf
        FROM (
            <!-- 出院人次：去掉 date_format 包装，使日期字段索引生效 -->
            SELECT
                COUNT(1) AS rc,
                0 AS rs,
                0 AS scsf,
                0 AS zcsf,
                0 AS zbsf
            FROM pat_med_inhosp
            JOIN pat_archive ON pat_archive.id = pat_med_inhosp.patid
            WHERE pat_med_inhosp.del_flag = 0
            <if test="orgid != null and orgid != ''">
                AND pat_med_inhosp.orgid = #{orgid}
            </if>
            AND pat_archive.idcardno IS NOT NULL
            <if test="zy != null">
                AND pat_med_inhosp.inhospstate = 0
                AND pat_med_inhosp.starttime &gt;= #{startDate}
                AND pat_med_inhosp.starttime &lt; DATE_ADD(#{endDate}, INTERVAL 1 DAY)
                <if test="deptcodeList != null and deptcodeList.size() > 0">
                    AND pat_med_inhosp.deptcode IN
                    <foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
                        #{deptcode}
                    </foreach>
                </if>
            </if>
            <if test="cy != null">
                AND pat_med_inhosp.inhospstate = 1
                AND pat_med_inhosp.endtime &gt;= #{startDate}
                AND pat_med_inhosp.endtime &lt; DATE_ADD(#{endDate}, INTERVAL 1 DAY)
                <if test="deptcodeList != null and deptcodeList.size() > 0">
                    AND pat_med_inhosp.leaveldeptcode IN
                    <foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
                        #{deptcode}
                    </foreach>
                </if>
            </if>
            UNION ALL
            <!-- 随访服务/首次/再次/专病随访：合并为单次扫描，用条件聚合代替4个 UNION ALL -->
            SELECT
                0 AS rc,
                COUNT(1) AS rs,
                SUM(CASE WHEN service_type = 2 AND visit_count = 1 THEN 1 ELSE 0 END) AS scsf,
                SUM(CASE WHEN service_type = 2 AND visit_count > 1  THEN 1 ELSE 0 END) AS zcsf,
                SUM(CASE WHEN service_type = 13                      THEN 1 ELSE 0 END) AS zbsf
            FROM service_subtask
            WHERE del_flag = 0
            AND service_type IN (2, 13)
            <if test="orgid != null and orgid != ''">
                AND orgid = #{orgid}
            </if>
            <if test="startDate != null">
                AND visit_time &gt;= #{startDate}
            </if>
            <if test="endDate != null">
                AND visit_time &lt; DATE_ADD(#{endDate}, INTERVAL 1 DAY)
            </if>
        <!-- 出院人次：去掉 date_format 包装，使日期字段索引生效 -->
        SELECT
        COUNT(1) AS rc,
        0 AS rs,
        0 AS scsf,
        0 AS zcsf,
        0 AS zbsf
        FROM pat_med_inhosp
        JOIN pat_archive ON pat_archive.id = pat_med_inhosp.patid
        WHERE pat_med_inhosp.del_flag = 0
        <if test="orgid != null and orgid != ''">
            AND pat_med_inhosp.orgid = #{orgid}
        </if>
        AND pat_archive.idcardno IS NOT NULL
        <if test="zy != null">
            AND pat_med_inhosp.inhospstate = 0
            AND pat_med_inhosp.starttime &gt;= #{startDate}
            AND pat_med_inhosp.starttime &lt; DATE_ADD(#{endDate}, INTERVAL 1 DAY)
            <if test="deptcodeList != null and deptcodeList.size() > 0">
                AND deptcode IN
                AND pat_med_inhosp.deptcode IN
                <foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
                    #{deptcode}
                </foreach>
            </if>
        </if>
        <if test="cy != null">
            AND pat_med_inhosp.inhospstate = 1
            AND pat_med_inhosp.endtime &gt;= #{startDate}
            AND pat_med_inhosp.endtime &lt; DATE_ADD(#{endDate}, INTERVAL 1 DAY)
            <if test="deptcodeList != null and deptcodeList.size() > 0">
                AND pat_med_inhosp.leaveldeptcode IN
                <foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
                    #{deptcode}
                </foreach>
            </if>
        </if>
        UNION ALL
        <!-- 随访服务/首次/再次/专病随访：合并为单次扫描，用条件聚合代替4个 UNION ALL -->
        SELECT
        0 AS rc,
        COUNT(1) AS rs,
        SUM(CASE WHEN service_type = 2 AND visit_count = 1 THEN 1 ELSE 0 END) AS scsf,
        SUM(CASE WHEN service_type = 2 AND visit_count > 1 THEN 1 ELSE 0 END) AS zcsf,
        SUM(CASE WHEN service_type = 13 THEN 1 ELSE 0 END) AS zbsf
        FROM service_subtask
        WHERE del_flag = 0
        AND service_type IN (2, 13)
        <if test="orgid != null and orgid != ''">
            AND orgid = #{orgid}
        </if>
        <if test="startDate != null">
            AND visit_time &gt;= #{startDate}
        </if>
        <if test="endDate != null">
            AND visit_time &lt; DATE_ADD(#{endDate}, INTERVAL 1 DAY)
        </if>
        <if test="deptcodeList != null and deptcodeList.size() > 0">
            AND deptcode IN
            <foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
                #{deptcode}
            </foreach>
        </if>
        ) AS combined_data
    </select>