From 88d4cd31fa5b197a91ed081ba1df292420af2d05 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 22 十月 2026 16:48:52 +0800
Subject: [PATCH] 【丽水】随访统计增加一列，及时随访，统计未超时且已完成的随访人次
---
smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java b/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
index 715042b..2ec5625 100644
--- a/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
+++ b/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
@@ -69,6 +69,8 @@
public Map<String, Object> patItemCount(ServiceSubtaskEntity serviceSubtaskEntity);
+ public Map<String, Object> countByCondition(ServiceSubtaskEntity serviceSubtaskEntity);
+
/**
* 鏂板鍗曚竴浠诲姟锛堥殢璁匡級
*
@@ -84,6 +86,16 @@
* @return 缁撴灉
*/
public String addSubTaskAgain(ServiceSubtask ServiceSubtask);
+
+ /**
+ * 棣栨闅忚浠诲姟瓒呮椂鍚庯紝鎸変笅涓�浠诲姟鑷姩鐢熸垚鍐嶆闅忚浠诲姟锛堥殢璁夸腑蹇冿級銆�
+ * <p>
+ * 涓庢墜鍔ㄥ叆鍙ｇ殑宸紓锛氶殢璁夸腑蹇冪瀹ゆ湭閰嶇疆鏃跺洖閫�鍘熶换鍔＄瀹わ紱鍚屼竴鍘熶换鍔″彧鐢熸垚涓�鏉★紙閿� + 鏉′欢鏇存柊骞傜瓑锛夈��
+ *
+ * @param serviceSubtask 宸茶秴鏃剁殑棣栨闅忚瀛愪换鍔�
+ * @return 缁撴灉鎻忚堪
+ */
+ public String addSubTaskAgainByDeadline(ServiceSubtask serviceSubtask);
/**
* 淇敼鍗曚竴浠诲姟锛堥殢璁匡級
@@ -194,6 +206,13 @@
public List<ServiceSubtaskDiagname> convertToDiagnameList(List<ServiceSubtask> subtaskList);
+ /**
+ * 缁熻浠诲姟鍚勭鐘舵�佺殑鏁伴噺 -銆愰殢璁垮伐浣滃彴銆�
+ *
+ * @param entity 鏌ヨ鏉′欢锛堢瀹�/鐥呭尯鏉冮檺銆乻oonTimeoutHours 鍗冲皢瓒呮椂灏忔椂鏁扮瓑锛�
+ * @return 鍚� pendingVisitCount銆乫ailedVisitCount銆乤bnormalVisitCount銆亀arnningVisitCount銆�
+ * allVisitCount銆乻oonTimeoutCount 鐨勭粺璁＄粨鏋�
+ */
public Map<String, Object> getCurrentUserServiceSubtaskCount(ServiceSubtaskEntity entity);
/**
@@ -220,13 +239,27 @@
Map<String, Object> smsSubTask(Long subid);
+ Map<String, Object> weChatSubTask(Long subid);
+
/**
* 缁熻闂鐨勯�夐」鐨勭櫨鍒嗘瘮 (鐢ㄤ簬鏈嶅姟绫诲瀷 2)
*
- * @param taskIds
+ * @param taskIds 浠诲姟 ID 鍒楄〃
+ * @param subtaskIds 瀛愪换鍔� ID 鍒楄〃锛堝彲閫夛級锛氫紶浜嗗氨鍙粺璁¤繖鎵瑰瓙浠诲姟锛堟湰娆″鍑虹殑鎮ｈ�咃級锛屽垎姣嶄篃鐢ㄥ悓涓�鎵规暟鎹�
* @return
*/
- public List<ServiceSubtaskDetailRatioExport> statQuestionOption(List<Long> taskIds, Date startFinishTime, Date endFinishTime, Date startOutHospTime, Date endOutHospTime, String scriptContent, Double scoreStart, Double scoreEnd, String valueType);
+ public List<ServiceSubtaskDetailRatioExport> statQuestionOption(List<Long> taskIds, Date startFinishTime, Date endFinishTime, Date startOutHospTime, Date endOutHospTime, String scriptContent, Double scoreStart, Double scoreEnd, String valueType, List<Long> subtaskIds);
+
+ /**
+ * 瀵煎嚭銆岄棶棰樿鎯呭崰姣斻�嶄笓鐢ㄧ粺璁★紙鍙粺璁℃湰娆″鍑虹殑杩欐壒鎮ｈ�咃級
+ * <p>
+ * 鏁伴噺 = 閫夋嫨璇ラ�夐」鐨勬偅鑰呮暟锛涙瘮渚� = 鏁伴噺 / 璇ラ浣滅瓟鎮ｈ�呮暟锛涘垎鏁� = 璇ラ�夐」鏄庣粏 score 涔嬪拰锛�
+ * 浠诲姟鍚嶇О/浠诲姟缂栧彿 = service_task.task_name / taskid銆�
+ *
+ * @param subtaskIds 鏈瀵煎嚭鐨勫瓙浠诲姟 ID
+ * @param questiontext 闂鍐呭锛堝彲閫夛級
+ */
+ public List<ServiceSubtaskDetailRatioExport> statMydQuestionOptionForExport(List<Long> subtaskIds, String questiontext);
/**
* 鏍规嵁瀛愪换鍔� ID 缁熻闂鐨勯�夐」鐨勭櫨鍒嗘瘮锛堢敤浜庢弧鎰忓害缁熻 serviceType=6锛�
--
Gitblit v1.9.3