From 25a0ba7b2706db3c5ee546da3e0e7c909777b890 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 29 七月 2026 15:37:32 +0800
Subject: [PATCH] 1，患者过滤状态修改（之前只支持发送之前的过滤，现在支持发送之后的过滤，如果任务发送后，外链不能再打开） 2.在出入院表新增入院申请单字段 3.采集入院数据时，同时要采集importanceFlagCode emergencyLevelCode 4.外链的发送，也要查询子任务状态，如果是不执行，也不能再发送
---
smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
index 2aa5822..ef03c5f 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
@@ -389,20 +389,34 @@
<if test="leavehospitaldistrictname != null ">and service_task.leavehospitaldistrictname =
#{leavehospitaldistrictname}
</if>
- <if test="leavehospitaldistrictcodes!=null and leavehospitaldistrictcodes.size()>0">
- AND service_task.leavehospitaldistrictcode IN
- <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
- close=")">
- #{leavehospitaldistrictcode}
- </foreach>
- </if>
- <if test="leaveldeptcodes!=null and leaveldeptcodes.size()>0">
- AND service_task.deptcode IN
- <foreach collection="leaveldeptcodes" item="deptcode" open="(" separator=","
- close=")">
- #{deptcode}
- </foreach>
- </if>
+ <choose>
+ <when test="(leavehospitaldistrictcodes!=null and leavehospitaldistrictcodes.size()>0) and (leaveldeptcodes!=null and leaveldeptcodes.size()>0)">
+ AND (
+ service_task.leavehospitaldistrictcode IN
+ <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator="," close=")">
+ #{leavehospitaldistrictcode}
+ </foreach>
+ OR service_task.deptcode IN
+ <foreach collection="leaveldeptcodes" item="deptcode" open="(" separator="," close=")">
+ #{deptcode}
+ </foreach>
+ )
+ </when>
+ <otherwise>
+ <if test="leavehospitaldistrictcodes!=null and leavehospitaldistrictcodes.size()>0">
+ AND service_task.leavehospitaldistrictcode IN
+ <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator="," close=")">
+ #{leavehospitaldistrictcode}
+ </foreach>
+ </if>
+ <if test="leaveldeptcodes!=null and leaveldeptcodes.size()>0">
+ AND service_task.deptcode IN
+ <foreach collection="leaveldeptcodes" item="deptcode" open="(" separator="," close=")">
+ #{deptcode}
+ </foreach>
+ </if>
+ </otherwise>
+ </choose>
<if test="leavehospitaldistrictcode != null ">and service_task.leavehospitaldistrictcode =
#{leavehospitaldistrictcode}
</if>
--
Gitblit v1.9.3