From 2212759d051a0f60b4f0ada73d678cf150e29c84 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 04 二月 2026 18:26:02 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml |   75 ++++---------------------------------
 1 files changed, 8 insertions(+), 67 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
index 3409748..51ef3f1 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -177,7 +177,7 @@
         <where>
             a.del_flag = 0
             AND b.del_flag = 0
-            AND a.idcardno IS NOT NULL
+--             AND a.idcardno IS NOT NULL
             <if test="tagname != null  and tagname != ''">
                 AND EXISTS (
                 SELECT 1
@@ -674,72 +674,13 @@
     </delete>
 
     <select id="getDeptRanking" parameterType="com.smartor.domain.PatMedReq" resultType="com.smartor.domain.PatMedRes">
-        SELECT deptname, COUNT(1) AS rc
-        FROM (
-        <if test="mz != null">
-            SELECT deptname
-            FROM pat_med_outhosp
-            <where>
-                del_flag=0
-                <if test="deptcodeList != null">
-                    and deptcode in
-                    <foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
-                        #{deptcode}
-                    </foreach>
-                </if>
-            </where>
-        </if>
-        <if test="mz != null and zy != null">
-            UNION ALL
-        </if>
-        <if test="zy != null">
-            SELECT deptname
-            FROM pat_med_inhosp
-            <where>
-                del_flag=0
-                and inhospstate=0
-                <if test="deptcodeList != null">
-                    and deptcode in
-                    <foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
-                        #{deptcode}
-                    </foreach>
-                </if>
-            </where>
-        </if>
-        <if test="cy != null and zy != null">
-            UNION ALL
-            SELECT deptname
-            FROM pat_med_inhosp
-            <where>
-                del_flag=0
-                and inhospstate=1
-                <if test="deptcodeList != null">
-                    and deptcode in
-                    <foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
-                        #{deptcode}
-                    </foreach>
-                </if>
-            </where>
-        </if>
-        <if test="mz != null and zy != null and cy==null">
-            UNION ALL
-            SELECT deptname
-            FROM pat_med_inhosp
-            <where>
-                del_flag=0
-                and inhospstate=1
-                <if test="deptcodeList != null">
-                    and deptcode in
-                    <foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
-                        #{deptcode}
-                    </foreach>
-                </if>
-            </where>
-        </if>
-        ) AS combined
-        GROUP BY deptname;
-
-
+        SELECT deptname,
+               count(1) AS rc
+        FROM service_subtask
+        WHERE finishtime >= #{startDate}
+          AND finishtime &lt;= #{endDate}
+          AND deptname is not null
+        GROUP BY deptname
     </select>
     <select id="selectPatMedInhospCount" parameterType="com.smartor.domain.PatMedReq"
             resultType="com.smartor.domain.PatMedRes">

--
Gitblit v1.9.3