smartor.git - Gitblit

			@@ -380,6 +380,12 @@
			<if test="endSendDateTime != null">
			AND date_format(visit_time,'%y%m%d') <= date_format(#{endSendDateTime},'%y%m%d')
			</if>
			<if test="finishtimeStart != null">
			AND date_format(finishtime,'%y%m%d') >= date_format(#{finishtimeStart},'%y%m%d')
			</if>
			<if test="finishtimeEnd != null">
			AND date_format(finishtime,'%y%m%d') <= date_format(#{finishtimeEnd},'%y%m%d')
			</if>
			<if test="longSendTime != null">
			AND date_format(long_send_time,'%y%m%d') <= date_format(#{longSendTime},'%y%m%d')
			</if>
			@@ -3050,6 +3056,9 @@
			t.taskid AS taskid,
			t.task_name AS taskName,
			d.asrtext AS optionresult,
			d.score AS score,
			d.targetvalue AS targetvalue,
			d.value_type AS valueType,
			COUNT(*) AS count,
			CONCAT(ROUND(COUNT() 100.0 / t2.total_count, 2), '%') AS ratio
			FROM
			@@ -3065,20 +3074,38 @@
			service_task t
			INNER JOIN service_subtask s ON s.taskid = t.taskid
			INNER JOIN service_subtask_detail d ON d.sub_id = s.id
			WHERE t.taskid IN
			WHERE 1=1
			<if test="taskIds != null and taskIds.size() > 0">
			AND t.taskid IN
			<foreach collection="taskIds" item="taskId" open="(" separator="," close=")">
			#{taskId}
			</foreach>
			</if>
			<if test="valueType != null">AND d.value_type = #{valueType}</if>
			<if test="scoreStart != null">AND d.score >= #{scoreStart}</if>
			<if test="scoreEnd != null">AND d.score <= #{scoreEnd}</if>
			<if test="questiontext != null and questiontext != ''">and d.questiontext like concat('%', #{questiontext},
			'%')
			</if>
			and s.sendstate=6
			and d.del_flag=0
			GROUP BY
			t.taskid,
			d.questiontext
			) t2 ON t2.taskid = t.taskid AND t2.questiontext = d.questiontext
			WHERE t.taskid IN
			WHERE 1=1
			<if test="taskIds != null and taskIds.size() > 0">
			AND t.taskid IN
			<foreach collection="taskIds" item="taskId" open="(" separator="," close=")">
			#{taskId}
			</foreach>
			</if>
			<if test="valueType != null">AND d.value_type = #{valueType}</if>
			<if test="scoreStart != null">AND d.score >= #{scoreStart}</if>
			<if test="scoreEnd != null">AND d.score <= #{scoreEnd}</if>
			<if test="questiontext != null and questiontext != ''">and d.questiontext like concat('%', #{questiontext},
			'%')
			</if>
			AND s.sendstate = 6
			and d.del_flag=0
			<if test="startOutHospTime != null">
			@@ -3090,7 +3117,10 @@
			GROUP BY
			t.taskid,
			d.questiontext,
			d.asrtext
			d.score,
			d.targetvalue,
			d.asrtext,
			d.value_type
			ORDER BY
			d.questiontext,
			t.taskid
			@@ -3103,6 +3133,9 @@
			t.taskid AS taskid,
			t.task_name AS taskName,
			d.asrtext AS optionresult,
			d.score AS score,
			d.targetvalue AS targetvalue,
			d.value_type AS valueType,
			COUNT(*) AS count,
			CONCAT(ROUND(COUNT() 100.0 / t2.total_count, 2), '%') AS ratio
			FROM
			@@ -3117,20 +3150,34 @@
			service_task t
			INNER JOIN service_subtask s ON s.taskid = t.taskid
			INNER JOIN service_subtask_detail d ON d.sub_id = s.id
			WHERE s.id IN
			WHERE 1=1
			<if test="subtaskIds != null and subtaskIds.size() > 0">
			AND s.id IN
			<foreach collection="subtaskIds" item="subtaskId" open="(" separator="," close=")">
			#{subtaskId}
			</foreach>
			</if>
			<if test="valueType != null">AND d.value_type >= #{valueType}</if>
			<if test="scoreStart != null">AND d.score = #{scoreStart}</if>
			<if test="scoreEnd != null">AND d.score <= #{scoreEnd}</if>
			<if test="questiontext != null and questiontext != ''">and d.questiontext like concat('%', #{questiontext}, '%')</if>
			AND s.sendstate = 6
			AND d.del_flag=0
			GROUP BY d.questiontext -- ← 关键修改：按题目分组统计每个题目的总数
			) t2 ON t2.questiontext = d.questiontext -- ← 关联到当前题目
			WHERE s.id IN
			GROUP BY d.questiontext
			) t2 ON t2.questiontext = d.questiontext
			WHERE 1=1
			<if test="subtaskIds != null and subtaskIds.size() > 0">
			AND s.id IN
			<foreach collection="subtaskIds" item="subtaskId" open="(" separator="," close=")">
			#{subtaskId}
			</foreach>
			</if>
			AND s.sendstate = 6
			AND d.del_flag=0
			<if test="valueType != null">AND d.value_type >= #{valueType}</if>
			<if test="scoreStart != null">AND d.score >= #{scoreStart}</if>
			<if test="scoreEnd != null">AND d.score <= #{scoreEnd}</if>
			<if test="questiontext != null and questiontext != ''">and d.questiontext like concat('%', #{questiontext}, '%')</if>
			<if test="startOutHospTime != null">
			AND date_format(s.endtime,'%y%m%d') >= date_format(#{startOutHospTime},'%y%m%d')
			</if>
			@@ -3140,6 +3187,8 @@
			GROUP BY
			t.taskid,
			d.questiontext,
			d.score,
			d.targetvalue,
			d.asrtext
			ORDER BY
			d.questiontext,