From 501ab21accaed9b51bc537ff49679270fee741d4 Mon Sep 17 00:00:00 2001
From: zhs <zhs18203887318@163.com>
Date: 星期一, 07 七月 2025 17:53:30 +0800
Subject: [PATCH] 07-07 mx

---
 smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml |   30 +++++++++++++++++++++---------
 1 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
index 6b2edb7..84fedd6 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
@@ -35,6 +35,7 @@
         <result property="guid" column="guid"/>
         <result property="patno" column="patno"/>
         <result property="diagcheckFlag" column="diagcheck_flag"/>
+        <result property="idcardno" column="idcardno"/>
         <result property="remark" column="remark"/>
     </resultMap>
 
@@ -108,7 +109,8 @@
         pmo.patname,
         CONCAT(pa.age,pa.age_unit,pa.age2,pa.age_unit2) AS age,
         pa.telcode,
-        pmo.mainsuit
+        pmo.mainsuit,
+        pa.idcardno
         from pat_med_outhosp pmo left join pat_archive pa on pmo.patid = pa.id
         <where>
             pmo.del_flag=0
@@ -120,13 +122,6 @@
             <if test="deptname != null  and deptname != ''">and pmo.deptname like concat('%', #{deptname}, '%')</if>
             <if test="drname != null  and drname != ''">and pmo.drname like concat('%', #{drname}, '%')</if>
             <if test="patname != null  and patname != ''">and pmo.patname like concat('%', #{patname}, '%')</if>
-
-            <!--<if test="beginTime != null ">and date_format(pmo.admitdate,'%Y%m%d%H%i%s') &gt;=
-                date_format(#{beginTime},'%Y%m%d%H%i%s')
-            </if>
-            <if test="endTime != null ">and date_format(pmo.admitdate,'%Y%m%d%H%i%s') &lt;=
-                date_format(#{endTime},'%Y%m%d%H%i%s')
-            </if>-->
             <if test="beginTime != null ">and date_format(pmo.admitdate,'%y%m%d') &gt;=
                 date_format(#{beginTime},'%y%m%d')
             </if>
@@ -277,7 +272,24 @@
             del_flag=0
             and date_format(admitdate,'%y%m%d') &gt;= date_format(#{startDate},'%y%m%d')
             and date_format(admitdate,'%y%m%d') &lt;= date_format(#{endDate},'%y%m%d')
-            <if test="deptcodeList != null">
+            <if test="deptcodeList != null and deptcodeList.size()>0">
+                and deptcode in
+                <foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
+                    #{deptcode}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <select id="getDeptRanking" parameterType="com.smartor.domain.PatMedReq" resultType="com.smartor.domain.PatMedRes">
+        SELECT deptname, COUNT(1) AS rc
+        FROM pat_med_outhosp
+        <where>
+            del_flag=0
+            <if test="inhospstate != inhospstate">
+                and inhospstate= #{inhospstate}
+            </if>
+            <if test="deptcodeList != null and deptcodeList.size()>0">
                 and deptcode in
                 <foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
                     #{deptcode}

--
Gitblit v1.9.3