From 1967693c5d760ade002f8a5fbea10b51aef5693f Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 10 四月 2025 13:39:32 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml |   51 +++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 43 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..1c84549 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
@@ -69,18 +69,53 @@
 
     <select id="selectPatMedOuthospList" parameterType="com.smartor.domain.PatMedOuthosp"
             resultMap="PatMedOuthospResult">
-        <include refid="selectPatMedOuthospVo"/>
+        select
+        pmo.id,
+        pmo.outhospno,
+        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
+            <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="admitdate != null ">and pmo.admitdate = #{admitdate}</if>
+            <if test="patid != null ">and pmo.patid = #{patid}</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">

--
Gitblit v1.9.3