From 45e511fe87a7b838a084ce524c8566d20e56059a Mon Sep 17 00:00:00 2001
From: zhs <zhs18203887318@163.com>
Date: 星期二, 22 四月 2025 18:20:35 +0800
Subject: [PATCH] 04-22 zhs 测试

---
 smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
index f103c31..71fa63d 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
@@ -34,12 +34,17 @@
         <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,
@@ -73,7 +78,9 @@
             resultMap="PatMedOuthospResult">
         select
         pmo.id,
+        pmo.remark,
         pmo.outhospno,
+        pmo.diagcheck_flag,
         pmo.patno,
         pmo.serialnum,
         pmo.patid,
@@ -102,11 +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
-            and pmo.orgid =#{orgid}
+            <if test="orgid != null ">and pmo.orgid = #{orgid}</if>
             <if test="hospitalname != null  and hospitalname != ''">and pmo.hospitalname like concat('%',
                 #{hospitalname},
                 '%')
@@ -131,6 +139,7 @@
             <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>
@@ -172,6 +181,8 @@
             <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>
@@ -202,6 +213,8 @@
             <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>
 
@@ -236,6 +249,8 @@
             <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>

--
Gitblit v1.9.3