From 500130efe30180fe635ba4482e097e848d37c7e3 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 28 五月 2024 09:42:39 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/IvrTaskSingleMapper.xml | 106 +++++++++++------------------------------------------
1 files changed, 22 insertions(+), 84 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/IvrTaskSingleMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrTaskSingleMapper.xml
index f680203..73272b7 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrTaskSingleMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrTaskSingleMapper.xml
@@ -24,19 +24,12 @@
<result property="sendlimitpend" column="sendlimitpend"/>
<result property="sendlimitnbegin" column="sendlimitnbegin"/>
<result property="sendlimitnend" column="sendlimitnend"/>
- <result property="sendstate" column="sendstate"/>
<result property="senduuid" column="senduuid"/>
<result property="result" column="result"/>
<result property="finishtime" column="finishtime"/>
- <result property="userid" column="userid"/>
- <result property="username" column="username"/>
- <result property="outbounduuid" column="outbounduuid"/>
<result property="recordid" column="recordid"/>
- <result property="recallcount" column="recallcount"/>
<result property="exrecallcount" column="exrecallcount"/>
<result property="pulltime" column="pulltime"/>
- <result property="bqsms" column="bqsms"/>
- <result property="bhsms" column="bhsms"/>
<result property="deptcode" column="deptcode"/>
<result property="labelstatus" column="labelstatus"/>
<result property="delFlag" column="del_flag"/>
@@ -51,12 +44,8 @@
<result property="guid" column="guid"/>
<result property="textParam" column="text_param"/>
<result property="serviceform" column="serviceform"/>
- <result property="badNo" column="bad_no"/>
- <result property="icdName" column="icd_name"/>
- <result property="medicalRecordNo" column="medical_record_no"/>
- <result property="preachcontent" column="preachcontent"/>
+ <result property="bedNo" column="bed_no"/>
<result property="sendType" column="send_type"/>
- <result property="sendTimeSlot" column="send_time_slot"/>
<result property="taskName" column="task_name"/>
<result property="taskDesc" column="task_desc"/>
<result property="operator" column="operator"/>
@@ -68,11 +57,15 @@
<result property="deptname" column="deptname"/>
<result property="admindate" column="admindate"/>
<result property="roomno" column="roomno"/>
+ <result property="libtemplatename" column="libtemplatename"/>
+ <result property="libtemplateid" column="libtemplateid"/>
</resultMap>
<sql id="selectIvrTaskcallVo">
select id,
hosp_type,
+ libtemplateid,
+ libtemplatename,
hospno,
phone,
sex,
@@ -91,19 +84,12 @@
sendlimitpend,
sendlimitnbegin,
sendlimitnend,
- sendstate,
senduuid,
result,
finishtime,
- userid,
- username,
- outbounduuid,
recordid,
- recallcount,
exrecallcount,
pulltime,
- bqsms,
- bhsms,
deptcode,
labelstatus,
del_flag,
@@ -118,11 +104,8 @@
guid,
text_param,
serviceform,
- bad_no,
- icd_name,
+ bed_no,
send_type,
- medical_record_no,
- send_time_slot,
task_name,
task_desc,
operator_no,
@@ -132,8 +115,7 @@
roomno,
admindate,
deptname,
- diagname,
- preachcontent
+ diagname
from ivr_task_single
</sql>
@@ -161,19 +143,12 @@
<if test="sendlimitpend != null and sendlimitpend != ''">and sendlimitpend = #{sendlimitpend}</if>
<if test="sendlimitnbegin != null and sendlimitnbegin != ''">and sendlimitnbegin = #{sendlimitnbegin}</if>
<if test="sendlimitnend != null and sendlimitnend != ''">and sendlimitnend = #{sendlimitnend}</if>
- <if test="sendstate != null ">and sendstate = #{sendstate}</if>
<if test="senduuid != null and senduuid != ''">and senduuid = #{senduuid}</if>
<if test="result != null and result != ''">and result = #{result}</if>
<if test="finishtime != null ">and finishtime = #{finishtime}</if>
- <if test="userid != null and userid != ''">and userid = #{userid}</if>
- <if test="username != null and username != ''">and username like concat('%', #{username}, '%')</if>
- <if test="outbounduuid != null and outbounduuid != ''">and outbounduuid = #{outbounduuid}</if>
<if test="recordid != null ">and recordid = #{recordid}</if>
- <if test="recallcount != null ">and recallcount = #{recallcount}</if>
<if test="exrecallcount != null ">and exrecallcount = #{exrecallcount}</if>
<if test="pulltime != null ">and pulltime = #{pulltime}</if>
- <if test="bqsms != null ">and bqsms = #{bqsms}</if>
- <if test="bhsms != null ">and bhsms = #{bhsms}</if>
<if test="deptcode != null and deptcode != ''">and deptcode = #{deptcode}</if>
<if test="labelstatus != null ">and labelstatus = #{labelstatus}</if>
<if test="isupload != null ">and isupload = #{isupload}</if>
@@ -183,16 +158,14 @@
<if test="serviceform != null ">and serviceform = #{serviceform}</if>
<if test="guid != null and guid != ''">and guid = #{guid}</if>
<if test="textParam != null and textParam != ''">and text_param = #{textParam}</if>
- <if test="badNo != null">and bad_no = #{badNo}</if>
- <if test="icdName != null and icdName != ''">and icd_name = #{icdName}</if>
- <if test="medicalRecordNo != null and medicalRecordNo != ''">and medical_record_no = #{medicalRecordNo}
- </if>
- <if test="preachcontent != null and preachcontent != ''">and preachcontent = #{preachcontent}</if>
+ <if test="bedNo != null">and bed_no = #{bedNo}</if>
<if test="sendType != null and sendType != ''">and send_type = #{sendType}</if>
<if test="operator != null and operator != ''">and operator = #{operator}</if>
<if test="operatorNo != null and operatorNo != ''">and operator_no = #{operatorNo}</if>
<if test="wechat != null and wechat != ''">and wechat = #{wechat}</if>
<if test="hospType != null and hospType != ''">and hosp_type = #{hospType}</if>
+ <if test="libtemplateid != null ">and libtemplateid = #{libtemplateid},</if>
+ <if test="libtemplatename != null ">and libtemplatename = #{libtemplatename},</if>
</where>
order by update_time desc,id desc
</select>
@@ -224,19 +197,12 @@
<if test="sendlimitpend != null">sendlimitpend,</if>
<if test="sendlimitnbegin != null">sendlimitnbegin,</if>
<if test="sendlimitnend != null">sendlimitnend,</if>
- <if test="sendstate != null">sendstate,</if>
<if test="senduuid != null">senduuid,</if>
<if test="result != null">result,</if>
<if test="finishtime != null">finishtime,</if>
- <if test="userid != null">userid,</if>
- <if test="username != null">username,</if>
- <if test="outbounduuid != null">outbounduuid,</if>
<if test="recordid != null">recordid,</if>
- <if test="recallcount != null">recallcount,</if>
<if test="exrecallcount != null">exrecallcount,</if>
<if test="pulltime != null">pulltime,</if>
- <if test="bqsms != null">bqsms,</if>
- <if test="bhsms != null">bhsms,</if>
<if test="deptcode != null">deptcode,</if>
<if test="labelstatus != null">labelstatus,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if>
@@ -251,10 +217,7 @@
<if test="guid != null">guid,</if>
<if test="textParam != null">text_param,</if>
<if test="serviceform != null">serviceform,</if>
- <if test="badNo != null">bad_no,</if>
- <if test="icdName != null and icdName != ''">icd_name,</if>
- <if test="medicalRecordNo != null and medicalRecordNo != ''">medical_record_no,</if>
- <if test="preachcontent != null and preachcontent != ''">preachcontent,</if>
+ <if test="bedNo != null">bed_no,</if>
<if test="sendType != null and sendType != ''">send_type,</if>
<if test="taskName != null and taskName != ''">task_name,</if>
<if test="taskDesc != null and taskDesc != ''">task_desc,</if>
@@ -267,6 +230,8 @@
<if test="admindate != null and admindate != ''">admindate,</if>
<if test="deptname != null and deptname != ''">deptname,</if>
<if test="diagname != null and diagname != ''">diagname,</if>
+ <if test="libtemplateid != null ">libtemplateid,</if>
+ <if test="libtemplatename != null ">libtemplatename,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="sendname != null">#{sendname},</if>
@@ -287,19 +252,12 @@
<if test="sendlimitpend != null">#{sendlimitpend},</if>
<if test="sendlimitnbegin != null">#{sendlimitnbegin},</if>
<if test="sendlimitnend != null">#{sendlimitnend},</if>
- <if test="sendstate != null">#{sendstate},</if>
<if test="senduuid != null">#{senduuid},</if>
<if test="result != null">#{result},</if>
<if test="finishtime != null">#{finishtime},</if>
- <if test="userid != null">#{userid},</if>
- <if test="username != null">#{username},</if>
- <if test="outbounduuid != null">#{outbounduuid},</if>
<if test="recordid != null">#{recordid},</if>
- <if test="recallcount != null">#{recallcount},</if>
<if test="exrecallcount != null">#{exrecallcount},</if>
<if test="pulltime != null">#{pulltime},</if>
- <if test="bqsms != null">#{bqsms},</if>
- <if test="bhsms != null">#{bhsms},</if>
<if test="deptcode != null">#{deptcode},</if>
<if test="labelstatus != null">#{labelstatus},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
@@ -314,10 +272,7 @@
<if test="guid != null">#{guid},</if>
<if test="textParam != null">#{textParam},</if>
<if test="serviceform != null">#{serviceform},</if>
- <if test="badNo != null">#{badNo},</if>
- <if test="icdName != null and icdName != ''">#{icdName},</if>
- <if test="medicalRecordNo != null and medicalRecordNo != ''">#{medicalRecordNo},</if>
- <if test="preachcontent != null and preachcontent != ''">#{preachcontent},</if>
+ <if test="bedNo != null">#{bedNo},</if>
<if test="sendType != null and sendType != ''">#{sendType},</if>
<if test="taskName != null and taskName != ''">#{taskName},</if>
<if test="taskDesc != null and taskDesc != ''">#{taskDesc},</if>
@@ -330,6 +285,9 @@
<if test="admindate != null and admindate != ''">#{admindate},</if>
<if test="deptname != null and deptname != ''">#{deptname},</if>
<if test="diagname != null and diagname != ''">#{diagname},</if>
+ <if test="libtemplateid != null ">#{libtemplateid},</if>
+ <if test="libtemplatename != null ">#{libtemplatename},</if>
+ <if test="stopState != null ">#{stopState},</if>
</trim>
</insert>
@@ -354,19 +312,12 @@
<if test="sendlimitpend != null">sendlimitpend = #{sendlimitpend},</if>
<if test="sendlimitnbegin != null">sendlimitnbegin = #{sendlimitnbegin},</if>
<if test="sendlimitnend != null">sendlimitnend = #{sendlimitnend},</if>
- <if test="sendstate != null">sendstate = #{sendstate},</if>
<if test="senduuid != null">senduuid = #{senduuid},</if>
<if test="result != null">result = #{result},</if>
<if test="finishtime != null">finishtime = #{finishtime},</if>
- <if test="userid != null">userid = #{userid},</if>
- <if test="username != null">username = #{username},</if>
- <if test="outbounduuid != null">outbounduuid = #{outbounduuid},</if>
<if test="recordid != null">recordid = #{recordid},</if>
- <if test="recallcount != null">recallcount = #{recallcount},</if>
<if test="exrecallcount != null">exrecallcount = #{exrecallcount},</if>
<if test="pulltime != null">pulltime = #{pulltime},</if>
- <if test="bqsms != null">bqsms = #{bqsms},</if>
- <if test="bhsms != null">bhsms = #{bhsms},</if>
<if test="deptcode != null">deptcode = #{deptcode},</if>
<if test="labelstatus != null">labelstatus = #{labelstatus},</if>
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
@@ -381,10 +332,7 @@
<if test="guid != null">guid = #{guid},</if>
<if test="textParam != null">text_param = #{textParam},</if>
<if test="serviceform != null">serviceform = #{serviceform},</if>
- <if test="badNo != null">bad_no = #{badNo},</if>
- <if test="icdName != null and icdName != ''">icd_name = #{icdName},</if>
- <if test="medicalRecordNo != null and medicalRecordNo != ''">medical_record_no = #{medicalRecordNo},</if>
- <if test="preachcontent != null and preachcontent != ''">preachcontent = #{preachcontent},</if>
+ <if test="bedNo != null">bed_no = #{bedNo},</if>
<if test="sendType != null and sendType != ''">send_type = #{sendType},</if>
<if test="taskName != null and taskName != ''">task_name = #{taskName},</if>
<if test="taskDesc != null and taskDesc != ''">task_desc = #{taskDesc},</if>
@@ -397,6 +345,8 @@
<if test="admindate != null and admindate != ''">admindate = #{admindate},</if>
<if test="deptname != null and deptname != ''">deptname = #{deptname},</if>
<if test="diagname != null and diagname != ''">diagname = #{diagname},</if>
+ <if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if>
+ <if test="libtemplatename != null ">libtemplatename = #{libtemplatename},</if>
</trim>
where id = #{id}
</update>
@@ -430,19 +380,12 @@
sendlimitpend,
sendlimitnbegin,
sendlimitnend,
- sendstate,
senduuid,
result,
finishtime,
- userid,
- username,
- outbounduuid,
recordid,
- recallcount,
exrecallcount,
pulltime,
- bqsms,
- bhsms,
deptcode,
labelstatus,
del_flag,
@@ -457,11 +400,8 @@
guid,
text_param,
serviceform,
- bad_no,
- icd_name,
+ bed_no,
send_type,
- medical_record_no,
- preachcontent,
task_name,
task_desc,
operator_no,
@@ -472,8 +412,7 @@
roomno,
admindate,
deptname,
- diagname,
- send_time_slot
+ diagname
FROM ivr_task_single,
JSON_TABLE(send_time_slot, '$[*]' COLUMNS (
begantime DATETIME PATH '$.begantime',
@@ -481,7 +420,6 @@
)) AS jt
WHERE jt.begantime > #{beganTime}
AND jt.begantime <= #{endTime}
- AND sendstate IS NULL
AND del_flag = 0
</select>
--
Gitblit v1.9.3