From da026a34bcc97b2eb49607a3b02d94d8f683f997 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 07 一月 2026 16:18:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 667 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 555 insertions(+), 112 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index cd63052..64351d6 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -85,6 +85,8 @@
<result property="managementDoctor" column="management_doctor"/>
<result property="managementDoctorCode" column="management_doctor_code"/>
<result property="currentPreachform" column="current_preachform"/>
+ <result property="taskSituation" column="task_situation"/>
+ <result property="isabnormal" column="isabnormal"/>
</resultMap>
<resultMap type="com.smartor.domain.ServiceSubtaskCount" id="ServiceSubtaskResult2">
@@ -98,6 +100,21 @@
</resultMap>
+ <resultMap type="com.smartor.domain.ServiceSubtaskScriptCount" id="ServiceSubtaskScriptCountResult">
+ <result property="scriptid" column="scriptid"/>
+ <result property="templateid" column="templateid"/>
+ <result property="scriptType" column="script_type"/>
+ <result property="scriptContent" column="script_content"/>
+ <result property="subtaskType" column="subtask_type"/>
+ <result property="completedQuantity" column="completed_quantity"/>
+ <result property="allQuantity" column="all_quantity"/>
+ <result property="completedPercentage" column="completed_percentage"/>
+ <result property="optionText" column="option_text"/>
+ <result property="chosenQuantity" column="chosen_quantity"/>
+ <result property="chosenPercentage" column="chosen_percentage"/>
+ <result property="options" column="options"/>
+ </resultMap>
+
<sql id="selectServiceSubtaskVo">
select id,
hosp_type,
@@ -107,6 +124,7 @@
management_doctor_code,
current_preachform,
upid,
+ isabnormal,
visit_dept_name,
visit_dept_code,
visit_time,
@@ -183,36 +201,44 @@
orgid,
visit_type,
management_doctor,
- management_doctor_code
+ management_doctor_code,
+ task_situation
from service_subtask
</sql>
<select id="selectServiceSubtaskBySendstate" parameterType="com.smartor.domain.ServiceSubtaskVO"
resultMap="ServiceSubtaskResult">
-
<include refid="selectServiceSubtaskVo"/>
- <where>
- del_flag=0
- and taskid = #{taskid}
+ where 1=1
+ and del_flag = 0
+ <if test="orgid != null and orgid != ''">
+ and orgid = #{orgid}
+ </if>
+ <if test="taskid != null ">and taskid = #{taskid}</if>
+ <if test="serviceType != null ">and service_type = #{serviceType}</if>
+ <if test="patid != null ">and patid = #{patid}</if>
+ <if test="sendstates!=null">
AND sendstate IN
<foreach collection="sendstates" item="sendstate" open="(" separator=","
close=")">
#{sendstate}
</foreach>
- </where>
+ </if>
</select>
<select id="queryServiceSubtaskList" parameterType="com.smartor.domain.ServiceSubtaskVO"
resultMap="ServiceSubtaskResult">
<include refid="selectServiceSubtaskVo"/>
- <where>
- del_flag=0
+ where 1=1
+ and del_flag = 0
+ <if test="orgid != null and orgid != ''">
+ and orgid = #{orgid}
+ </if>
<if test="taskid != null ">and taskid = #{taskid}</if>
<if test="visitTime != null">
AND date_format(visit_time,'%y%m%d') <= date_format(#{visitTime},'%y%m%d')
</if>
<if test="sendstate != null ">and sendstate = #{sendstate}</if>
- </where>
</select>
@@ -220,8 +246,8 @@
<select id="selectServiceSubtaskList" parameterType="com.smartor.domain.ServiceSubtaskVO"
resultMap="ServiceSubtaskResult">
<include refid="selectServiceSubtaskVo"/>
- <where>
- del_flag=0
+ where 1=1
+ and 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="leavehospitaldistrictcode != null and leavehospitaldistrictcode != ''">and
@@ -359,7 +385,9 @@
<if test="suggest != null">and suggest = #{suggest}</if>
<if test="createBy != null">and create_by = #{createBy}</if>
<if test="taskGuid != null">and task_guid = #{taskGuid}</if>
+ <if test="isabnormal != null">and isabnormal = #{isabnormal}</if>
<if test="isVisitAgain != null">and is_visit_again = #{isVisitAgain}</if>
+ <!-- <if test="dateLimit != null and dateLimit = '1'"> and CURDATE() + 1 > long_send_time</if>-->
<!-- <if test="visitTime != null">and visit_time = #{visitTime}</if> -->
<!--<if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
<if test="visitDeptName != null">and visit_dept_name = #{visitDeptName}</if>-->
@@ -371,7 +399,6 @@
#{visitDeptCodes}
</foreach>
</if>
- </where>
<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>
@@ -383,12 +410,28 @@
<!-- order by update_time desc,id desc -->
</select>
+ <select id="getCompensateServiceSubtaskList" parameterType="com.smartor.domain.ServiceSubtaskVO"
+ resultMap="ServiceSubtaskResult">
+ <include refid="selectServiceSubtaskVo"/>
+ where 1=1
+ and del_flag = 0
+ <if test="orgid != null and orgid != ''">
+ and orgid = #{orgid}
+ </if>
+ <if test="visitTime != null">
+ AND date_format(visit_time,'%y%m%d') <= date_format(#{visitTime},'%y%m%d')
+ </if>
+ <if test="sendstate != null ">and sendstate = #{sendstate}</if>
+ </select>
<select id="selectServiceSubtaskListByCreateTime" parameterType="com.smartor.domain.ServiceSubtaskVO"
resultMap="ServiceSubtaskResult">
<include refid="selectServiceSubtaskVo"/>
- <where>
- del_flag=0
+ where 1=1
+ and del_flag = 0
+ <if test="orgid != null and orgid != ''">
+ and orgid = #{orgid}
+ </if>
<if test="createStartTime != null and createEndTime != null">and create_time BETWEEN #{createStartTime} AND
#{createEndTime}
</if>
@@ -404,7 +447,7 @@
<if test="managementDoctorCode != null">and management_doctor_code = #{managementDoctorCode}</if>
<if test="managementDoctor != null">and management_doctor = #{managementDoctor}</if>
<if test="currentPreachform != null">and current_preachform = #{currentPreachform}</if>
- </where>
+ <if test="isabnormal != null">and isabnormal = #{isabnormal}</if>
</select>
@@ -412,8 +455,8 @@
<select id="selectServiceSubtaskListAgain" parameterType="com.smartor.domain.ServiceSubtaskVO"
resultMap="ServiceSubtaskResult">
<include refid="selectServiceSubtaskVo"/>
- <where>
- del_flag=0
+ where 1=1
+ and del_flag = 0
and upid is not null
and visit_count > 1
<if test="createStartTime != null and createEndTime != null">and create_time BETWEEN #{createStartTime} AND
@@ -460,17 +503,25 @@
<if test="visitDeptName != null">and visit_dept_name = #{visitDeptName}</if>
<if test="currentPreachform != null">and current_preachform = #{currentPreachform}</if>
<if test="managementDoctorCode != null">and management_doctor_code = #{managementDoctorCode}</if>
+ <if test="isabnormal != null">and isabnormal = #{isabnormal}</if>
<if test="managementDoctor != null">and management_doctor like concat('%',#{managementDoctor}, '%')</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}
+ JOIN service_subtask b on a.taskid = b.taskid and a.pat_cycle = 0 and b.del_flag = 0
+ where 1=1
+ and b.taskid = #{taskid}
+ and b.patid = #{patid}
+ <if test="createTime != null and createTime != ''">
+ DATE_FORMAT(b.create_time, '%Y-%m-%d') LIKE CONCAT(#{createTimeNew}, '%')
+ </if>
+ <if test="sendstate != null ">and b.sendstate = #{sendstate}</if>
+ <if test="orgid != null and orgid != ''">
+ and b.orgid = #{orgid}
+ </if>
</select>
<select id="selectTimelyRate" parameterType="com.smartor.domain.ServiceSubtask" resultType="double">
@@ -490,6 +541,7 @@
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
<if test="deptcode != null and deptcode != ''">and deptcode = #{deptcode}</if>
<if test="deptname != null and deptname != ''">and deptname = #{deptname}</if>
+ <if test="isabnormal != null">and isabnormal = #{isabnormal}</if>
<if test="leavehospitaldistrictcode != null and leavehospitaldistrictcode != ''">and
leavehospitaldistrictcode = #{leavehospitaldistrictcode}
</if>
@@ -504,8 +556,8 @@
<select id="selectTimelyRateDetail" parameterType="com.smartor.domain.ServiceSubtask"
resultMap="ServiceSubtaskResult">
<include refid="selectServiceSubtaskVo"/>
- <where>
- id in (
+ where 1=1
+ and id in (
SELECT id FROM
(SELECT id, visit_time, finishtime,
(CASE WHEN ( DATE_FORMAT( visit_time, '%y%m%d' ) < DATE_FORMAT( IF ( ISNULL( finishtime ), NOW(),
@@ -519,6 +571,7 @@
AND date_format(visit_time,'%y%m%d') <= date_format(#{endtime},'%y%m%d')
</if>
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
+ <if test="isabnormal != null ">and isabnormal = #{isabnormal}</if>
<if test="deptcode != null and deptcode != ''">and deptcode = #{deptcode}</if>
<if test="deptname != null and deptname != ''">and deptname = #{deptname}</if>
<if test="leavehospitaldistrictcode != null and leavehospitaldistrictcode != ''">and
@@ -530,12 +583,25 @@
<if test="managementDoctorCode != null">and management_doctor_code = #{managementDoctorCode}</if>
<if test="managementDoctor != null">and management_doctor like concat('%',#{managementDoctor}, '%')</if>
) a where a.finished =1)
- </where>
</select>
<select id="selectServiceSubtaskById" parameterType="Long" resultMap="ServiceSubtaskResult">
<include refid="selectServiceSubtaskVo"/>
where id = #{id}
+ </select>
+
+ <select id="selectServiceSubtaskByDiagname" parameterType="com.smartor.domain.ServiceSubtask"
+ resultMap="ServiceSubtaskResult">
+ select sendstate,starttime,endtime,nurse_name,phone,sex,task_name,sendname,leavediagname,visit_time FROM
+ service_subtask WHERE del_flag=0
+ <if test="leavediagname != null">and leavediagname like concat('%',#{leavediagname}, '%')</if>
+ <if test="sendname != null">and sendname like concat('%',#{sendname}, '%')</if>
+ <if test="taskName != null">and task_name like concat('%',#{taskName}, '%')</if>
+ <if test="sendstate != null">and sendstate = #{sendstate}</if>
+ <if test="orgid != null">and orgid =#{orgid}</if>
+ GROUP BY sendname,sendstate,starttime,endtime,nurse_name,phone,sex,task_name,leavediagname,visit_time ORDER BY
+ visit_time
+ <if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
</select>
<insert id="insertServiceSubtask" parameterType="com.smartor.domain.ServiceSubtask" useGeneratedKeys="true"
@@ -624,6 +690,8 @@
<if test="managementDoctorCode != null">management_doctor_code,</if>
<if test="managementDoctor != null">management_doctor,</if>
<if test="currentPreachform != null">current_preachform,</if>
+ <if test="taskSituation != null">task_situation,</if>
+ <if test="isabnormal != null">isabnormal,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="sendname != null">#{sendname},</if>
@@ -708,6 +776,8 @@
<if test="managementDoctorCode != null">#{managementDoctorCode},</if>
<if test="managementDoctor != null">#{managementDoctor},</if>
<if test="currentPreachform != null">#{currentPreachform},</if>
+ <if test="taskSituation != null">#{taskSituation},</if>
+ <if test="isabnormal != null">#{isabnormal},</if>
</trim>
</insert>
@@ -797,6 +867,8 @@
<if test="managementDoctorCode != null">management_doctor_code = #{managementDoctorCode},</if>
<if test="managementDoctor != null">management_doctor=#{managementDoctor},</if>
<if test="currentPreachform != null">current_preachform=#{currentPreachform},</if>
+ <if test="taskSituation != null">task_situation=#{taskSituation},</if>
+ <if test="isabnormal != null">isabnormal=#{isabnormal},</if>
</trim>
where id = #{id}
</update>
@@ -887,11 +959,15 @@
<if test="managementDoctorCode != null">management_doctor_code = #{managementDoctorCode},</if>
<if test="managementDoctor != null">management_doctor=#{managementDoctor},</if>
<if test="currentPreachform != null">current_preachform=#{currentPreachform},</if>
+ <if test="taskSituation != null">task_situation=#{taskSituation},</if>
+ <if test="isabnormal != null">isabnormal=#{isabnormal},</if>
</trim>
- <where>
+ where 1=1
<if test="patid != null ">and patid = #{patid}</if>
<if test="taskid != null ">and taskid = #{taskid}</if>
- </where>
+ <if test="orgid != null and orgid != ''">
+ and orgid = #{orgid}
+ </if>
</update>
<update id="updateServiceSubtaskByCondition" parameterType="com.smartor.domain.ServiceSubtask">
@@ -979,6 +1055,8 @@
<if test="managementDoctorCode != null">management_doctor_code = #{managementDoctorCode},</if>
<if test="managementDoctor != null">management_doctor=#{managementDoctor},</if>
<if test="currentPreachform != null">current_preachform=#{currentPreachform},</if>
+ <if test="taskSituation != null">task_situation=#{taskSituation},</if>
+ <if test="isabnormal != null">isabnormal=#{isabnormal},</if>
</trim>
where patid = #{patid} and taskid = #{taskid}
</update>
@@ -1068,6 +1146,8 @@
<if test="managementDoctorCode != null">management_doctor_code = #{managementDoctorCode},</if>
<if test="managementDoctor != null">management_doctor=#{managementDoctor},</if>
<if test="currentPreachform != null">current_preachform=#{currentPreachform},</if>
+ <if test="taskSituation != null">task_situation=#{taskSituation},</if>
+ <if test="isabnormal != null">isabnormal=#{isabnormal},</if>
</trim>
where task_guid = #{taskGuid} and task_name = #{taskName}
</update>
@@ -1092,8 +1172,11 @@
<select id="getSfStatistics" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
resultMap="ServiceSubtaskResult">
<include refid="selectServiceSubtaskVo"/>
- <where>
- del_flag=0
+ where 1=1
+ and del_flag = 0
+ <if test="orgid != null and orgid != ''">
+ and orgid = #{orgid}
+ </if>
<if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
AND leavehospitaldistrictcode IN
<foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
@@ -1121,17 +1204,21 @@
</if>
<if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
<if test="visitDeptName != null">abd visit_dept_name = #{visitDeptName}</if>
- </where>
+ <if test="isabnormal != null">abd isabnormal = #{isabnormal}</if>
</select>
<select id="getSfStatisticsJoy" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
resultMap="ServiceSubtaskResult2">
SELECT sub_id as subTaskId,COUNT(sub_id) joyCount,
- (SELECT COUNT(1) FROM ivr_liba_target WHERE assortid IN (SELECT config_value FROM sys_config WHERE config_key='joyCount')) joyAllCount
+ (SELECT COUNT(1) FROM ivr_liba_target WHERE assortid IN (SELECT config_value FROM sys_config WHERE
+ config_key='joyCount')) joyAllCount
FROM service_subtask_detail a
WHERE sub_id IN(SELECT id FROM service_subtask t
- <where>
- del_flag=0
+ where 1=1
+ and del_flag = 0
+ <if test="orgid != null and orgid != ''">
+ and orgid = #{orgid}
+ </if>
<if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
AND leavehospitaldistrictcode IN
<foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
@@ -1158,20 +1245,24 @@
AND date_format(visit_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d')
</if>
<if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
- <if test="visitDeptName != null">abd visit_dept_name = #{visitDeptName}</if>
- </where>
+ <if test="visitDeptName != null">and visit_dept_name = #{visitDeptName}</if>
+ <if test="isabnormal != null">and isabnormal = #{isabnormal}</if>
)
- AND targetid IN ( SELECT id FROM ivr_liba_target WHERE assortid IN (SELECT config_value FROM sys_config WHERE config_key='joyCount'))
+ AND targetid IN ( SELECT id FROM ivr_liba_target WHERE assortid IN (SELECT config_value FROM sys_config WHERE
+ config_key='joyCount'))
GROUP BY sub_id
</select>
<select id="getSfStatisticsJoydetails" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
resultMap="ServiceSubtaskResult2">
- SELECT joyName,joyCount,joyAllCount,ROUND(joyCount/joyAllCount,2) joyTotal FROM (
+ SELECT joyName,joyCount,joyAllCount,ROUND(joyCount/joyAllCount,2) joyTotal FROM (
SELECT targetname joyName,
- (select COUNT(sub_id) FROM service_subtask_detail WHERE sub_id IN(SELECT id FROM service_subtask t
- <where>
- del_flag=0
+ (select COUNT(sub_id) FROM service_subtask_detail WHERE sub_id IN(SELECT id FROM service_subtask t
+ where 1=1
+ and del_flag = 0
+ <if test="orgid != null and orgid != ''">
+ and orgid = #{orgid}
+ </if>
<if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
AND leavehospitaldistrictcode IN
<foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
@@ -1197,43 +1288,223 @@
AND date_format(visit_time,'%y%m%d') >= date_format(#{startTime},'%y%m%d')
AND date_format(visit_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d')
</if>
- </where>
) AND targetid=a.id) joyCount , (SELECT COUNT(*) from (select sub_id FROM service_subtask_detail
WHERE sub_id IN(SELECT id FROM service_subtask t
- <where>
- del_flag=0
- <if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">AND
- leavehospitaldistrictcode IN
- <foreach
- collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
+ where 1=1
+ and del_flag = 0
+ <if test="orgid != null and orgid != ''">
+ and orgid = #{orgid}
+ </if>
+ <if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">AND
+ leavehospitaldistrictcode IN
+ <foreach
+ collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
+ close=")">
+ #{leavehospitaldistrictcode}
+ </foreach>
+ </if>
+ <if test="deptcodes != null and deptcodes.size() > 0">
+ AND deptcode IN
+ <foreach collection="deptcodes" item="deptcode" open="(" separator=","
+ close=")">
+ #{deptcode}
+ </foreach>
+ </if>
+ <if test="serviceType != null and serviceType.size() > 0">
+ AND service_type IN
+ <foreach collection="serviceType" item="serviceType" open="(" separator=","
+ close=")">
+ #{serviceType}
+ </foreach>
+ </if>
+ <if test="startTime != null and endTime!=null">
+ AND date_format(visit_time,'%y%m%d') >= date_format(#{startTime},'%y%m%d')
+ AND date_format(visit_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d')
+ </if>
+ GROUP BY sub_id ) ) ta ) joyAllCount
+ FROM ivr_liba_target a
+ WHERE assortid IN (SELECT config_value FROM sys_config WHERE config_key=
+ 'joyCount')
+ )a1
+ </select>
+
+ <select id="getSfStatisticsCategory" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
+ resultMap="ServiceSubtaskResult2">
+ SELECT a.sub_id as subTaskId,
+ <if test="configValue != null and configValue != ''">
+ SUM(CASE WHEN a.categoryid IN(${configValue})
+ THEN 1 ELSE 0 END) AS joyAllCount,
+ </if>
+ COUNT(sub_id) joyCount
+ FROM service_subtask_detail a
+ INNER JOIN service_subtask t ON a.sub_id = t.id
+ where 1=1
+ and a.del_flag=0
+ AND t.del_flag=0
+ <if test="orgid != null and orgid != ''">
+ and a.orgid = #{orgid}
+ </if>
+ <if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
+ AND t.leavehospitaldistrictcode IN
+ <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
+ close=")">
+ #{leavehospitaldistrictcode}
+ </foreach>
+ </if>
+ <if test="deptcodes != null and deptcodes.size() > 0">
+ AND t.deptcode IN
+ <foreach collection="deptcodes" item="deptcode" open="(" separator=","
+ close=")">
+ #{deptcode}
+ </foreach>
+ </if>
+ <if test="serviceType != null and serviceType.size() > 0">
+ AND t.service_type IN
+ <foreach collection="serviceType" item="serviceType" open="(" separator=","
+ close=")">
+ #{serviceType}
+ </foreach>
+ </if>
+ <if test="startTime != null and endTime!=null">
+ AND date_format(t.visit_time,'%y%m%d') >= date_format(#{startTime},'%y%m%d')
+ AND date_format(t.visit_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d')
+ </if>
+ <if test="visitDeptCode != null">
+ and t.visit_dept_code = #{visitDeptCode}
+ </if>
+ <if test="visitDeptName != null">
+ and t.visit_dept_name = #{visitDeptName}
+ </if>
+ <if test="isabnormal != null">
+ and t.isabnormal = #{isabnormal}
+ </if>
+ <!-- 鐩墠鍙粺璁¤闊冲拰闂嵎 -->
+ <if test="type != null">
+ and t.type = #{type}
+ </if>
+ GROUP BY a.sub_id
+ </select>
+
+ <select id="getSfStatisticsScriptDetails" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
+ resultMap="ServiceSubtaskScriptCountResult">
+ SELECT
+ a.id as scriptid,
+ a.templateid as templateid,
+ a.script_type,
+ a.script_content,
+ b.subtask_type,
+ b.completed_quantity,
+ b.all_quantity,
+ ROUND(b.completed_quantity/b.all_quantity,2) as completed_percentage
+ FROM
+ <if test="type == 1">
+ ivr_task_template_script a
+ </if>
+ <if test="type == 2">
+ svy_task_template_script a
+ </if>
+ INNER JOIN(
+ SELECT
+ ssd.scriptid AS scriptid,
+ ss.type as subtask_type,
+ SUM(CASE WHEN IFNULL(ssd.matchedtext,ssd.asrtext) IS NOT NULL
+ AND IFNULL(ssd.matchedtext,ssd.asrtext) != '' THEN 1
+ ELSE 0 END) AS completed_quantity,
+ COUNT(*) AS all_quantity
+ FROM
+ service_subtask_detail ssd
+ INNER JOIN service_subtask ss ON ssd.sub_id = ss.id
+ WHERE
+ ss.del_flag=0
+ AND ssd.del_flag = 0
+ <if test="orgid != null and orgid != ''">
+ AND ss.orgid = #{orgid}
+ </if>
+ <if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
+ AND ss.leavehospitaldistrictcode IN
+ <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
close=")">
#{leavehospitaldistrictcode}
</foreach>
</if>
<if test="deptcodes != null and deptcodes.size() > 0">
- AND deptcode IN
+ AND ss.deptcode IN
<foreach collection="deptcodes" item="deptcode" open="(" separator=","
close=")">
#{deptcode}
</foreach>
</if>
<if test="serviceType != null and serviceType.size() > 0">
- AND service_type IN
+ AND ss.service_type IN
<foreach collection="serviceType" item="serviceType" open="(" separator=","
close=")">
#{serviceType}
</foreach>
</if>
- <if test="startTime != null and endTime!=null">
- AND date_format(visit_time,'%y%m%d') >= date_format(#{startTime},'%y%m%d')
- AND date_format(visit_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d')
+ <if test="startTime != null and endTime!=null">
+ AND date_format(ss.visit_time,'%y%m%d') >= date_format(#{startTime},'%y%m%d')
+ AND date_format(ss.visit_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d')
+ </if>
+ <!-- 鐩墠鍙粺璁¤闊冲拰闂嵎 -->
+ <if test="type != null">
+ and ss.type = #{type}
+ </if>
+ <if test="configValue != null and configValue != ''">
+ AND ssd.categoryid IN (${configValue})
+ </if>
+ group by ssd.scriptid) b
+ ON a.id = b.scriptid
+ </select>
+
+ <select id="getSfStatisticsScriptItemDetails" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
+ resultMap="ServiceSubtaskScriptCountResult">
+ SELECT
+ ssd.scriptid,
+ IFNULL(ssd.matchedtext,ssd.asrtext) AS option_text,
+ COUNT(*) AS chosen_quantity
+ FROM
+ service_subtask_detail ssd
+ INNER JOIN service_subtask ss ON ssd.sub_id = ss.id
+ where 1=1
+ and ss.del_flag=0
+ <if test="orgid != null and orgid != ''">
+ and ss.orgid = #{orgid}
</if>
- </where>
- GROUP BY sub_id ) ) ta ) joyAllCount
- FROM ivr_liba_target a
- WHERE assortid IN (SELECT config_value FROM sys_config WHERE config_key=
- 'joyCount')
- )a1
+ AND IFNULL(ssd.matchedtext,ssd.asrtext) IS NOT NULL
+ AND IFNULL(ssd.matchedtext,ssd.asrtext) != ''
+ <if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0">
+ AND ss.leavehospitaldistrictcode IN
+ <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
+ close=")">
+ #{leavehospitaldistrictcode}
+ </foreach>
+ </if>
+ <if test="deptcodes != null and deptcodes.size() > 0">
+ AND ss.deptcode IN
+ <foreach collection="deptcodes" item="deptcode" open="(" separator=","
+ close=")">
+ #{deptcode}
+ </foreach>
+ </if>
+ <if test="serviceType != null and serviceType.size() > 0">
+ AND ss.service_type IN
+ <foreach collection="serviceType" item="serviceType" open="(" separator=","
+ close=")">
+ #{serviceType}
+ </foreach>
+ </if>
+ <if test="startTime != null and endTime!=null">
+ AND date_format(ss.visit_time,'%y%m%d') >= date_format(#{startTime},'%y%m%d')
+ AND date_format(ss.visit_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d')
+ </if>
+ <!-- 鐩墠鍙粺璁¤闊冲拰闂嵎 -->
+ <if test="type != null">
+ and ss.type = #{type}
+ </if>
+ <if test="configValue != null and configValue != ''">
+ AND ssd.categoryid IN (${configValue})
+ </if>
+ group by ssd.scriptid, IFNULL(ssd.matchedtext,ssd.asrtext)
</select>
<select id="getDataByTime" resultMap="ServiceSubtaskResult">
@@ -1313,6 +1584,7 @@
visitDeptName,
management_doctor_code,
management_doctor,
+ isabnormal,
leaveicd10code
FROM service_subtask,
JSON_TABLE(send_time_slot, '$[*]' COLUMNS (
@@ -1368,7 +1640,6 @@
SUM(pmiCount) AS pmiCount,
SUM(pmoCount) AS pmoCount
FROM (
- -- 闅忚鏁版嵁
SELECT
<choose>
<when test="timeType == 'day'">
@@ -1424,24 +1695,24 @@
</foreach>
</if>
-<!-- GROUP BY-->
-<!-- <choose>-->
-<!-- <when test="timeType == 'day'">-->
-<!-- DATE_FORMAT(visit_time, '%Y-%m-%d')-->
-<!-- </when>-->
-<!-- <when test="timeType == 'month'">-->
-<!-- DATE_FORMAT(visit_time, '%Y-%m')-->
-<!-- </when>-->
-<!-- <when test="timeType == 'year'">-->
-<!-- DATE_FORMAT(visit_time, '%Y')-->
-<!-- </when>-->
-<!-- <when test="timeType == 'week'">-->
-<!-- CONCAT(YEAR(visit_time), '-W', LPAD(WEEK(visit_time, 1), 2, '0'))-->
-<!-- </when>-->
-<!-- <otherwise>-->
-<!-- DATE_FORMAT(visit_time, '%Y-%m-%d')-->
-<!-- </otherwise>-->
-<!-- </choose>-->
+ <!-- GROUP BY-->
+ <!-- <choose>-->
+ <!-- <when test="timeType == 'day'">-->
+ <!-- DATE_FORMAT(visit_time, '%Y-%m-%d')-->
+ <!-- </when>-->
+ <!-- <when test="timeType == 'month'">-->
+ <!-- DATE_FORMAT(visit_time, '%Y-%m')-->
+ <!-- </when>-->
+ <!-- <when test="timeType == 'year'">-->
+ <!-- DATE_FORMAT(visit_time, '%Y')-->
+ <!-- </when>-->
+ <!-- <when test="timeType == 'week'">-->
+ <!-- CONCAT(YEAR(visit_time), '-W', LPAD(WEEK(visit_time, 1), 2, '0'))-->
+ <!-- </when>-->
+ <!-- <otherwise>-->
+ <!-- DATE_FORMAT(visit_time, '%Y-%m-%d')-->
+ <!-- </otherwise>-->
+ <!-- </choose>-->
UNION ALL
@@ -1494,24 +1765,24 @@
</foreach>
</if>
-<!-- GROUP BY-->
-<!-- <choose>-->
-<!-- <when test="timeType == 'day'">-->
-<!-- DATE_FORMAT(endtime, '%Y-%m-%d')-->
-<!-- </when>-->
-<!-- <when test="timeType == 'month'">-->
-<!-- DATE_FORMAT(endtime, '%Y-%m')-->
-<!-- </when>-->
-<!-- <when test="timeType == 'year'">-->
-<!-- DATE_FORMAT(endtime, '%Y')-->
-<!-- </when>-->
-<!-- <when test="timeType == 'week'">-->
-<!-- CONCAT(YEAR(endtime), '-W', LPAD(WEEK(endtime, 1), 2, '0'))-->
-<!-- </when>-->
-<!-- <otherwise>-->
-<!-- DATE_FORMAT(endtime, '%Y-%m-%d')-->
-<!-- </otherwise>-->
-<!-- </choose>-->
+ <!-- GROUP BY-->
+ <!-- <choose>-->
+ <!-- <when test="timeType == 'day'">-->
+ <!-- DATE_FORMAT(endtime, '%Y-%m-%d')-->
+ <!-- </when>-->
+ <!-- <when test="timeType == 'month'">-->
+ <!-- DATE_FORMAT(endtime, '%Y-%m')-->
+ <!-- </when>-->
+ <!-- <when test="timeType == 'year'">-->
+ <!-- DATE_FORMAT(endtime, '%Y')-->
+ <!-- </when>-->
+ <!-- <when test="timeType == 'week'">-->
+ <!-- CONCAT(YEAR(endtime), '-W', LPAD(WEEK(endtime, 1), 2, '0'))-->
+ <!-- </when>-->
+ <!-- <otherwise>-->
+ <!-- DATE_FORMAT(endtime, '%Y-%m-%d')-->
+ <!-- </otherwise>-->
+ <!-- </choose>-->
UNION ALL
@@ -1555,27 +1826,199 @@
</foreach>
</if>
-<!-- GROUP BY-->
-<!-- <choose>-->
-<!-- <when test="timeType == 'day'">-->
-<!-- DATE_FORMAT(admitdate, '%Y-%m-%d')-->
-<!-- </when>-->
-<!-- <when test="timeType == 'month'">-->
-<!-- DATE_FORMAT(admitdate, '%Y-%m')-->
-<!-- </when>-->
-<!-- <when test="timeType == 'year'">-->
-<!-- DATE_FORMAT(admitdate, '%Y')-->
-<!-- </when>-->
-<!-- <when test="timeType == 'week'">-->
-<!-- CONCAT(YEAR(admitdate), '-W', LPAD(WEEK(admitdate, 1), 2, '0'))-->
-<!-- </when>-->
-<!-- <otherwise>-->
-<!-- DATE_FORMAT(admitdate, '%Y-%m-%d')-->
-<!-- </otherwise>-->
-<!-- </choose>-->
+ <!-- GROUP BY-->
+ <!-- <choose>-->
+ <!-- <when test="timeType == 'day'">-->
+ <!-- DATE_FORMAT(admitdate, '%Y-%m-%d')-->
+ <!-- </when>-->
+ <!-- <when test="timeType == 'month'">-->
+ <!-- DATE_FORMAT(admitdate, '%Y-%m')-->
+ <!-- </when>-->
+ <!-- <when test="timeType == 'year'">-->
+ <!-- DATE_FORMAT(admitdate, '%Y')-->
+ <!-- </when>-->
+ <!-- <when test="timeType == 'week'">-->
+ <!-- CONCAT(YEAR(admitdate), '-W', LPAD(WEEK(admitdate, 1), 2, '0'))-->
+ <!-- </when>-->
+ <!-- <otherwise>-->
+ <!-- DATE_FORMAT(admitdate, '%Y-%m-%d')-->
+ <!-- </otherwise>-->
+ <!-- </choose>-->
) AS combined_data
GROUP BY timePeriod
ORDER BY timePeriod DESC
</select>
+ <!-- 浼樺寲鐨勭粺璁℃煡璇細鐩存帴鍦ㄦ暟鎹簱灞傚畬鎴愯仛鍚堣绠� -->
+ <select id="countByCondition" parameterType="com.smartor.domain.ServiceSubtaskVO" resultType="map">
+ SELECT
+ SUM(CASE WHEN sendstate = 4 THEN 1 ELSE 0 END) AS wzx,
+ SUM(CASE WHEN sendstate != 4 AND sendstate != 2 THEN 1 ELSE 0 END) AS ysf,
+ SUM(CASE WHEN sendstate = 5 THEN 1 ELSE 0 END) AS fssb,
+ SUM(CASE WHEN sendstate >= 3 OR sendstate = 1 THEN 1 ELSE 0 END) AS yfs,
+ SUM(CASE WHEN sendstate = 2 THEN 1 ELSE 0 END) AS dsf,
+ SUM(CASE WHEN sendstate = 1 THEN 1 ELSE 0 END) AS blq,
+ SUM(CASE WHEN excep IS NOT NULL AND excep != '0' THEN 1 ELSE 0 END) AS yc
+ FROM service_subtask
+ where 1=1
+ and 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="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="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="leavehospitaldistrictname != null and leavehospitaldistrictname != ''">
+ AND leavehospitaldistrictname = #{leavehospitaldistrictname}
+ </if>
+ <if test="leavediagname != null and leavediagname != ''">
+ AND leavediagname LIKE CONCAT('%', #{leavediagname}, '%')
+ </if>
+ <if test="managementDoctor != null and managementDoctor != ''">
+ AND management_doctor LIKE CONCAT('%', #{managementDoctor}, '%')
+ </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="managementDoctorCode != null">
+ AND management_doctor_code = #{managementDoctorCode}
+ </if>
+ <if test="submit != null">
+ AND submit = #{submit}
+ </if>
+ <if test="upid != null">
+ AND upid = #{upid}
+ </if>
+ <if test="patfrom != null">
+ AND patfrom = #{patfrom}
+ </if>
+ <if test="serviceType != null">
+ AND service_type = #{serviceType}
+ </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>
+ <if test="type != null and type != ''">
+ AND type = #{type}
+ </if>
+ <if test="taskid != null">
+ AND taskid = #{taskid}
+ </if>
+ <if test="templateid != null and templateid != ''">
+ AND templateid = #{templateid}
+ </if>
+ <if test="templatename != null and templatename != ''">
+ AND templatename LIKE CONCAT('%', #{templatename}, '%')
+ </if>
+ <if test="startOutHospTime != null">
+ AND DATE_FORMAT(endtime,'%y%m%d') >= DATE_FORMAT(#{startOutHospTime},'%y%m%d')
+ </if>
+ <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="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="deptcode != null and deptcode != ''">
+ AND deptcode = #{deptcode}
+ </if>
+ <if test="sendstate != null">
+ AND sendstate = #{sendstate}
+ </if>
+ <if test="sendstates != null and sendstates.size() > 0">
+ AND sendstate IN
+ <foreach collection="sendstates" item="state" open="(" separator="," close=")">
+ #{state}
+ </foreach>
+ </if>
+ <if test="orgid != null and orgid != ''">
+ AND orgid = #{orgid}
+ </if>
+ <if test="guid != null and guid != ''">
+ AND guid = #{guid}
+ </if>
+ <if test="visitCount != null and visitCount == 1">
+ AND visit_count = 1
+ </if>
+ <if test="visitCount != null and visitCount > 1">
+ AND visit_count > 1
+ </if>
+ </select>
+
</mapper>
--
Gitblit v1.9.3