From 55d724ddd52b2acb6e7ee2d291e04e4b6d96ad19 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 09 十一月 2026 16:06:47 +0800
Subject: [PATCH] sync: service_subtask 科室病区字段重命名对齐
---
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 254 ++++++++++++++++++++++++++++----------------------
1 files changed, 141 insertions(+), 113 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 678e872..69624cd 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -27,7 +27,7 @@
<result property="recordid" column="recordid"/>
<result property="exrecallcount" column="exrecallcount"/>
<result property="pulltime" column="pulltime"/>
- <result property="deptcode" column="deptcode"/>
+ <result property="leaveldeptcode" column="leaveldeptcode"/>
<result property="labelstatus" column="labelstatus"/>
<result property="delFlag" column="del_flag"/>
<result property="updateBy" column="update_by"/>
@@ -54,6 +54,11 @@
<result property="leaveicd10code" column="leaveicd10code"/>
<result property="leavediagname" column="leavediagname"/>
<result property="diagname" column="diagname"/>
+ <result property="leaveldeptname" column="leaveldeptname"/>
+ <!-- 2026-11锛氬師 sendlimit* 鍥涗釜绌洪棽鍒楀鐢ㄤ负銆屽湪闄㈢淮搴︺�嶏紙hospitaldistrict* = 鍦ㄩ櫌鐥呭尯锛宒eptcode/name = 鍦ㄩ櫌绉戝锛� -->
+ <result property="hospitaldistrictcode" column="hospitaldistrictcode"/>
+ <result property="hospitaldistrictname" column="hospitaldistrictname"/>
+ <result property="deptcode" column="deptcode"/>
<result property="deptname" column="deptname"/>
<result property="admindate" column="admindate"/>
<result property="roomno" column="roomno"/>
@@ -211,7 +216,7 @@
recordid,
exrecallcount,
pulltime,
- deptcode,
+ leaveldeptcode,
labelstatus,
del_flag,
update_by,
@@ -234,6 +239,10 @@
sendname,
roomno,
admindate,
+ leaveldeptname,
+ hospitaldistrictcode,
+ hospitaldistrictname,
+ deptcode,
deptname,
stop_state,
leavehospitaldistrictcode,
@@ -258,50 +267,61 @@
</sql>
<!-- 瓒呮椂瀹屾垚銆佸欢鏈熷畬鎴愰�昏緫 瀹屾垚鏃剁姸鎬�(finish_state)璁＄畻锛氫粎褰撴湰娆℃洿鏂版妸 sendstate 缃负 6锛堥殢璁垮畬鎴愶級鏃朵娇鐢ㄣ��
- 鍩哄噯鎴鏃堕棿 base = endtime + send_day(缂虹渷1) + (危 service_subtask_preachform.compensate_time + 1) 澶╋紝
- 涓� RyTask/RedisMqReceiver 鐨� isSubtaskDeadline 鍙ｅ緞淇濇寔涓�鑷达紱
+ 鍩哄噯鎴鏃堕棿 base锛�
+ 闈炰换鍔＄粍(appltype != 5)锛歟ndtime + send_day(缂虹渷1) + (危 service_subtask_preachform.compensate_time + 1) 澶╋紱
+ 浠诲姟缁�(appltype = 5)锛氭寜 schedule_benchmark 瑙ｆ瀽鍩哄噯鏃堕棿
+ (1-鍏ラ櫌 2-鍑洪櫌 3-灏辫瘖 4-鍏ョ粍 0/鍏跺畠-鑷畾涔夋椂闂�)
+ + day_offset + (危 compensate_time + 1) 澶╋紙涓嶅彔鍔� send_day锛夛紱
+ 涓� RyTask/RedisMqReceiver 鐨� isSubtaskDeadline銆乻electTimelyRateBatch 鍙ｅ緞淇濇寔涓�鑷达紱
delay = COALESCE(service_task.delay_finish_days, 0)锛�
finish_time = COALESCE(鍏ュ弬 finishtime, 搴撲腑 finishtime, NOW())锛�
finish_time <= base -> 1 姝ｅ父瀹屾垚
delay > 0 涓� finish_time <= base + delay -> 2 寤舵湡瀹屾垚
鍏朵綑锛堝惈 delay 涓� 0 鎴� NULL銆佹垨宸茶秴鍑哄欢鏈熺獥鍙ｏ級 -> 3 瓒呮椂瀹屾垚
finishtime 涓虹┖鏃剁敤 NOW() 鍏滃簳锛屼繚璇佸畬鎴愭椂涓�瀹氬啓鍏ョ姸鎬侊紱
- 浠呭綋 endtime 涓虹┖瀵艰嚧鏃犳硶璁＄畻鏃舵墠淇濇寔鍘熷�间笉瑕嗙洊銆� -->
- <sql id="finishStateExpr">
+ base 涓虹┖锛坋ndtime / schedule / day_offset 缂哄け锛夋椂淇濇寔鍘熷�间笉瑕嗙洊銆� -->
+ <sql id="finishDeadlineExpr">
+ DATE_ADD(
CASE
- WHEN service_subtask.endtime IS NULL THEN finish_state
+ WHEN COALESCE(st.appltype, '') = '5' THEN
+ DATE_ADD(
+ CASE sts.schedule_benchmark
+ WHEN 1 THEN service_subtask.starttime
+ WHEN 2 THEN service_subtask.endtime
+ WHEN 3 THEN service_subtask.admindate
+ WHEN 4 THEN service_subtask.create_time
+ ELSE sts.schedule_benchmark_custom_time
+ END,
+ INTERVAL std.day_offset DAY)
+ ELSE
+ DATE_ADD(service_subtask.endtime, INTERVAL COALESCE(st.send_day, 1) DAY)
+ END,
+ INTERVAL (COALESCE((SELECT SUM(CAST(COALESCE(NULLIF(TRIM(pf.compensate_time), ''), '0') AS SIGNED))
+ FROM service_subtask_preachform pf
+ WHERE pf.subid = service_subtask.id AND pf.del_flag = 0), 0) + 1) DAY)
+ </sql>
+
+ <sql id="finishStateExpr">
+ COALESCE((
+ SELECT
+ CASE
+ WHEN <include refid="finishDeadlineExpr"/> IS NULL THEN NULL
WHEN COALESCE(#{finishtime,jdbcType=TIMESTAMP}, service_subtask.finishtime, NOW())
- <= DATE_ADD(
- DATE_ADD(
- service_subtask.endtime,
- INTERVAL COALESCE((SELECT st.send_day FROM service_task st
- WHERE st.taskid = service_subtask.taskid AND st.del_flag = '0' LIMIT 1), 1) DAY
- ),
- INTERVAL (COALESCE((SELECT SUM(CAST(COALESCE(NULLIF(TRIM(pf.compensate_time), ''), '0') AS SIGNED))
- FROM service_subtask_preachform pf
- WHERE pf.subid = service_subtask.id AND pf.del_flag = 0), 0) + 1) DAY
- )
+ <= <include refid="finishDeadlineExpr"/>
THEN 1
- WHEN COALESCE((SELECT st.delay_finish_days FROM service_task st
- WHERE st.taskid = service_subtask.taskid AND st.del_flag = '0' LIMIT 1), 0) > 0
+ WHEN COALESCE(st.delay_finish_days, 0) > 0
AND COALESCE(#{finishtime,jdbcType=TIMESTAMP}, service_subtask.finishtime, NOW())
- <= DATE_ADD(
- DATE_ADD(
- DATE_ADD(
- service_subtask.endtime,
- INTERVAL COALESCE((SELECT st.send_day FROM service_task st
- WHERE st.taskid = service_subtask.taskid AND st.del_flag = '0' LIMIT 1), 1) DAY
- ),
- INTERVAL (COALESCE((SELECT SUM(CAST(COALESCE(NULLIF(TRIM(pf.compensate_time), ''), '0') AS SIGNED))
- FROM service_subtask_preachform pf
- WHERE pf.subid = service_subtask.id AND pf.del_flag = 0), 0) + 1) DAY
- ),
- INTERVAL COALESCE((SELECT st.delay_finish_days FROM service_task st
- WHERE st.taskid = service_subtask.taskid AND st.del_flag = '0' LIMIT 1), 0) DAY
- )
+ <= DATE_ADD(<include refid="finishDeadlineExpr"/>,
+ INTERVAL COALESCE(st.delay_finish_days, 0) DAY)
THEN 2
ELSE 3
END
+ FROM (SELECT 1) dummy
+ LEFT JOIN service_task st ON st.taskid = service_subtask.taskid
+ LEFT JOIN service_task_schedule sts ON sts.id = service_subtask.schedule_id
+ LEFT JOIN service_task_schedule_detail std ON std.id = service_subtask.schedule_detail_id
+ LIMIT 1
+ ), finish_state)
</sql>
<!-- 褰撳墠鎵ц鏂瑰紡锛氶娆￠殢璁� current_preachform 涓虹┖鏃讹紝鍙� preachform 鐨勭涓�涓墽琛屾柟寮忓厹搴� -->
@@ -486,7 +506,7 @@
</foreach>
</if>
<if test=" leaveldeptcodes != null and leaveldeptcodes.size()>0">
- AND deptcode IN
+ AND leaveldeptcode IN
<foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
close=")">
#{leaveldeptcode}
@@ -508,7 +528,7 @@
OR
</if>
<if test=" leaveldeptcodes != null and leaveldeptcodes.size() > 0">
- deptcode IN
+ leaveldeptcode IN
<foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
close=")">
#{leaveldeptcode}
@@ -564,8 +584,8 @@
<if test="recordid != null ">and recordid = #{recordid}</if>
<if test="exrecallcount != null ">and exrecallcount = #{exrecallcount}</if>
<if test="pulltime != null ">and pulltime = #{pulltime}</if>
- <if test="deptcode != null and deptcode != ''">and deptcode = #{deptcode}</if>
- <if test="deptname != null and deptname != ''">and deptname = #{deptname}</if>
+ <if test="leaveldeptcode != null and leaveldeptcode != ''">and leaveldeptcode = #{leaveldeptcode}</if>
+ <if test="leaveldeptname != null and leaveldeptname != ''">and leaveldeptname = #{leaveldeptname}</if>
<if test="labelstatus != null ">and labelstatus = #{labelstatus}</if>
<if test="isupload != null ">and isupload = #{isupload}</if>
<if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
@@ -651,7 +671,7 @@
</foreach>
</if>
<if test="deptcodes != null and deptcodes.size() > 0">
- AND deptcode IN
+ AND leaveldeptcode IN
<foreach collection="deptcodes" item="deptcode" open="(" separator=","
close=")">
#{deptcode}
@@ -750,8 +770,8 @@
<if test="recordid != null ">and recordid = #{recordid}</if>
<if test="exrecallcount != null ">and exrecallcount = #{exrecallcount}</if>
<if test="pulltime != null ">and pulltime = #{pulltime}</if>
- <if test="deptcode != null and deptcode != ''">and deptcode = #{deptcode}</if>
- <if test="deptname != null and deptname != ''">and deptname = #{deptname}</if>
+ <if test="leaveldeptcode != null and leaveldeptcode != ''">and leaveldeptcode = #{leaveldeptcode}</if>
+ <if test="leaveldeptname != null and leaveldeptname != ''">and leaveldeptname = #{leaveldeptname}</if>
<if test="labelstatus != null ">and labelstatus = #{labelstatus}</if>
<if test="isupload != null ">and isupload = #{isupload}</if>
<if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
@@ -827,8 +847,8 @@
<if test="campusid != null and campusid != ''">and campusid = #{campusid}</if>
<if test="serviceType != null and serviceType != ''">and service_type = #{serviceType}</if>
<if test="serviceTypes != null and serviceTypes != ''">and service_type IN (#{serviceTypes})</if>
- <if test="deptcode != null and deptcode != ''">and deptcode = #{deptcode}</if>
- <if test="deptname != null and deptname != ''">and deptname = #{deptname}</if>
+ <if test="leaveldeptcode != null and leaveldeptcode != ''">and leaveldeptcode = #{leaveldeptcode}</if>
+ <if test="leaveldeptname != null and leaveldeptname != ''">and leaveldeptname = #{leaveldeptname}</if>
<if test="isabnormal != null">and isabnormal = #{isabnormal}</if>
<if test="leavehospitaldistrictcode != null and leavehospitaldistrictcode != ''">and
leavehospitaldistrictcode = #{leavehospitaldistrictcode}
@@ -917,8 +937,8 @@
</if>
<if test="orgid != null and orgid != ''">AND ss.orgid = #{orgid}</if>
<if test="campusid != null and campusid != ''">and ss.campusid = #{campusid}</if>
- <if test="deptcode != null and deptcode != ''">and ss.deptcode = #{deptcode}</if>
- <if test="deptname != null and deptname != ''">and ss.deptname = #{deptname}</if>
+ <if test="leaveldeptcode != null and leaveldeptcode != ''">and ss.leaveldeptcode = #{leaveldeptcode}</if>
+ <if test="leaveldeptname != null and leaveldeptname != ''">and ss.leaveldeptname = #{leaveldeptname}</if>
<if test="isabnormal != null">and ss.isabnormal = #{isabnormal}</if>
<if test="leavehospitaldistrictcode != null and leavehospitaldistrictcode != ''">and
ss.leavehospitaldistrictcode = #{leavehospitaldistrictcode}
@@ -980,8 +1000,8 @@
<if test="serviceType != null and serviceType != ''">and service_type = #{serviceType}</if>
<if test="serviceTypes != null and serviceTypes != ''">and service_type IN (#{serviceTypes})</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="leaveldeptcode != null and leaveldeptcode != ''">and leaveldeptcode = #{leaveldeptcode}</if>
+ <if test="leaveldeptname != null and leaveldeptname != ''">and leaveldeptname = #{leaveldeptname}</if>
<if test="leavehospitaldistrictcode != null and leavehospitaldistrictcode != ''">and
leavehospitaldistrictcode = #{leavehospitaldistrictcode}
</if>
@@ -1053,7 +1073,11 @@
<if test="recordid != null">recordid,</if>
<if test="exrecallcount != null">exrecallcount,</if>
<if test="pulltime != null">pulltime,</if>
- <if test="deptcode != null">deptcode,</if>
+ <if test="leaveldeptcode != null">leaveldeptcode,</if>
+ <if test="hospitaldistrictcode != null and hospitaldistrictcode != ''">hospitaldistrictcode,</if>
+ <if test="hospitaldistrictname != null and hospitaldistrictname != ''">hospitaldistrictname,</if>
+ <if test="deptcode != null and deptcode != ''">deptcode,</if>
+ <if test="deptname != null and deptname != ''">deptname,</if>
<if test="labelstatus != null">labelstatus,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
@@ -1078,7 +1102,7 @@
<if test="wechat != null and wechat != ''">wechat,</if>
<if test="roomno != null and roomno != ''">roomno,</if>
<if test="admindate != null">admindate,</if>
- <if test="deptname != null and deptname != ''">deptname,</if>
+ <if test="leaveldeptname != null and leaveldeptname != ''">leaveldeptname,</if>
<if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code,</if>
<if test="leavediagname != null and leavediagname != ''">leavediagname,</if>
<if test="libtemplateid != null ">libtemplateid,</if>
@@ -1153,7 +1177,11 @@
<if test="recordid != null">#{recordid},</if>
<if test="exrecallcount != null">#{exrecallcount},</if>
<if test="pulltime != null">#{pulltime},</if>
- <if test="deptcode != null">#{deptcode},</if>
+ <if test="leaveldeptcode != null">#{leaveldeptcode},</if>
+ <if test="hospitaldistrictcode != null and hospitaldistrictcode != ''">#{hospitaldistrictcode},</if>
+ <if test="hospitaldistrictname != null and hospitaldistrictname != ''">#{hospitaldistrictname},</if>
+ <if test="deptcode != null and deptcode != ''">#{deptcode},</if>
+ <if test="deptname != null and deptname != ''">#{deptname},</if>
<if test="labelstatus != null">#{labelstatus},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
@@ -1178,7 +1206,7 @@
<if test="wechat != null and wechat != ''">#{wechat},</if>
<if test="roomno != null and roomno != ''">#{roomno},</if>
<if test="admindate != null ">#{admindate},</if>
- <if test="deptname != null and deptname != ''">#{deptname},</if>
+ <if test="leaveldeptname != null and leaveldeptname != ''">#{leaveldeptname},</if>
<if test="leaveicd10code != null and leaveicd10code != ''">#{leaveicd10code},</if>
<if test="leavediagname != null and leavediagname != ''">#{leavediagname},</if>
<if test="libtemplateid != null ">#{libtemplateid},</if>
@@ -1266,7 +1294,7 @@
<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="leaveldeptcode != null">leaveldeptcode = #{leaveldeptcode},</if>
<if test="labelstatus != null">labelstatus = #{labelstatus},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
@@ -1291,7 +1319,7 @@
<if test="wechat != null and wechat != ''">wechat = #{wechat},</if>
<if test="roomno != null and roomno != ''">roomno = #{roomno},</if>
<if test="admindate != null ">admindate = #{admindate},</if>
- <if test="deptname != null and deptname != ''">deptname = #{deptname},</if>
+ <if test="leaveldeptname != null and leaveldeptname != ''">leaveldeptname = #{leaveldeptname},</if>
<if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if>
<if test="leavediagname != null and leavediagname != ''">leavediagname = #{leavediagname},</if>
<if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if>
@@ -1391,7 +1419,7 @@
<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="leaveldeptcode != null">leaveldeptcode = #{leaveldeptcode},</if>
<if test="labelstatus != null">labelstatus = #{labelstatus},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
@@ -1416,7 +1444,7 @@
<if test="wechat != null and wechat != ''">wechat = #{wechat},</if>
<if test="roomno != null and roomno != ''">roomno = #{roomno},</if>
<if test="admindate != null">admindate = #{admindate},</if>
- <if test="deptname != null and deptname != ''">deptname = #{deptname},</if>
+ <if test="leaveldeptname != null and leaveldeptname != ''">leaveldeptname = #{leaveldeptname},</if>
<if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if>
<if test="leavediagname != null and leavediagname != ''">leavediagname = #{leavediagname},</if>
<if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if>
@@ -1498,7 +1526,7 @@
<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="leaveldeptcode != null">leaveldeptcode = #{leaveldeptcode},</if>
<if test="labelstatus != null">labelstatus = #{labelstatus},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
@@ -1525,7 +1553,7 @@
<if test="wechat != null and wechat != ''">wechat = #{wechat},</if>
<if test="roomno != null and roomno != ''">roomno = #{roomno},</if>
<if test="admindate != null">admindate = #{admindate},</if>
- <if test="deptname != null and deptname != ''">deptname = #{deptname},</if>
+ <if test="leaveldeptname != null and leaveldeptname != ''">leaveldeptname = #{leaveldeptname},</if>
<if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if>
<if test="leavediagname != null and leavediagname != ''">leavediagname = #{leavediagname},</if>
<if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if>
@@ -1611,7 +1639,7 @@
<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="leaveldeptcode != null">leaveldeptcode = #{leaveldeptcode},</if>
<if test="labelstatus != null">labelstatus = #{labelstatus},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
@@ -1638,7 +1666,7 @@
<if test="admindate != null ">admindate = #{admindate},</if>
<if test="visitCount != null ">visit_count = #{visitCount},</if>
<if test="isVisitAgain != null ">is_visit_again = #{isVisitAgain},</if>
- <if test="deptname != null and deptname != ''">deptname = #{deptname},</if>
+ <if test="leaveldeptname != null and leaveldeptname != ''">leaveldeptname = #{leaveldeptname},</if>
<if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if>
<if test="leavediagname != null and leavediagname != ''">leavediagname = #{leavediagname},</if>
<if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if>
@@ -1747,8 +1775,8 @@
management_doctor,
leavehospitaldistrictcode,
leavehospitaldistrictname,
- deptcode,
- deptname,
+ leaveldeptcode,
+ leaveldeptname,
sendstate,
preachform,
<include refid="effectiveCurrentPreachformExpr"/> AS current_preachform,
@@ -1799,7 +1827,7 @@
</foreach>
</if>
<if test="deptcodes != null and deptcodes.size() > 0">
- AND deptcode IN
+ AND leaveldeptcode IN
<foreach collection="deptcodes" item="deptcode" open="(" separator=","
close=")">
#{deptcode}
@@ -1924,7 +1952,7 @@
</foreach>
</if>
<if test="deptcodes != null and deptcodes.size() > 0">
- AND b.deptcode IN
+ AND b.leaveldeptcode IN
<foreach collection="deptcodes" item="deptcode" open="(" separator=","
close=")">
#{deptcode}
@@ -1989,7 +2017,7 @@
</foreach>
</if>
<if test="deptcodes != null and deptcodes.size() > 0">
- AND deptcode IN
+ AND leaveldeptcode IN
<foreach collection="deptcodes" item="deptcode" open="(" separator=","
close=")">
#{deptcode}
@@ -2050,8 +2078,8 @@
drname,
leavehospitaldistrictcode,
leavehospitaldistrictname,
- deptcode,
- deptname,
+ leaveldeptcode,
+ leaveldeptname,
sendstate,
preachform,
<include refid="effectiveCurrentPreachformExpr"/> AS current_preachform,
@@ -2102,7 +2130,7 @@
</foreach>
</if>
<if test="deptcodes != null and deptcodes.size() > 0">
- AND deptcode IN
+ AND leaveldeptcode IN
<foreach collection="deptcodes" item="deptcode" open="(" separator=","
close=")">
#{deptcode}
@@ -2181,7 +2209,7 @@
AND leavehospitaldistrictcode = #{leavehospitaldistrictcode}
</if>
<if test="deptcode != null and deptcode != ''">
- AND deptcode = #{deptcode}
+ AND leaveldeptcode = #{deptcode}
</if>
<if test="isManuallyCalled != null">
AND is_manually_called = #{isManuallyCalled}
@@ -2218,7 +2246,7 @@
</foreach>
</if>
<if test="deptcodes != null and deptcodes.size() > 0">
- AND deptcode IN
+ AND leaveldeptcode IN
<foreach collection="deptcodes" item="deptcode" open="(" separator=","
close=")">
#{deptcode}
@@ -2265,7 +2293,7 @@
</foreach>
</if>
<if test="deptcodes != null and deptcodes.size() > 0">
- AND deptcode IN
+ AND leaveldeptcode IN
<foreach collection="deptcodes" item="deptcode" open="(" separator=","
close=")">
#{deptcode}
@@ -2301,7 +2329,7 @@
</foreach>
</if>
<if test="deptcodes != null and deptcodes.size() > 0">
- AND deptcode IN
+ AND leaveldeptcode IN
<foreach collection="deptcodes" item="deptcode" open="(" separator=","
close=")">
#{deptcode}
@@ -2358,7 +2386,7 @@
</foreach>
</if>
<if test="deptcodes != null and deptcodes.size() > 0">
- AND t.deptcode IN
+ AND t.leaveldeptcode IN
<foreach collection="deptcodes" item="deptcode" open="(" separator=","
close=")">
#{deptcode}
@@ -2444,7 +2472,7 @@
</foreach>
</if>
<if test="deptcodes != null and deptcodes.size() > 0">
- AND ss.deptcode IN
+ AND ss.leaveldeptcode IN
<foreach collection="deptcodes" item="deptcode" open="(" separator=","
close=")">
#{deptcode}
@@ -2516,7 +2544,7 @@
</foreach>
</if>
<if test="deptcodes != null and deptcodes.size() > 0">
- AND ss.deptcode IN
+ AND ss.leaveldeptcode IN
<foreach collection="deptcodes" item="deptcode" open="(" separator=","
close=")">
#{deptcode}
@@ -2567,7 +2595,7 @@
</foreach>
</if>
<if test="deptcodes != null and deptcodes.size() > 0">
- AND ss.deptcode IN
+ AND ss.leaveldeptcode IN
<foreach collection="deptcodes" item="deptcode" open="(" separator="," close=")">
#{deptcode}
</foreach>
@@ -2598,7 +2626,7 @@
</choose>
</if>
<if test="statisticaltype != null and statisticaltype == 2 and deptcode != null and deptcode != ''">
- AND ss.deptcode = #{deptcode}
+ AND ss.leaveldeptcode = #{deptcode}
</if>
<if test="statisticaltype != null and statisticaltype == 3 and taskId != null">
AND ss.taskid = #{taskId}
@@ -2609,7 +2637,7 @@
AND ss.leavehospitaldistrictcode = #{leavehospitaldistrictcode}
</if>
<if test="deptcode != null and deptcode != ''">
- AND ss.deptcode = #{deptcode}
+ AND ss.leaveldeptcode = #{deptcode}
</if>
<if test="taskId != null">
AND ss.taskid = #{taskId}
@@ -2699,7 +2727,7 @@
recordid,
exrecallcount,
pulltime,
- deptcode,
+ leaveldeptcode,
labelstatus,
del_flag,
upid,
@@ -2729,7 +2757,7 @@
admindate,
patid,
service_type,
- deptname,
+ leaveldeptname,
score,
drname,
drcode,
@@ -2789,7 +2817,7 @@
</select>
<select id="getDeptRanking" parameterType="com.smartor.domain.PatMedReq" resultType="com.smartor.domain.PatMedRes">
- SELECT deptname,
+ SELECT leaveldeptname AS deptname,
count(1) AS rc
FROM service_subtask
WHERE DATE_FORMAT(visit_time, '%Y-%m-%d') >= #{startDate}
@@ -2802,7 +2830,7 @@
<if test="campusid != null and campusid != ''">
AND campusid = #{campusid}
</if>
- GROUP BY deptname
+ GROUP BY leaveldeptname
</select>
<!-- 鏈嶅姟缁熻鏌ヨ - 鎸夋椂闂寸淮搴︾粺璁″嚭闄�/闂ㄨ瘖闅忚鏁版嵁 -->
@@ -2853,7 +2881,7 @@
AND campusid = #{campusid}
</if>
<if test="deptcodes != null and deptcodes.size() > 0">
- AND deptcode IN
+ AND leaveldeptcode IN
<foreach collection="deptcodes" item="deptcode" open="(" separator="," close=")">
#{deptcode}
</foreach>
@@ -3018,7 +3046,7 @@
</foreach>
</if>
<if test=" leaveldeptcodes != null and leaveldeptcodes.size()>0">
- AND deptcode IN
+ AND leaveldeptcode IN
<foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
close=")">
#{leaveldeptcode}
@@ -3040,7 +3068,7 @@
OR
</if>
<if test=" leaveldeptcodes != null and leaveldeptcodes.size()>0">
- deptcode IN
+ leaveldeptcode IN
<foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
close=")">
#{leaveldeptcode}
@@ -3143,14 +3171,14 @@
</foreach>
</if>
<if test="leaveldeptcodes != null and leaveldeptcodes.size() > 0">
- AND deptcode IN
+ AND leaveldeptcode IN
<foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator="," close=")">
#{leaveldeptcode}
</foreach>
</if>
</if>
- <if test="deptcode != null and deptcode != ''">
- AND deptcode = #{deptcode}
+ <if test="leaveldeptcode != null and leaveldeptcode != ''">
+ AND leaveldeptcode = #{leaveldeptcode}
</if>
<if test="sendstate != null">
AND sendstate = #{sendstate}
@@ -3214,7 +3242,7 @@
AND date_format( visit_time, '%y%m%d' ) <= date_format(#{endDate},'%y%m%d')
</if>
<if test="deptcodeList != null and deptcodeList.size()>0">
- and deptcode in
+ and leaveldeptcode in
<foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
#{deptcode}
</foreach>
@@ -3288,7 +3316,7 @@
OR
</if>
<if test=" leaveldeptcodes != null and leaveldeptcodes.size()>0">
- ss.deptcode IN
+ ss.leaveldeptcode IN
<foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
close=")">
#{leaveldeptcode}
@@ -3336,7 +3364,7 @@
OR
</if>
<if test="deptcodes != null and deptcodes.size() > 0">
- deptcode IN
+ leaveldeptcode IN
<foreach collection="deptcodes" item="deptcode" open="(" separator=","
close=")">
#{deptcode}
@@ -3386,14 +3414,14 @@
parameterType="com.smartor.domain.VO.ServiceSubtaskCotinueCountVO"
resultType="java.util.Map">
SELECT
- deptcode AS groupCode,
- deptname AS groupName,
+ leaveldeptcode AS groupCode,
+ leaveldeptname AS groupName,
SUM(CASE WHEN continue_flag = 1 THEN 1 ELSE 0 END) AS noContinueCnt,
SUM(CASE WHEN continue_flag = 2 THEN 1 ELSE 0 END) AS continueCnt
FROM service_subtask
WHERE del_flag = 0
AND continue_flag IN (1, 2)
- AND deptcode IS NOT NULL AND deptcode != ''
+ AND leaveldeptcode IS NOT NULL AND leaveldeptcode != ''
<if test="orgid != null and orgid != ''">
AND orgid = #{orgid}
</if>
@@ -3401,12 +3429,12 @@
AND campusid = #{campusid}
</if>
<if test="deptcodes != null and deptcodes.size() > 0">
- AND deptcode IN
+ AND leaveldeptcode IN
<foreach collection="deptcodes" item="code" open="(" separator="," close=")">
#{code}
</foreach>
</if>
- GROUP BY deptcode, deptname
+ GROUP BY leaveldeptcode, leaveldeptname
ORDER BY groupCode
</select>
@@ -3419,8 +3447,8 @@
leavehospitaldistrictname AS groupName,
</when>
<otherwise>
- deptcode AS groupCode,
- deptname AS groupName,
+ leaveldeptcode AS groupCode,
+ leaveldeptname AS groupName,
</otherwise>
</choose>
COUNT(*) AS totalCount,
@@ -3457,12 +3485,12 @@
</when>
<otherwise>
<if test="deptcodes != null and deptcodes.size() > 0">
- AND deptcode IN
+ AND leaveldeptcode IN
<foreach collection="deptcodes" item="code" open="(" separator="," close=")">
#{code}
</foreach>
</if>
- GROUP BY deptcode, deptname
+ GROUP BY leaveldeptcode, leaveldeptname
ORDER BY groupCode
</otherwise>
</choose>
@@ -3609,8 +3637,8 @@
drname,
leavehospitaldistrictcode,
leavehospitaldistrictname,
- deptcode,
- deptname,
+ leaveldeptcode,
+ leaveldeptname,
sendstate,
preachform,
current_preachform,
@@ -3664,7 +3692,7 @@
</foreach>
</if>
<if test="deptcodes != null and deptcodes.size() > 0">
- AND deptcode IN
+ AND leaveldeptcode IN
<foreach collection="deptcodes" item="deptcode" open="(" separator=","
close=")">
#{deptcode}
@@ -3855,8 +3883,8 @@
t.task_name AS taskName,
d.asrtext AS optionresult,
d.score AS score,
- s.deptcode AS deptcode,
- s.deptname AS deptname,
+ s.leaveldeptcode AS deptcode,
+ s.leaveldeptname AS deptname,
s.leavehospitaldistrictcode AS leavehospitaldistrictcode,
s.leavehospitaldistrictname AS leavehospitaldistrictname,
d.targetvalue AS targetvalue,
@@ -3963,8 +3991,8 @@
d.targetvalue,
d.asrtext,
t.task_name,
- s.deptcode,
- s.deptname,
+ s.leaveldeptcode,
+ s.leaveldeptname,
s.leavehospitaldistrictcode,
s.leavehospitaldistrictname,
d.value_type
@@ -3976,7 +4004,7 @@
<select id="statQuestionOptionByKsOrBq" resultType="com.smartor.domain.DTO.QuestionCountKsOrBqDTO"
parameterType="com.smartor.domain.VO.QuestionCountKsOrBqVO">
SELECT
- s.deptname AS deptname,
+ IFNULL(s.leaveldeptname, s.deptname) AS deptname,
s.leavehospitaldistrictname AS leavehospitaldistrictname,
d.questiontext AS questionText,
d.targetvalue AS targetvalue, -- 鎵�鏈夐�夐」鎷兼帴
@@ -4006,7 +4034,7 @@
</foreach>
</if>
<if test=" leaveldeptcodes != null and leaveldeptcodes.size()>0">
- AND deptcode IN
+ AND leaveldeptcode IN
<foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
close=")">
#{leaveldeptcode}
@@ -4023,7 +4051,7 @@
</foreach>
</if>
<if test=" leaveldeptcodes != null and leaveldeptcodes.size()>0">
- OR deptcode IN
+ OR leaveldeptcode IN
<foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
close=")">
#{leaveldeptcode}
@@ -4058,8 +4086,8 @@
s.leavehospitaldistrictname AS name,
</when>
<otherwise>
- s.deptcode AS code,
- s.deptname AS name,
+ s.leaveldeptcode AS code,
+ s.leaveldeptname AS name,
</otherwise>
</choose>
CAST(d.score AS DECIMAL(10,4)) AS w
@@ -4112,10 +4140,10 @@
</if>
</when>
<otherwise>
- AND s.deptcode IS NOT NULL AND s.deptcode <> ''
- AND s.deptname IS NOT NULL AND s.deptname <> ''
+ AND s.leaveldeptcode IS NOT NULL AND s.leaveldeptcode <> ''
+ AND s.leaveldeptname IS NOT NULL AND s.leaveldeptname <> ''
<if test="deptCodes != null and deptCodes.size() > 0">
- AND s.deptcode IN
+ AND s.leaveldeptcode IN
<foreach collection="deptCodes" item="deptCode" open="(" separator="," close=")">
#{deptCode}
</foreach>
--
Gitblit v1.9.3