From e52b0e34fc06372aab64c30b526ec289b99c9af7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 19 六月 2024 10:43:47 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/resources/mapper/smartor/IvrTaskSingleMapper.xml |  260 ++++++++++++++++++++++++++--------------------------
 1 files changed, 130 insertions(+), 130 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/IvrTaskSingleMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrTaskSingleMapper.xml
index d190734..69ddcbb 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrTaskSingleMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrTaskSingleMapper.xml
@@ -18,25 +18,12 @@
         <result property="templateid" column="templateid"/>
         <result property="templatename" column="templatename"/>
         <result property="senddate" column="senddate"/>
-        <result property="sendlimitabegin" column="sendlimitabegin"/>
-        <result property="sendlimitaend" column="sendlimitaend"/>
-        <result property="sendlimitpbegin" column="sendlimitpbegin"/>
-        <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,28 +38,34 @@
         <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"/>
         <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"/>
+        <result property="patid" column="patid"/>
+        <result property="libtemplatename" column="libtemplatename"/>
+        <result property="libtemplateid" column="libtemplateid"/>
     </resultMap>
 
     <sql id="selectIvrTaskcallVo">
         select id,
-               sendname,
                hosp_type,
+               libtemplateid,
+               libtemplatename,
                hospno,
                phone,
                sex,
                age,
+               patid,
                sfzh,
                addr,
                senderdetail,
@@ -81,25 +74,12 @@
                templateid,
                templatename,
                senddate,
-               sendlimitabegin,
-               sendlimitaend,
-               sendlimitpbegin,
-               sendlimitpend,
-               sendlimitnbegin,
-               sendlimitnend,
-               sendstate,
                senduuid,
                result,
                finishtime,
-               userid,
-               username,
-               outbounduuid,
                recordid,
-               recallcount,
                exrecallcount,
                pulltime,
-               bqsms,
-               bhsms,
                deptcode,
                labelstatus,
                del_flag,
@@ -114,26 +94,31 @@
                guid,
                text_param,
                serviceform,
-               bad_no,
-               icd_name,
+               bed_no,
                send_type,
-               medical_record_no,
-               send_time_slot,
                task_name,
                task_desc,
                operator_no,
                operator,
-               preachcontent
-        from ivr_taskcall
+               wechat,
+               sendname,
+               roomno,
+               admindate,
+               deptname,
+               stop_state,
+               diagname
+        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>
             <if test="age != null ">and age = #{age}</if>
+            <if test="patid != null ">and patid = #{patid}</if>
             <if test="sfzh != null  and sfzh != ''">and sfzh = #{sfzh}</if>
             <if test="addr != null  and addr != ''">and addr = #{addr}</if>
             <if test="senderdetail != null  and senderdetail != ''">and senderdetail = #{senderdetail}</if>
@@ -144,25 +129,12 @@
                 '%')
             </if>
             <if test="senddate != null ">and senddate = #{senddate}</if>
-            <if test="sendlimitabegin != null  and sendlimitabegin != ''">and sendlimitabegin = #{sendlimitabegin}</if>
-            <if test="sendlimitaend != null  and sendlimitaend != ''">and sendlimitaend = #{sendlimitaend}</if>
-            <if test="sendlimitpbegin != null  and sendlimitpbegin != ''">and sendlimitpbegin = #{sendlimitpbegin}</if>
-            <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>
@@ -172,14 +144,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>
@@ -191,7 +163,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>
@@ -205,25 +177,12 @@
             <if test="templateid != null">templateid,</if>
             <if test="templatename != null">templatename,</if>
             <if test="senddate != null">senddate,</if>
-            <if test="sendlimitabegin != null">sendlimitabegin,</if>
-            <if test="sendlimitaend != null">sendlimitaend,</if>
-            <if test="sendlimitpbegin != null">sendlimitpbegin,</if>
-            <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>
@@ -238,10 +197,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>
@@ -249,6 +205,14 @@
             <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>
+            <if test="libtemplateid != null ">libtemplateid,</if>
+            <if test="libtemplatename != null ">libtemplatename,</if>
+            <if test="patid != null ">patid,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="sendname != null">#{sendname},</if>
@@ -263,25 +227,12 @@
             <if test="templateid != null">#{templateid},</if>
             <if test="templatename != null">#{templatename},</if>
             <if test="senddate != null">#{senddate},</if>
-            <if test="sendlimitabegin != null">#{sendlimitabegin},</if>
-            <if test="sendlimitaend != null">#{sendlimitaend},</if>
-            <if test="sendlimitpbegin != null">#{sendlimitpbegin},</if>
-            <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>
@@ -296,10 +247,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>
@@ -307,11 +255,19 @@
             <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>
