From f7586ca37724ffdb79412152cae833ff22ee513a Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 15 五月 2026 13:42:07 +0800
Subject: [PATCH] 【市一】取消Service_Task\Service_SubTask新增院区ID
---
smartor/src/main/resources/mapper/smartor/ServiceTaskdiagMapper.xml | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 103 insertions(+), 4 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskdiagMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskdiagMapper.xml
index 6892c29..5993b32 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskdiagMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskdiagMapper.xml
@@ -20,6 +20,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="selectServiceTaskdiagVo">
@@ -37,15 +41,19 @@
orgid,
guid,
pguid,
- pid
+ pid,
+ dept_code,
+ dept_name,
+ ward_code,
+ ward_name
from service_taskdiag
</sql>
<select id="selectServiceTaskdiagList" parameterType="com.smartor.domain.ServiceTaskdiag"
resultMap="ServiceTaskdiagResult">
<include refid="selectServiceTaskdiagVo"/>
- <where>
- del_flag=0
+ where 1=1
+ and del_flag = 0
<if test="taskId != null ">
and task_id = #{taskId}
</if>
@@ -79,7 +87,70 @@
<if test="pid != null ">
and pid = #{pid}
</if>
- </where>
+ <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="selectServiceTaskdiagListByIcdName" parameterType="com.smartor.domain.ServiceTaskdiag"
+ resultMap="ServiceTaskdiagResult">
+ <include refid="selectServiceTaskdiagVo"/>
+ where 1=1
+ and del_flag = 0
+ <if test="taskId != null ">
+ and task_id = #{taskId}
+ </if>
+ <if test="longtask != null ">
+ and longtask = #{longtask}
+ </if>
+ <if test="taskName != null and taskName != ''">
+ and task_name like concat('%', #{taskName}, '%')
+ </if>
+ <if test="serviceType != null and serviceType != ''">
+ and service_type = #{serviceType}
+ </if>
+ <if test="icd10id != null ">
+ and icd10id = #{icd10id}
+ </if>
+ <if test="icd10code != null and icd10code != ''">
+ and icd10code = #{icd10code}
+ </if>
+ <if test="icd10name != null and icd10name != ''">
+ and icd10name = #{icd10name}
+ </if>
+ <if test="orgid != null and orgid != ''">
+ and orgid = #{orgid}
+ </if>
+ <if test="guid != null and guid != ''">
+ and guid = #{guid}
+ </if>
+ <if test="pguid != null and pguid != ''">
+ and pguid = #{pguid}
+ </if>
+ <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="selectServiceTaskdiagById" parameterType="Long"
@@ -120,6 +191,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},
@@ -149,6 +228,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>
@@ -198,6 +285,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