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/ServiceTaskoperMapper.xml |   50 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 49 insertions(+), 1 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskoperMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskoperMapper.xml
index eff4e36..0fd21c8 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskoperMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskoperMapper.xml
@@ -21,6 +21,10 @@
         <result property="guid" column="guid"/>
         <result property="pguid" column="pguid"/>
         <result property="pid" column="pid"/>
+        <result property="deptCode" column="dept_code"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="wardCode" column="ward_code"/>
+        <result property="wardName" column="ward_name"/>
     </resultMap>
 
     <sql id="selectServiceTaskoperVo">
@@ -39,7 +43,11 @@
                orgid,
                guid,
                pguid,
-               pid
+               pid,
+               dept_code,
+               dept_name,
+               ward_code,
+               ward_name
         from service_taskoper
     </sql>
 
@@ -84,6 +92,18 @@
             <if test="pid != null ">
                 and pid = #{pid}
             </if>
+            <if test="deptCode != null  and deptCode != ''">
+                and dept_code = #{deptCode}
+            </if>
+            <if test="deptName != null  and deptName != ''">
+                and dept_name = #{deptName}
+            </if>
+            <if test="wardCode != null  and wardCode != ''">
+                and ward_code = #{wardCode}
+            </if>
+            <if test="wardName != null  and wardName != ''">
+                and ward_name = #{wardName}
+            </if>
     </select>
 
     <select id="selectServiceTaskoperById" parameterType="Long"
@@ -126,6 +146,14 @@
             </if>
             <if test="pid != null">pid,
             </if>
+            <if test="deptCode != null">dept_code,
+            </if>
+            <if test="deptName != null">dept_name,
+            </if>
+            <if test="wardCode != null">ward_code,
+            </if>
+            <if test="wardName != null">ward_name,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="taskId != null">#{taskId},
@@ -157,6 +185,14 @@
             <if test="pguid != null">#{pguid},
             </if>
             <if test="pid != null">#{pid},
+            </if>
+            <if test="deptCode != null">#{deptCode},
+            </if>
+            <if test="deptName != null">#{deptName},
+            </if>
+            <if test="wardCode != null">#{wardCode},
+            </if>
+            <if test="wardName != null">#{wardName},
             </if>
         </trim>
     </insert>
@@ -209,6 +245,18 @@
             <if test="pid != null">pid =
                 #{pid},
             </if>
+            <if test="deptCode != null">dept_code =
+                #{deptCode},
+            </if>
+            <if test="deptName != null">dept_name =
+                #{deptName},
+            </if>
+            <if test="wardCode != null">ward_code =
+                #{wardCode},
+            </if>
+            <if test="wardName != null">ward_name =
+                #{wardName},
+            </if>
         </trim>
         where id = #{id}
     </update>

--
Gitblit v1.9.3