From 88c5064877fa22316d794c225fff3ceced4371f3 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 03 三月 2025 20:03:43 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 79 +++++++++++++++++++++++++++------------
1 files changed, 55 insertions(+), 24 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 52ebd7f..9c71231 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -50,7 +50,8 @@
<result property="hospno" column="hospno"/>
<result property="hospType" column="hosp_type"/>
<result property="wechat" column="wechat"/>
- <result property="diagname" column="diagname"/>
+ <result property="leaveicd10code" column="leaveicd10code"/>
+ <result property="leavediagname" column="leavediagname"/>
<result property="deptname" column="deptname"/>
<result property="admindate" column="admindate"/>
<result property="roomno" column="roomno"/>
@@ -153,7 +154,8 @@
stop_state,
leavehospitaldistrictcode,
leavehospitaldistrictname,
- diagname
+ leavediagname,
+ leaveicd10code
from service_subtask
</sql>
@@ -196,19 +198,39 @@
<if test="longSendTime != null">
AND date_format(long_send_time,'%y%m%d') <= date_format(#{longSendTime},'%y%m%d')
</if>
- <if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
- AND leavehospitaldistrictcode IN
- <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
- close=")">
- #{leavehospitaldistrictcode}
- </foreach>
+ <if test="deptOrDistrict==1">
+ <if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
+ AND leavehospitaldistrictcode IN
+ <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="("
+ separator=","
+ close=")">
+ #{leavehospitaldistrictcode}
+ </foreach>
+ </if>
+ <if test=" leaveldeptcodes != null and leaveldeptcodes.size()>0">
+ AND deptcode IN
+ <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
+ close=")">
+ #{leaveldeptcode}
+ </foreach>
+ </if>
</if>
- <if test=" leaveldeptcodes != null and leaveldeptcodes.size()>0">
- AND deptcode IN
- <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
- close=")">
- #{leaveldeptcode}
- </foreach>
+ <if test="deptOrDistrict==2">
+ <if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
+ AND leavehospitaldistrictcode IN
+ <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="("
+ separator=","
+ close=")">
+ #{leavehospitaldistrictcode}
+ </foreach>
+ </if>
+ <if test=" leaveldeptcodes != null and leaveldeptcodes.size()>0">
+ OR deptcode IN
+ <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
+ close=")">
+ #{leaveldeptcode}
+ </foreach>
+ </if>
</if>
<if test="senddate != null ">and senddate = #{senddate}</if>
@@ -312,7 +334,8 @@
<if test="roomno != null and roomno != ''">roomno,</if>
<if test="admindate != null">admindate,</if>
<if test="deptname != null and deptname != ''">deptname,</if>
- <if test="diagname != null and diagname != ''">diagname,</if>
+ <if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code,</if>
+ <if test="leavediagname != null and leavediagname != ''">leavediagname,</if>
<if test="libtemplateid != null ">libtemplateid,</if>
<if test="libtemplatename != null ">libtemplatename,</if>
<if test="patid != null ">patid,</if>
@@ -385,7 +408,8 @@
<if test="roomno != null and roomno != ''">#{roomno},</if>
<if test="admindate != null ">#{admindate},</if>
<if test="deptname != null and deptname != ''">#{deptname},</if>
- <if test="diagname != null and diagname != ''">#{diagname},</if>
+ <if test="leaveicd10code != null and leaveicd10code != ''">#{leaveicd10code},</if>
+ <if test="leavediagname != null and leavediagname != ''">#{leavediagname},</if>
<if test="libtemplateid != null ">#{libtemplateid},</if>
<if test="libtemplatename != null ">#{libtemplatename},</if>
<if test="patid != null ">#{patid},</if>
@@ -462,7 +486,8 @@
<if test="roomno != null and roomno != ''">roomno = #{roomno},</if>
<if test="admindate != null ">admindate = #{admindate},</if>
<if test="deptname != null and deptname != ''">deptname = #{deptname},</if>
- <if test="diagname != null and diagname != ''">diagname = #{diagname},</if>
+ <if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if>
+ <if test="leavediagname != null and leavediagname != ''">leavediagname = #{leavediagname},</if>
<if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if>
<if test="libtemplatename != null ">libtemplatename = #{libtemplatename},</if>
<if test="patid != null ">patid = #{patid},</if>
@@ -540,7 +565,8 @@
<if test="roomno != null and roomno != ''">roomno = #{roomno},</if>
<if test="admindate != null">admindate = #{admindate},</if>
<if test="deptname != null and deptname != ''">deptname = #{deptname},</if>
- <if test="diagname != null and diagname != ''">diagname = #{diagname},</if>
+ <if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if>
+ <if test="leavediagname != null and leavediagname != ''">leavediagname = #{leavediagname},</if>
<if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if>
<if test="libtemplatename != null ">libtemplatename = #{libtemplatename},</if>
<if test="patid != null ">patid = #{patid},</if>
@@ -569,7 +595,10 @@
<if test="patfrom != null ">patfrom=#{patfrom},</if>
<if test="taskGuid != null ">taskGuid=#{taskGuid},</if>
</trim>
- where patid = #{patid} and taskid = #{taskid}
+ <where>
+ <if test="patid != null ">and patid = #{patid}</if>
+ <if test="taskid != null ">and taskid = #{taskid}</if>
+ </where>
</update>
<update id="updateServiceSubtaskByCondition" parameterType="com.smartor.domain.ServiceSubtask">
@@ -619,7 +648,8 @@
<if test="roomno != null and roomno != ''">roomno = #{roomno},</if>
<if test="admindate != null">admindate = #{admindate},</if>
<if test="deptname != null and deptname != ''">deptname = #{deptname},</if>
- <if test="diagname != null and diagname != ''">diagname = #{diagname},</if>
+ <if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if>
+ <if test="leavediagname != null and leavediagname != ''">leavediagname = #{leavediagname},</if>
<if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if>
<if test="libtemplatename != null ">libtemplatename = #{libtemplatename},</if>
<if test="patid != null ">patid = #{patid},</if>
@@ -697,7 +727,8 @@
<if test="roomno != null and roomno != ''">roomno = #{roomno},</if>
<if test="admindate != null ">admindate = #{admindate},</if>
<if test="deptname != null and deptname != ''">deptname = #{deptname},</if>
- <if test="diagname != null and diagname != ''">diagname = #{diagname},</if>
+ <if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if>
+ <if test="leavediagname != null and leavediagname != ''">leavediagname = #{leavediagname},</if>
<if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if>
<if test="libtemplatename != null ">libtemplatename = #{libtemplatename},</if>
<if test="patid != null ">patid = #{patid},</if>
@@ -725,9 +756,8 @@
<if test="patfrom != null ">patfrom=#{patfrom},</if>
<if test="taskGuid != null ">task_guid=#{taskGuid},</if>
</trim>
- where task_guid = #{taskGuid}
+ where task_guid = #{taskGuid} and task_name = #{taskName}
</update>
-
<update id="deleteServiceSubtaskById" parameterType="Long">
@@ -838,7 +868,8 @@
inhospid,
patfrom,
task_guid,
- diagname
+ leavediagname,
+ leaveicd10code
FROM service_subtask,
JSON_TABLE(send_time_slot, '$[*]' COLUMNS (
begantime DATETIME PATH '$.begantime',
--
Gitblit v1.9.3