From c6461ee45e27ad7f6f1a89d5aab103fbab6e79d3 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 11 四月 2025 17:58:17 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 151 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 114 insertions(+), 37 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 4d04ed1..e518734 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"/>
@@ -74,6 +75,7 @@
<result property="sendstate" column="sendstate"/>
<result property="inhospid" column="inhospid"/>
<result property="patfrom" column="patfrom"/>
+ <result property="patguid" column="patguid"/>
</resultMap>
<resultMap type="com.smartor.domain.ServiceSubtaskCount" id="ServiceSubtaskResult2">
@@ -89,6 +91,7 @@
task_guid,
patfrom,
inhospid,
+ patguid,
suggest,
sendstate,
endtime,
@@ -153,7 +156,8 @@
stop_state,
leavehospitaldistrictcode,
leavehospitaldistrictname,
- diagname
+ leavediagname,
+ leaveicd10code
from service_subtask
</sql>
@@ -172,6 +176,7 @@
</if>
<if test="sex != null and sex != ''">and sex = #{sex}</if>
<if test="age != null ">and age = #{age}</if>
+ <if test="patguid != null ">and patguid = #{patguid}</if>
<if test="subId != null ">and id = #{subId}</if>
<if test="inhospid != null ">and inhospid = #{inhospid}</if>
<if test="submit != null ">and submit = #{submit}</if>
@@ -193,22 +198,49 @@
<if test="endOutHospTime != null">
AND date_format(endtime,'%y%m%d') <= date_format(#{endOutHospTime},'%y%m%d')
</if>
+ <if test="startSendDateTime != null">
+ AND date_format(long_send_time,'%y%m%d') >= date_format(#{startSendDateTime},'%y%m%d')
+ </if>
+ <if test="endSendDateTime != null">
+ AND date_format(long_send_time,'%y%m%d') <= date_format(#{endSendDateTime},'%y%m%d')
+ </if>
+
<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>
@@ -240,11 +272,12 @@
<if test="longSendTime != null ">and long_send_time = #{longSendTime}</if>
<if test="sendstate != null ">and sendstate = #{sendstate}</if>
<if test="drname != null and drname != ''">and drname like concat('%', #{drname}, '%')</if>
- <if test="drcode != null ">and drcode = #{drcode}</if>
+ <if test="taskName != null and taskName != ''">and task_name like concat('%', #{taskName}, '%')</if>
+ <if test="drcode != null and drcode != ''">and (drcode = #{drcode}</if>
+ <if test="nurseId != null and nurseId != ''">or nurse_id = #{nurseId})</if>
<if test="starttime != null ">and starttime = #{starttime}</if>
<if test="endtime != null ">and endtime = #{endtime}</if>
<if test="excep != null ">and excep = #{excep}</if>
- <if test="nurseId != null ">and nurse_id = #{nurseId}</if>
<if test="nurseName != null ">and nurse_name = #{nurseName}</if>
<if test="score != null">and score = #{score}</if>
<if test="remark != null">and remark = #{remark}</if>
@@ -252,12 +285,38 @@
<if test="createBy != null">and create_by = #{createBy}</if>
<if test="taskGuid != null">and task_guid = #{taskGuid}</if>
</where>
- <if test="serviceType != null and serviceType != ''and serviceType != '2'and serviceType != '3'">order by
- long_send_time desc
- </if>
- <if test="serviceType != null and serviceType != ''and serviceType == '2'">order by endtime desc</if>
- <if test="serviceType != null and serviceType != ''and serviceType == '3'">order by admindate desc</if>
+ <if test="sort != null and sort==0">order by endtime asc</if>
+ <if test="sort != null and sort==1">order by endtime desc</if>
+ <if test="sort != null and sort==2">order by long_send_time asc</if>
+ <if test="sort != null and sort==3">order by long_send_time desc</if>
+ <if test="sort != null and sort==5">order by admindate asc</if>
+ <if test="sort != null and sort==6">order by admindate desc</if>
+
<!-- order by update_time desc,id desc -->
+ </select>
+
+ <select id="selectServiceSubtaskListByCreateTime" parameterType="com.smartor.domain.ServiceSubtaskVO"
+ resultMap="ServiceSubtaskResult">
+ <include refid="selectServiceSubtaskVo"/>
+ <where>
+ del_flag=0
+ <if test="createStartTime != null and createEndTime != null">and create_time BETWEEN #{createStartTime} AND
+ #{createEndTime}
+ </if>
+ <if test="createBy != null ">and create_by = #{createBy}</if>
+ <if test="sendname != null ">and sendname = #{sendname}</if>
+ <if test="sfzh != null ">and sfzh = #{sfzh}</if>
+ <if test="patguid != null ">and patguid = #{patguid}</if>
+ </where>
+
+ </select>
+
+ <select id="selectSendstateByCondition" parameterType="com.smartor.domain.ServiceSubtask" resultType="Integer">
+ SELECT b.sendstate
+ from service_task a
+ JOIN service_subtask b on a.taskid = b.taskid and a.pat_cycle = 0 and b.del_flag = 0
+ where b.taskid = #{taskid}
+ and b.patid = #{patid}
</select>
<select id="selectServiceSubtaskById" parameterType="Long" resultMap="ServiceSubtaskResult">
@@ -310,9 +369,10 @@
<if test="hospno != null and hospno != ''">hospno,</if>
<if test="wechat != null and wechat != ''">wechat,</if>
<if test="roomno != null and roomno != ''">roomno,</if>
- <if test="admindate != null and admindate != ''">admindate,</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>
@@ -340,6 +400,7 @@
<if test="inhospid != null ">inhospid,</if>
<if test="patfrom != null ">patfrom,</if>
<if test="taskGuid != null ">task_guid,</if>
+ <if test="patguid != null ">patguid,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="sendname != null">#{sendname},</if>
@@ -383,9 +444,10 @@
<if test="hospno != null and hospno != ''">#{hospno},</if>
<if test="wechat != null and wechat != ''">#{wechat},</if>
<if test="roomno != null and roomno != ''">#{roomno},</if>
- <if test="admindate != null and admindate != ''">#{admindate},</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>
@@ -413,6 +475,7 @@
<if test="inhospid != null ">#{inhospid},</if>
<if test="patfrom != null ">#{patfrom},</if>
<if test="taskGuid != null ">#{taskGuid},</if>
+ <if test="patguid != null ">#{patguid},</if>
</trim>
</insert>
@@ -422,6 +485,7 @@
<if test="sendname != null">sendname = #{sendname},</if>
<if test="phone != null">phone = #{phone},</if>
<if test="sex != null">sex = #{sex},</if>
+ <if test="delFlag != null">del_flag = #{delFlag},</if>
<if test="age != null">age = #{age},</if>
<if test="sfzh != null">sfzh = #{sfzh},</if>
<if test="addr != null">addr = #{addr},</if>
@@ -460,9 +524,10 @@
<if test="hospno != null and hospno != ''">hospno = #{hospno},</if>
<if test="wechat != null and wechat != ''">wechat = #{wechat},</if>
<if test="roomno != null and roomno != ''">roomno = #{roomno},</if>
- <if test="admindate != null and admindate != ''">admindate = #{admindate},</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>
@@ -490,6 +555,7 @@
<if test="inhospid != null ">inhospid=#{inhospid},</if>
<if test="patfrom != null ">patfrom=#{patfrom},</if>
<if test="taskGuid != null ">task_guid=#{taskGuid},</if>
+ <if test="patguid != null ">patguid=#{patguid},</if>
</trim>
where id = #{id}
</update>
@@ -500,6 +566,7 @@
<if test="sendname != null">sendname = #{sendname},</if>
<if test="phone != null">phone = #{phone},</if>
<if test="sex != null">sex = #{sex},</if>
+ <if test="delFlag != null">del_flag = #{delFlag},</if>
<if test="age != null">age = #{age},</if>
<if test="sfzh != null">sfzh = #{sfzh},</if>
<if test="addr != null">addr = #{addr},</if>
@@ -538,9 +605,10 @@
<if test="hospno != null and hospno != ''">hospno = #{hospno},</if>
<if test="wechat != null and wechat != ''">wechat = #{wechat},</if>
<if test="roomno != null and roomno != ''">roomno = #{roomno},</if>
- <if test="admindate != null and admindate != ''">admindate = #{admindate},</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>
@@ -568,8 +636,12 @@
<if test="inhospid != null ">inhospid=#{inhospid},</if>
<if test="patfrom != null ">patfrom=#{patfrom},</if>
<if test="taskGuid != null ">taskGuid=#{taskGuid},</if>
+ <if test="patguid != null ">patguid=#{patguid},</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">
@@ -617,9 +689,10 @@
<if test="hospno != null and hospno != ''">hospno = #{hospno},</if>
<if test="wechat != null and wechat != ''">wechat = #{wechat},</if>
<if test="roomno != null and roomno != ''">roomno = #{roomno},</if>
- <if test="admindate != null and admindate != ''">admindate = #{admindate},</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>
@@ -646,6 +719,7 @@
<if test="inhospid != null ">inhospid=#{inhospid},</if>
<if test="patfrom != null ">patfrom=#{patfrom},</if>
<if test="taskGuid != null ">task_guid=#{taskGuid},</if>
+ <if test="patguid != null ">patguid=#{patguid},</if>
</trim>
where patid = #{patid} and taskid = #{taskid}
</update>
@@ -695,9 +769,10 @@
<if test="hospno != null and hospno != ''">hospno = #{hospno},</if>
<if test="wechat != null and wechat != ''">wechat = #{wechat},</if>
<if test="roomno != null and roomno != ''">roomno = #{roomno},</if>
- <if test="admindate != null and admindate != ''">admindate = #{admindate},</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>
@@ -724,10 +799,10 @@
<if test="inhospid != null ">inhospid=#{inhospid},</if>
<if test="patfrom != null ">patfrom=#{patfrom},</if>
<if test="taskGuid != null ">task_guid=#{taskGuid},</if>
+ <if test="patguid != null ">patguid=#{patguid},</if>
</trim>
- where task_guid = #{taskGuid}
+ where task_guid = #{taskGuid} and task_name = #{taskName}
</update>
-
<update id="deleteServiceSubtaskById" parameterType="Long">
@@ -838,7 +913,9 @@
inhospid,
patfrom,
task_guid,
- diagname
+ leavediagname,
+ patguid,
+ leaveicd10code
FROM service_subtask,
JSON_TABLE(send_time_slot, '$[*]' COLUMNS (
begantime DATETIME PATH '$.begantime',
--
Gitblit v1.9.3