From d44eab2d72314934ef08963863d4b6082056b8ff Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 09 十一月 2026 14:30:14 +0800
Subject: [PATCH] feat: 统一档案随访周期 followupPeriod
---
smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java b/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java
index 4c633bf..0226f1c 100644
--- a/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java
@@ -111,10 +111,14 @@
/**
* 闅忚鍙婃椂鐜囷紙鎸� groupKey 鍒嗙粍鎵归噺缁熻锛�
* <p>
- * rate锛氬嚭闄㈡椂闂�(endtime)璧� rateDay + 琛ュ伩澶╂暟 鍐呭畬鎴愰殢璁跨殑鍗犳瘮銆�
+ * rate锛氬畬鎴愭椂闂�(finishtime) 涓嶆櫄浜庡強鏃剁巼鍩哄噯鐨勫崰姣旓紝鍒嗘瘝涓哄簲闅忚鏁般��
+ * 闈炰换鍔＄粍(appltype != 5)锛歟ndtime + send_day(缂虹渷1) + 危琛ュ伩澶╂暟 + 1 澶╋紱
+ * 浠诲姟缁�(appltype = 5)锛氭寜 schedule_benchmark 瑙ｆ瀽鍩哄噯鏃堕棿
+ * (1-鍏ラ櫌 2-鍑洪櫌 3-灏辫瘖 4-鍏ョ粍 0/鍏跺畠-鑷畾涔夋椂闂�) + day_offset
+ * + 危琛ュ伩澶╂暟 + 1 澶╋紙涓嶅彔鍔� send_day锛夈��
* 琛ュ伩澶╂暟鍙栬嚜 service_subtask_preachform.compensate_time 鎸夊瓙浠诲姟姹傚拰锛�
* 鐢ㄥ瓙浠诲姟蹇収鑰岄潪 service_task.preachform_desc锛屼繚璇佸巻鍙叉暟鎹笉闅忎换鍔℃敼閰嶇疆鑰屽彉鍔ㄣ��
- * rateDay 涓虹┖鏃� rate 杩斿洖 NULL銆�
+ * rateDay 鍙傛暟涓嶅啀鍙備笌璇ュ彛寰勩��
* <p>
* finishRate锛氬簲闅忚鏃堕棿(visit_time) <= 瀹為檯瀹屾垚鏃堕棿(finishtime) 鐨勫崰姣旓紝褰撳墠鏈闅忚缁熻浣跨敤銆�
*
@@ -143,6 +147,14 @@
public Boolean updateServiceSubtaskByCondition(ServiceSubtask ServiceSubtask);
+ /**
+ * 寰俊鍏紬鍙峰凡棰嗗彇鏈～鍐欐寜榛樿閫夐」瀹屾垚锛氬彧鏇存柊褰撳墠瀛愪换鍔★紝涓斿彧鍏佽 sendstate=1銆佹湭鎻愪氦鐨勬暟鎹��
+ *
+ * @param serviceSubtask 蹇呭～ id銆乫inishtime銆乺esult銆乺emark
+ * @return 褰卞搷琛屾暟
+ */
+ public int updateWechatDefaultComplete(ServiceSubtask serviceSubtask);
+
public Boolean updateServiceSubtaskByTaskGuid(ServiceSubtask ServiceSubtask);
/**
@@ -166,6 +178,18 @@
public int deleteUnfinishedServiceSubtaskByInhospids(@Param("patid") Long patid,
@Param("inhospids") List<Long> inhospids,
@Param("sendstates") List<Long> sendstates);
+
+ /**
+ * 缁熻鎮ｈ�呮寚瀹氫换鍔′笅鏈畬鎴愮殑闅忚浠诲姟鏁伴噺锛堢敤浜庝汉宸ラ殢璁块噸澶嶆牎楠岋級
+ *
+ * @param patid 鎮ｈ�匢D
+ * @param taskid 浠诲姟ID
+ * @param sendstates 鏈畬鎴愮姸鎬侀泦鍚�
+ * @return 鏈畬鎴愪换鍔℃暟閲�
+ */
+ int countUnfinishedServiceSubtaskByPatidAndTaskid(@Param("patid") Long patid,
+ @Param("taskid") Long taskid,
+ @Param("sendstates") List<Long> sendstates);
/**
* 鍒犻櫎鍗曚竴浠诲姟锛堥殢璁匡級
@@ -209,6 +233,14 @@
*/
public List<ServiceSubtaskScriptCount> getSfStatisticsScriptItemDetails(ServiceSubtaskCountReq serviceSubtaskCountReq);
+ /**
+ * 闂閫夐」鏁板瓧涓嬮捇锛氭煡璇㈤�夋嫨浜嗘寚瀹氶�夐」鐨� service_subtask 鍒楄〃
+ *
+ * @param serviceSubtaskCountReq 缁熻缁村害銆佺瀹�/鐥呭尯銆佷换鍔°�侀鐩強閫夐」鏉′欢
+ * @return service_subtask 鍒楄〃
+ */
+ public List<ServiceSubtask> getSfStatisticsScriptDetailsHyperlink(ServiceSubtaskCountReq serviceSubtaskCountReq);
+
public List<PatMedRes> getDeptRanking(PatMedReq patMedReq);
--
Gitblit v1.9.3