From f243bb8af00a2464d16536d42150a4107f87b4ae Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期日, 12 五月 2024 21:32:57 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/resources/mapper/smartor/IvrTaskSingleMapper.xml | 75 +++++++++++++++++++++++--------------
1 files changed, 47 insertions(+), 28 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/IvrTaskSingleMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrTaskSingleMapper.xml
index d190734..e4e8855 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrTaskSingleMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrTaskSingleMapper.xml
@@ -24,13 +24,11 @@
<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"/>
@@ -51,7 +49,7 @@
<result property="guid" column="guid"/>
<result property="textParam" column="text_param"/>
<result property="serviceform" column="serviceform"/>
- <result property="badNo" column="bad_no"/>
+ <result property="bedNo" column="bed_no"/>
<result property="icdName" column="icd_name"/>
<result property="medicalRecordNo" column="medical_record_no"/>
<result property="preachcontent" column="preachcontent"/>
@@ -63,11 +61,15 @@
<result property="operatorNo" column="operator_no"/>
<result property="hospno" column="hospno"/>
<result property="hospType" column="hosp_type"/>
+ <result property="wechat" column="wechat"/>
+ <result property="diagname" column="diagname"/>
+ <result property="deptname" column="deptname"/>
+ <result property="admindate" column="admindate"/>
+ <result property="roomno" column="roomno"/>
</resultMap>
<sql id="selectIvrTaskcallVo">
select id,
- sendname,
hosp_type,
hospno,
phone,
@@ -87,13 +89,11 @@
sendlimitpend,
sendlimitnbegin,
sendlimitnend,
- sendstate,
senduuid,
result,
finishtime,
userid,
username,
- outbounduuid,
recordid,
recallcount,
exrecallcount,
@@ -114,7 +114,7 @@
guid,
text_param,
serviceform,
- bad_no,
+ bed_no,
icd_name,
send_type,
medical_record_no,
@@ -123,13 +123,20 @@
task_desc,
operator_no,
operator,
+ wechat,
+ sendname,
+ roomno,
+ admindate,
+ deptname,
+ diagname,
preachcontent
- from ivr_taskcall
+ from ivr_task_single
</sql>
<select id="selectIvrTaskcallList" parameterType="com.smartor.domain.IvrTaskSingle" resultMap="IvrTaskcallResult">
<include refid="selectIvrTaskcallVo"/>
<where>
+ del_flag=0
<if test="sendname != null and sendname != ''">and sendname like concat('%', #{sendname}, '%')</if>
<if test="phone != null and phone != ''">and phone = #{phone}</if>
<if test="sex != null and sex != ''">and sex = #{sex}</if>
@@ -150,13 +157,11 @@
<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>
@@ -172,7 +177,7 @@
<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="bedNo != null">and bed_no = #{bedNo}</if>
<if test="icdName != null and icdName != ''">and icd_name = #{icdName}</if>
<if test="medicalRecordNo != null and medicalRecordNo != ''">and medical_record_no = #{medicalRecordNo}
</if>
@@ -180,6 +185,8 @@
<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>
</where>
order by update_time desc,id desc
</select>
@@ -191,7 +198,7 @@
<insert id="insertIvrTaskcall" parameterType="com.smartor.domain.IvrTaskSingle" useGeneratedKeys="true"
keyProperty="id">
- insert into ivr_taskcall
+ insert into ivr_task_single
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="sendname != null">sendname,</if>
<if test="phone != null">phone,</if>
@@ -211,13 +218,11 @@
<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>
@@ -238,7 +243,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="bedNo != null">bed_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>
@@ -249,6 +254,11 @@
<if test="operatorNo != null and operatorNo != ''">operator_no,</if>
<if test="hospType != null and hospType != ''">hosp_type,</if>
<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="deptname != null and deptname != ''">deptname,</if>
+ <if test="diagname != null and diagname != ''">diagname,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="sendname != null">#{sendname},</if>
@@ -269,13 +279,11 @@
<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>
@@ -296,7 +304,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="bedNo != null">#{bedNo},</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>
@@ -307,11 +315,16 @@
<if test="operatorNo != null and operatorNo != ''">#{operatorNo},</if>
<if test="hospType != null and hospType != ''">#{hospType},</if>
<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="deptname != null and deptname != ''">#{deptname},</if>
+ <if test="diagname != null and diagname != ''">#{diagname},</if>
</trim>
</insert>
<update id="updateIvrTaskcall" parameterType="com.smartor.domain.IvrTaskSingle">
- update ivr_taskcall
+ update ivr_task_single
<trim prefix="SET" suffixOverrides=",">
<if test="sendname != null">sendname = #{sendname},</if>
<if test="phone != null">phone = #{phone},</if>
@@ -331,13 +344,11 @@
<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>
@@ -358,7 +369,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="bedNo != null">bed_no = #{bedNo},</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>
@@ -369,12 +380,17 @@
<if test="operator != null and operator != ''">operator = #{operator},</if>
<if test="hospType != null and hospType != ''">hosp_type = #{hospType},</if>
<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="deptname != null and deptname != ''">deptname = #{deptname},</if>
+ <if test="diagname != null and diagname != ''">diagname = #{diagname},</if>
</trim>
where id = #{id}
</update>
<update id="deleteIvrTaskcallById" parameterType="Long">
- update ivr_taskcall
+ update ivr_task_single
<trim prefix="SET" suffixOverrides=",">
del_flag =1
</trim>
@@ -402,13 +418,11 @@
sendlimitpend,
sendlimitnbegin,
sendlimitnend,
- sendstate,
senduuid,
result,
finishtime,
userid,
username,
- outbounduuid,
recordid,
recallcount,
exrecallcount,
@@ -429,7 +443,7 @@
guid,
text_param,
serviceform,
- bad_no,
+ bed_no,
icd_name,
send_type,
medical_record_no,
@@ -440,15 +454,20 @@
operator,
hospno,
hosp_type,
+ wechat,
+ roomno,
+ admindate,
+ deptname,
+ diagname,
send_time_slot
- FROM ivr_taskcall,
+ FROM ivr_task_single,
JSON_TABLE(send_time_slot, '$[*]' COLUMNS (
begantime DATETIME PATH '$.begantime',
endtime DATETIME PATH '$.endtime'
)) AS jt
WHERE jt.begantime > #{beganTime}
AND jt.begantime <= #{endTime}
- AND sendstate IS NULL
+ AND del_flag = 0
</select>
--
Gitblit v1.9.3