From 30ea2c33af092769b4969e7cf9d8209b5d8267ad Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 15 五月 2026 16:18:24 +0800
Subject: [PATCH] 【市一】湖滨单独发送
---
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index d75bd6e..c55d298 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -36,6 +36,7 @@
<result property="isupload" column="isupload"/>
<result property="uploadTime" column="upload_time"/>
<result property="orgid" column="orgid"/>
+ <result property="campusid" column="campusid"/>
<result property="pid" column="pid"/>
<result property="guid" column="guid"/>
<result property="taskGuid" column="task_guid"/>
@@ -266,6 +267,7 @@
resultMap="ServiceSubtaskResult">
<include refid="selectServiceSubtaskVo"/>
where del_flag = 0
+ <if test="subId != null ">and id = #{subId}</if>
<if test="continueFlag != null ">and continue_flag = #{continueFlag}</if>
<if test="continueTimeNow != null ">and continue_time_now = #{continueTimeNow,jdbcType=TIMESTAMP}</if>
<if test="continueCount != null ">and continue_count = #{continueCount}</if>
@@ -811,6 +813,7 @@
<if test="isupload != null">isupload,</if>
<if test="uploadTime != null">upload_time,</if>
<if test="orgid != null">orgid,</if>
+ <if test="campusid != null">campusid,</if>
<if test="pid != null">pid,</if>
<if test="guid != null">guid,</if>
<if test="textParam != null">text_param,</if>
@@ -903,6 +906,7 @@
<if test="isupload != null">#{isupload},</if>
<if test="uploadTime != null">#{uploadTime},</if>
<if test="orgid != null">#{orgid},</if>
+ <if test="campusid != null">#{campusid},</if>
<if test="pid != null">#{pid},</if>
<if test="guid != null">#{guid},</if>
<if test="textParam != null">#{textParam},</if>
@@ -1000,6 +1004,7 @@
<if test="isupload != null">isupload = #{isupload},</if>
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="orgid != null">orgid = #{orgid},</if>
+ <if test="campusid != null">campusid = #{campusid},</if>
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
<if test="textParam != null">text_param = #{textParam},</if>
@@ -1098,6 +1103,7 @@
<if test="isupload != null">isupload = #{isupload},</if>
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="orgid != null">orgid = #{orgid},</if>
+ <if test="campusid != null">campusid = #{campusid},</if>
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
<if test="textParam != null">text_param = #{textParam},</if>
@@ -1200,6 +1206,7 @@
<if test="isupload != null">isupload = #{isupload},</if>
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="orgid != null">orgid = #{orgid},</if>
+ <if test="campusid != null">campusid = #{campusid},</if>
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
<if test="visitCount != null">visit_count = #{visitCount},</if>
@@ -1299,6 +1306,7 @@
<if test="isupload != null">isupload = #{isupload},</if>
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="orgid != null">orgid = #{orgid},</if>
+ <if test="campusid != null">campusid = #{campusid},</if>
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
<if test="textParam != null">text_param = #{textParam},</if>
@@ -1396,6 +1404,7 @@
deptname,
sendstate,
preachform,
+ current_preachform,
excep,
nurse_id,
nurse_name,
@@ -2500,4 +2509,50 @@
ORDER BY groupCode
</select>
+ <!-- 瀹ｆ暀缁熻锛氭寜鐥呭尯鎴栫瀹ゅ垎缁勶紝缁熻鍙戦�佹�婚噺銆佸彂閫佹垚鍔熼噺锛坰endstate=6锛夈�佸凡璇婚噺锛坒inishtime涓嶄负绌猴級 -->
+ <select id="getHeLibraryCount" parameterType="com.smartor.domain.VO.HeLibraryCountVO" resultType="map">
+ SELECT
+ <choose>
+ <when test="hospitaldistrictcodes != null and hospitaldistrictcodes.size() > 0">
+ leavehospitaldistrictcode AS groupCode,
+ leavehospitaldistrictname AS groupName,
+ </when>
+ <otherwise>
+ deptcode AS groupCode,
+ deptname AS groupName,
+ </otherwise>
+ </choose>
+ COUNT(*) AS totalCount,
+ SUM(CASE WHEN sendstate = 6 THEN 1 ELSE 0 END) AS sendSuccessCount,
+ SUM(CASE WHEN finishtime IS NOT NULL THEN 1 ELSE 0 END) AS readCount
+ FROM service_subtask
+ WHERE del_flag = 0
+ AND service_type = 4
+ <if test="starttime != null">AND starttime >= #{starttime}</if>
+ <if test="endtime != null">AND endtime <= #{endtime}</if>
+ <if test="visittime != null">AND DATE(visit_time) = DATE(#{visittime})</if>
+ <if test="finishtime != null">AND DATE(finishtime) = DATE(#{finishtime})</if>
+ <if test="hospType != null and hospType != ''">AND hosp_type = #{hospType}</if>
+ <choose>
+ <when test="hospitaldistrictcodes != null and hospitaldistrictcodes.size() > 0">
+ AND leavehospitaldistrictcode IN
+ <foreach collection="hospitaldistrictcodes" item="code" open="(" separator="," close=")">
+ #{code}
+ </foreach>
+ GROUP BY leavehospitaldistrictcode, leavehospitaldistrictname
+ ORDER BY groupCode
+ </when>
+ <otherwise>
+ <if test="deptcodes != null and deptcodes.size() > 0">
+ AND deptcode IN
+ <foreach collection="deptcodes" item="code" open="(" separator="," close=")">
+ #{code}
+ </foreach>
+ </if>
+ GROUP BY deptcode, deptname
+ ORDER BY groupCode
+ </otherwise>
+ </choose>
+ </select>
+
</mapper>
--
Gitblit v1.9.3