From 2d84b9771e11b64f4224c57ebc36a157fe9a15b4 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 21 十月 2025 14:52:59 +0800
Subject: [PATCH] Merge branch 'master' into 0929-master
---
smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
index 30ba326..039bc61 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml
@@ -113,11 +113,8 @@
pmo.hpi,
pmo.fuflag,
pmo.patname,
- CONCAT(pa.age,pa.age_unit,pa.age2,pa.age_unit2) AS age,
- pa.telcode,
- pmo.mainsuit,
- pa.idcardno
- from pat_med_outhosp pmo left join pat_archive pa on pmo.patid = pa.id
+ pmo.mainsuit
+ from pat_med_outhosp pmo
<where>
pmo.del_flag=0
<if test="orgid != null ">and pmo.orgid = #{orgid}</if>
@@ -125,6 +122,15 @@
#{hospitalname},
'%')
</if>
+ <if test="deptcodes != null and deptcodes.size()>0">
+ AND pmo.deptcode IN
+ <foreach collection="deptcodes" item="deptcode" open="(" separator=","
+ close=")">
+ #{deptcode}
+ </foreach>
+ </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>
--
Gitblit v1.9.3