From 3c46b264b86bb38984370f685c6866c5f7784808 Mon Sep 17 00:00:00 2001
From: zhs <zhs18203887318@163.com>
Date: 星期三, 16 四月 2025 21:42:39 +0800
Subject: [PATCH] 04-16改_手术病人分页and患者信息子页面时间查询

---
 smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml |   71 +++++++++++++++++++++++++++++++----
 1 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
index 33f177a..f103c31 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
@@ -33,11 +33,13 @@
         <result property="outhospno" column="outhospno"/>
         <result property="patname" column="patname"/>
         <result property="guid" column="guid"/>
+        <result property="patno" column="patno"/>
     </resultMap>
 
     <sql id="selectPatMedOuthospVo">
         select id,
                outhospno,
+               patno,
                serialnum,
                patid,
                hospitalname,
@@ -69,18 +71,68 @@
 
     <select id="selectPatMedOuthospList" parameterType="com.smartor.domain.PatMedOuthosp"
             resultMap="PatMedOuthospResult">
-        <include refid="selectPatMedOuthospVo"/>
+        select
+        pmo.id,
+        pmo.outhospno,
+        pmo.patno,
+        pmo.serialnum,
+        pmo.patid,
+        pmo.hospitalname,
+        pmo.hospitalcode,
+        pmo.icd10code,
+        pmo.diagname,
+        pmo.deptcode,
+        pmo.deptname,
+        pmo.drcode,
+        pmo.drname,
+        pmo.admitdate,
+        pmo.orgid,
+        pmo.del_flag,
+        pmo.guid,
+        pmo.update_by,
+        pmo.update_time,
+        pmo.create_by,
+        pmo.create_time,
+        pmo.isupload,
+        pmo.upload_time,
+        pmo.schemestatus,
+        pmo.deptid,
+        pmo.schemetime,
+        pmo.hpi,
+        pmo.patname,
+        CONCAT(pa.age,pa.age_unit,pa.age2,pa.age_unit2) AS age,
+        pa.telcode,
+        pmo.mainsuit
+        from pat_med_outhosp pmo left join pat_archive pa on pmo.patid = pa.id
         <where>
-            <if test="hospitalname != null  and hospitalname != ''">and hospitalname like concat('%', #{hospitalname},
+            pmo.del_flag=0
+            and pmo.orgid =#{orgid}
+            <if test="hospitalname != null  and hospitalname != ''">and pmo.hospitalname like concat('%',
+                #{hospitalname},
                 '%')
             </if>
-            <if test="deptname != null  and deptname != ''">and deptname like concat('%', #{deptname}, '%')</if>
-            <if test="drname != null  and drname != ''">and drname like concat('%', #{drname}, '%')</if>
-            <if test="admitdate != null ">and admitdate = #{admitdate}</if>
-            <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
-            <if test="outhospno != null  and outhospno != ''">and outhospno = #{outhospno}</if>
+            <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>
+            <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>
         </where>
-        order by update_time desc
+        order by pmo.update_time desc
     </select>
 
     <select id="selectPatMedOuthospById" parameterType="Long" resultMap="PatMedOuthospResult">
@@ -119,6 +171,7 @@
             <if test="outhospno != null">outhospno,</if>
             <if test="patname != null">patname,</if>
             <if test="guid != null">guid,</if>
+            <if test="patno != null">patno,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="serialnum != null">#{serialnum},</if>
@@ -148,6 +201,7 @@
             <if test="outhospno != null">#{outhospno},</if>
             <if test="patname != null">#{patname},</if>
             <if test="guid != null">#{guid},</if>
+            <if test="patno != null">#{patno},</if>
         </trim>
     </insert>
 
@@ -181,6 +235,7 @@
             <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>
         </trim>
         where id = #{id}
     </update>

--
Gitblit v1.9.3