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/ServiceSubtaskDetailTraceMapper.xml | 61 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 0 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailTraceMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailTraceMapper.xml
index c3220e6..05dc624 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailTraceMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailTraceMapper.xml
@@ -55,10 +55,18 @@
<result property="templateType" column="template_type"/>
<result property="isMydException" column="is_myd_exception"/>
<result property="dimension" column="dimension"/>
+ <result property="dutyDeptPersonName" column="duty_dept_person_name"/>
+ <result property="dutyDeptPersonCode" column="duty_dept_person_code"/>
+ <result property="reportDeptPersonCode" column="report_dept_person_name"/>
+ <result property="reportDeptPersonName" column="report_dept_person_code"/>
</resultMap>
<sql id="selectServiceSubtaskDetailTtraceVo">
select id,
+ duty_dept_person_name,
+ duty_dept_person_code,
+ report_dept_person_name,
+ report_dept_person_code,
detail_id,
is_myd_exception,
dimension,
@@ -257,6 +265,19 @@
<if test="isMydException != null ">
and is_myd_exception = #{isMydException}
</if>
+ <if test="dutyDeptPersonName != null and dutyDeptPersonName != ''">
+ and duty_dept_person_name like concat('%', #{dutyDeptPersonName}, '%')
+ </if>
+ <if test="dutyDeptPersonCode != null and dutyDeptPersonCode != ''">
+ and duty_dept_person_code like concat('%', #{dutyDeptPersonCode}, '%')
+ </if>
+ <if test="reportDeptPersonName != null and reportDeptPersonName != ''">
+ and report_dept_person_name like concat('%', #{reportDeptPersonName}, '%')
+ </if>
+ <if test="reportDeptPersonCode != null and reportDeptPersonCode != ''">
+ and report_dept_person_code like concat('%', #{reportDeptPersonCode}, '%')
+ </if>
+ <if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
</select>
<select id="tracedeallist" parameterType="com.smartor.domain.VO.DetailTraceDealVO"
@@ -292,6 +313,18 @@
</if>
<if test="dimension != null and dimension != ''">
and dimension = #{dimension}
+ </if>
+ <if test="dutyDeptPersonName != null and dutyDeptPersonName != ''">
+ and duty_dept_person_name like concat('%', #{dutyDeptPersonName}, '%')
+ </if>
+ <if test="dutyDeptPersonCode != null and dutyDeptPersonCode != ''">
+ and duty_dept_person_code like concat('%', #{dutyDeptPersonCode}, '%')
+ </if>
+ <if test="reportDeptPersonName != null and reportDeptPersonName != ''">
+ and report_dept_person_name like concat('%', #{reportDeptPersonName}, '%')
+ </if>
+ <if test="reportDeptPersonCode != null and reportDeptPersonCode != ''">
+ and report_dept_person_code like concat('%', #{reportDeptPersonCode}, '%')
</if>
</select>
@@ -406,6 +439,14 @@
</if>
<if test="isMydException != null">is_myd_exception,
</if>
+ <if test="dutyDeptPersonName != null">duty_dept_person_name,
+ </if>
+ <if test="dutyDeptPersonCode != null">duty_dept_person_code,
+ </if>
+ <if test="reportDeptPersonName != null">report_dept_person_name,
+ </if>
+ <if test="reportDeptPersonCode != null">report_dept_person_code,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="detailId != null">#{detailId},
@@ -507,6 +548,14 @@
<if test="dimension != null">#{dimension},
</if>
<if test="isMydException != null">#{isMydException},
+ </if>
+ <if test="dutyDeptPersonName != null">#{dutyDeptPersonName},
+ </if>
+ <if test="dutyDeptPersonCode != null">#{dutyDeptPersonCode},
+ </if>
+ <if test="reportDeptPersonName != null">#{reportDeptPersonName},
+ </if>
+ <if test="reportDeptPersonCode != null">#{reportDeptPersonCode},
</if>
</trim>
</insert>
@@ -664,6 +713,18 @@
<if test="isMydException != null">is_myd_exception =
#{isMydException},
</if>
+ <if test="dutyDeptPersonName != null">duty_dept_person_name =
+ #{dutyDeptPersonName},
+ </if>
+ <if test="dutyDeptPersonCode != null">duty_dept_person_code =
+ #{dutyDeptPersonCode},
+ </if>
+ <if test="reportDeptPersonName != null">report_dept_person_name =
+ #{reportDeptPersonName},
+ </if>
+ <if test="reportDeptPersonCode != null">report_dept_person_code =
+ #{reportDeptPersonCode},
+ </if>
</trim>
where id = #{id}
</update>
--
Gitblit v1.9.3