+            <if test="libtemplateid != null ">#{libtemplateid},</if>
+            <if test="libtemplatename != null ">#{libtemplatename},</if>
+            <if test="patid != null ">#{patid},</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>
@@ -325,25 +281,12 @@
             <if test="templateid != null">templateid = #{templateid},</if>
             <if test="templatename != null">templatename = #{templatename},</if>
             <if test="senddate != null">senddate = #{senddate},</if>
-            <if test="sendlimitabegin != null">sendlimitabegin = #{sendlimitabegin},</if>
-            <if test="sendlimitaend != null">sendlimitaend = #{sendlimitaend},</if>
-            <if test="sendlimitpbegin != null">sendlimitpbegin = #{sendlimitpbegin},</if>
-            <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>
@@ -358,10 +301,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>
@@ -369,16 +309,87 @@
             <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>
+            <if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if>
+            <if test="libtemplatename != null ">libtemplatename = #{libtemplatename},</if>
+            <if test="patid != null ">patid = #{patid},</if>
         </trim>
         where id = #{id}
     </update>
 
+    <update id="updateIvrTaskcallByCondition" parameterType="com.smartor.domain.IvrTaskSingle">
+        update ivr_task_single
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="sendname != null">sendname = #{sendname},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="sex != null">sex = #{sex},</if>
+            <if test="age != null">age = #{age},</if>
+            <if test="sfzh != null">sfzh = #{sfzh},</if>
+            <if test="addr != null">addr = #{addr},</if>
+            <if test="senderdetail != null">senderdetail = #{senderdetail},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="taskid != null">taskid = #{taskid},</if>
+            <if test="templateid != null">templateid = #{templateid},</if>
+            <if test="templatename != null">templatename = #{templatename},</if>
+            <if test="senddate != null">senddate = #{senddate},</if>
+            <if test="senduuid != null">senduuid = #{senduuid},</if>
+            <if test="result != null">result = #{result},</if>
+            <if test="finishtime != null">finishtime = #{finishtime},</if>
+            <if test="recordid != null">recordid = #{recordid},</if>
+            <if test="exrecallcount != null">exrecallcount = #{exrecallcount},</if>
+            <if test="pulltime != null">pulltime = #{pulltime},</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>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="isupload != null">isupload = #{isupload},</if>
+            <if test="uploadTime != null">upload_time = #{uploadTime},</if>
+            <if test="orgid != null">orgid = #{orgid},</if>
+            <if test="pid != null">pid = #{pid},</if>
+            <if test="guid != null">guid = #{guid},</if>
+            <if test="textParam != null">text_param = #{textParam},</if>
+            <if test="serviceform != null">serviceform = #{serviceform},</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>
+            <if test="operatorNo != null  and operatorNo != ''">operator_no = #{operatorNo},</if>
+            <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>
+            <if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if>
+            <if test="libtemplatename != null ">libtemplatename = #{libtemplatename},</if>
+            <if test="patid != null ">patid = #{patid},</if>
+        </trim>
+        where patid = #{patid} and taskid = #{taskid}
+    </update>
+
     <update id="deleteIvrTaskcallById" parameterType="Long">
-        update ivr_taskcall
+        update ivr_task_single
         <trim prefix="SET" suffixOverrides=",">
             del_flag =1
         </trim>
         where id = #{id}
+    </update>
+
+    <update id="deleteIvrTaskcallByCondition" >
+        update ivr_task_single
+        <trim prefix="SET" suffixOverrides=",">
+            del_flag =1
+        </trim>
+        where patid = #{patid} and taskid = #{taskid}
     </update>
 
     <select id="getDataByTime" resultMap="IvrTaskcallResult">
@@ -396,25 +407,12 @@
                templateid,
                templatename,
                senddate,
-               sendlimitabegin,
-               sendlimitaend,
-               sendlimitpbegin,
-               sendlimitpend,
-               sendlimitnbegin,
-               sendlimitnend,
-               sendstate,
                senduuid,
                result,
                finishtime,
-               userid,
-               username,
-               outbounduuid,
                recordid,
-               recallcount,
                exrecallcount,
                pulltime,
-               bqsms,
-               bhsms,
                deptcode,
                labelstatus,
                del_flag,
@@ -429,26 +427,28 @@
                guid,
                text_param,
                serviceform,
-               bad_no,
-               icd_name,
+               bed_no,
                send_type,
-               medical_record_no,
-               preachcontent,
                task_name,
                task_desc,
                operator_no,
                operator,
                hospno,
                hosp_type,
-               send_time_slot
-        FROM ivr_taskcall,
+               wechat,
+               roomno,
+               admindate,
+               patid,
+               deptname,
+               diagname
+        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 &lt;= #{endTime}
-          AND sendstate IS NULL
+          AND del_flag = 0
     </select>
 
 

--
Gitblit v1.9.3