From 67d934b740862de1db1951137b5590410f3eb92b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 15 八月 2025 13:34:39 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml |  170 +++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 105 insertions(+), 65 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
index d70cb54..4441177 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -76,68 +76,68 @@
 
     <sql id="selectPatMedInhospVo">
         select inhospid,
-               patname,
-               fuflag,
-               management_doctor,
-               management_doctor_code,
-               fudate,
-               fuperiod,
-               futypecode,
-               futypedesc,
-               fuadvice,
-               fuspecialadvice,
-               remark,
-               guid,
-               operator,
-               operator_id,
-               out_way_id,
-               out_way_name,
-               nurse_id,
-               nurse_name,
-               deptcheck_flag,
-               wardcheck_flag,
-               diagcheck_flag,
-               inhospstate,
-               patno,
-               long_task_reason,
-               inhospno,
-               serialnum,
-               hospitalname,
-               hospitalcode,
-               hospitaldistrictcode,
-               hospitaldistrictname,
-               icd10code,
-               diagname,
-               starttime,
-               endtime,
-               deptcode,
-               deptname,
-               roomno,
-               bed_no,
-               orgid,
-               del_flag,
-               update_by,
-               update_time,
-               create_by,
-               create_time,
-               isupload,
-               upload_time,
-               patid,
-               leavediagname,
-               leaveicd10code,
-               drcode,
-               drname,
-               schemestatus,
-               generalschemestatus,
-               leaveldeptcode,
-               leaveldeptname,
-               hospitaldistrictid,
-               leavehospitaldistrictcode,
-               leavehospitaldistrictname,
-               leavehospitaldistrictid,
-               deptid,
-               leaveldeptid,
-               schemetime
+        patname,
+        fuflag,
+        management_doctor,
+        management_doctor_code,
+        fudate,
+        fuperiod,
+        futypecode,
+        futypedesc,
+        fuadvice,
+        fuspecialadvice,
+        remark,
+        guid,
+        operator,
+        operator_id,
+        out_way_id,
+        out_way_name,
+        nurse_id,
+        nurse_name,
+        deptcheck_flag,
+        wardcheck_flag,
+        diagcheck_flag,
+        inhospstate,
+        patno,
+        long_task_reason,
+        inhospno,
+        serialnum,
+        hospitalname,
+        hospitalcode,
+        hospitaldistrictcode,
+        hospitaldistrictname,
+        icd10code,
+        diagname,
+        starttime,
+        endtime,
+        deptcode,
+        deptname,
+        roomno,
+        bed_no,
+        orgid,
+        del_flag,
+        update_by,
+        update_time,
+        create_by,
+        create_time,
+        isupload,
+        upload_time,
+        patid,
+        leavediagname,
+        leaveicd10code,
+        drcode,
+        drname,
+        schemestatus,
+        generalschemestatus,
+        leaveldeptcode,
+        leaveldeptname,
+        hospitaldistrictid,
+        leavehospitaldistrictcode,
+        leavehospitaldistrictname,
+        leavehospitaldistrictid,
+        deptid,
+        leaveldeptid,
+        schemetime
         from pat_med_inhosp
     </sql>
 
@@ -419,7 +419,7 @@
         SELECT GROUP_CONCAT(d.tagname, ', ')
         FROM pat_archivetag d
         WHERE d.patid = #{patid}
-          AND d.del_flag = 0
+        AND d.del_flag = 0
     </select>
 
 
@@ -576,7 +576,8 @@
         deptcheck_flag, wardcheck_flag, diagcheck_flag, long_task_reason,
         nurse_id, nurse_name, out_way_id, out_way_name, guid,
         operator, operator_id, inhospno, remark,
-        fuflag, fudate, fuperiod, futypecode, futypedesc, fuadvice, fuspecialadvice, management_doctor, management_doctor_doctor
+        fuflag, fudate, fuperiod, futypecode, futypedesc, fuadvice, fuspecialadvice, management_doctor,
+        management_doctor_doctor
         )
         values
         <foreach collection="list" item="item" separator=",">
@@ -764,22 +765,60 @@
     </select>
     <select id="selectPatMedInhospCount" parameterType="com.smartor.domain.PatMedReq"
             resultType="com.smartor.domain.PatMedRes">
+        SELECT SUM( rs ) AS rs,
+        SUM( rc ) AS rc
+        FROM (
         SELECT
         COUNT(1) AS rc,
-        COUNT(DISTINCT patid) AS rs
+        0 AS rs
         FROM
         pat_med_inhosp
         <where>
             del_flag=0
+            <if test="orgid != null">
+                AND orgid = #{orgid}
+            </if>
             <if test="zy != null">
                 and inhospstate=0
                 and date_format(starttime,'%y%m%d') &gt;= date_format(#{startDate},'%y%m%d')
                 and date_format(starttime,'%y%m%d') &lt;= date_format(#{endDate},'%y%m%d')
+                <if test="deptcodeList != null   and deptcodeList.size() > 0">
+                    and deptcode in
+                    <foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
+                        #{deptcode}
+                    </foreach>
+                </if>
             </if>
             <if test="cy != null">
                 and inhospstate=1
                 and date_format(endtime,'%y%m%d') &gt;= date_format(#{startDate},'%y%m%d')
                 and date_format(endtime,'%y%m%d') &lt;= date_format(#{endDate},'%y%m%d')
+                <if test="deptcodeList != null   and deptcodeList.size() > 0">
+                    and leaveldeptcode in
+                    <foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
+                        #{deptcode}
+                    </foreach>
+                </if>
+            </if>
+
+        </where>
+        union all
+        select
+        0 AS rc,
+        count(1) AS rs
+        FROM
+        service_subtask
+        <where>
+            del_flag = 0
+            and service_type=2
+            <if test="orgid != null">
+                AND orgid = #{orgid}
+            </if>
+            <if test="startDate != null">
+                AND date_format( visit_time, '%y%m%d' ) &gt;= date_format( #{startDate}, '%y%m%d' )
+            </if>
+            <if test="endDate != null">
+                AND date_format( visit_time, '%y%m%d' ) &lt;= date_format(#{endDate},'%y%m%d')
             </if>
             <if test="deptcodeList != null   and deptcodeList.size() > 0">
                 and deptcode in
@@ -788,5 +827,6 @@
                 </foreach>
             </if>
         </where>
+        ) AS combined_data
     </select>
 </mapper>

--
Gitblit v1.9.3