From 9cc2f53b11205309754c2451be061ef5fc337f32 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 13 五月 2025 13:57:18 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
index 1c84549..7d6c976 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
@@ -33,11 +33,18 @@
         <result property="outhospno" column="outhospno"/>
         <result property="patname" column="patname"/>
         <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>
 
     <sql id="selectPatMedOuthospVo">
         select id,
                outhospno,
+               diagcheck_flag,
+               patno,
+               remark,
                serialnum,
                patid,
                hospitalname,
@@ -71,7 +78,10 @@
             resultMap="PatMedOuthospResult">
         select
         pmo.id,
+        pmo.remark,
         pmo.outhospno,
+        pmo.diagcheck_flag,
+        pmo.patno,
         pmo.serialnum,
         pmo.patid,
         pmo.hospitalname,
@@ -99,10 +109,12 @@
         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
+            <if test="orgid != null ">and pmo.orgid = #{orgid}</if>
             <if test="hospitalname != null  and hospitalname != ''">and pmo.hospitalname like concat('%',
                 #{hospitalname},
                 '%')
@@ -110,10 +122,24 @@
             <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="admitdate != null ">and pmo.admitdate = #{admitdate}</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>
+            <if test="endTime != null ">and date_format(pmo.admitdate,'%y%m%d') &lt;=
+                date_format(#{endTime},'%y%m%d')
+            </if>
             <if test="patid != null ">and pmo.patid = #{patid}</if>
+            <if test="patno != null ">and pmo.patno = #{patno}</if>
             <if test="orgid != null  and orgid != ''">and pmo.orgid = #{orgid}</if>
             <if test="outhospno != null  and outhospno != ''">and pmo.outhospno = #{outhospno}</if>
+            <if test="diagcheckFlag != null  and diagcheckFlag != ''">and pmo.diagcheck_flag = #{diagcheckFlag}</if>
         </where>
         order by pmo.update_time desc
     </select>
@@ -154,6 +180,9 @@
             <if test="outhospno != null">outhospno,</if>
             <if test="patname != null">patname,</if>
             <if test="guid != null">guid,</if>
+            <if test="patno != null">patno,</if>
+            <if test="diagcheckFlag != null">diagcheck_flag,</if>
+            <if test="remark != null">remark,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="serialnum != null">#{serialnum},</if>
@@ -183,6 +212,9 @@
             <if test="outhospno != null">#{outhospno},</if>
             <if test="patname != null">#{patname},</if>
             <if test="guid != null">#{guid},</if>
+            <if test="patno != null">#{patno},</if>
+            <if test="diagcheckFlag != null">#{diagcheckFlag},</if>
+            <if test="remark != null">#{remark},</if>
         </trim>
     </insert>
 
@@ -216,6 +248,9 @@
             <if test="outhospno != null">outhospno = #{outhospno},</if>
             <if test="patname != null">patname = #{patname},</if>
             <if test="guid != null">guid = #{guid},</if>
+            <if test="patno != null">patno = #{patno},</if>
+            <if test="diagcheckFlag != null">diagcheck_flag = #{diagcheckFlag},</if>
+            <if test="remark != null">remark = #{remark},</if>
         </trim>
         where id = #{id}
     </update>
@@ -244,7 +279,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