From 4b81304e73c093795ae418cfb4ce537b603660c9 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 16 四月 2026 09:36:46 +0800
Subject: [PATCH] 修改任务模板的基本templateid不存在,去基本模板查询

---
 smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java |   27 ++++++++++++++++++++++-----
 1 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java b/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
index aa1eca1..4bf23c9 100644
--- a/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
+++ b/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
@@ -3,6 +3,8 @@
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.smartor.domain.*;
 import com.smartor.domain.ServiceSubtask;
+import com.smartor.domain.VO.ServiceSubtaskCotinueCountVO;
+import com.smartor.domain.entity.ServiceSubtaskEntity;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
@@ -31,9 +33,9 @@
      * @param serviceSubtaskVO 鍗曚竴浠诲姟锛堥殢璁匡級
      * @return 鍗曚竴浠诲姟锛堥殢璁匡級闆嗗悎
      */
-    public List<ServiceSubtask> selectServiceSubtaskList(ServiceSubtaskVO serviceSubtaskVO);
+    public List<ServiceSubtask> selectServiceSubtaskList(ServiceSubtaskEntity serviceSubtaskVO);
 
-    public List<ServiceSubtask> selectServiceSubtaskListAgain(ServiceSubtaskVO serviceSubtaskVO);
+    public List<ServiceSubtask> selectServiceSubtaskListAgain(ServiceSubtaskEntity serviceSubtaskVO);
 
     /**
      * 鏍规嵁鏉′欢鏌ヨ浠诲姟淇℃伅
@@ -46,11 +48,11 @@
     /**
      * 鏌ヨ鎮h�呴殢璁夸俊鎭�
      */
-    public List<ServiceSubtask> patItem(ServiceSubtaskVO serviceSubtaskVO);
+    public List<ServiceSubtaskRes> patItem(ServiceSubtaskEntity serviceSubtaskEntity);
 
-    public List<ServiceSubtask> patItem2(ServiceSubtaskVO serviceSubtaskVO);
+    public List<ServiceSubtask> patItem2(ServiceSubtaskEntity serviceSubtaskEntity);
 
-    public Map<String, Object> patItemCount(ServiceSubtaskVO serviceSubtaskVO);
+    public Map<String, Object> patItemCount(ServiceSubtaskEntity serviceSubtaskEntity);
 
     /**
      * 鏂板鍗曚竴浠诲姟锛堥殢璁匡級
@@ -139,7 +141,22 @@
 
     public List<ServiceStatisticsResponse> getServiceStatistics(ServiceStatisticsRequest request);
 
+    public List<ServiceSubtaskStatistic> getSfStatisticsScript(ServiceSubtaskCountReq serviceSubtaskCountReq);
+
+    public Map<String, ServiceSubtaskScriptCount> getSfStatisticsScriptDetails(ServiceSubtaskCountReq serviceSubtaskCountReq);
+
     public List<PatArchiveSrmVO> sendMsgTemplate(List<PatArchiveSrmVO> patArchiveSrmVOS);
 
     public List<ServiceSubtaskDiagname> convertToDiagnameList(List<ServiceSubtask> subtaskList) ;
+
+    public Map<String, Object> getCurrentUserServiceSubtaskCount(ServiceSubtaskEntity entity);
+
+    /**
+     * 鎸夌梾鍖烘垨绉戝缁熻寤剁画鎶ょ悊鏁伴噺
+     * 閮戒笉浼犳椂鍚屾椂鎸夌梾鍖哄拰绉戝鍚勭粺璁′竴閬�
+     *
+     * @param vo 鏌ヨ鏉′欢锛坙eavehospitaldistrictcodes 涓� deptcodes 浜掓枼锛�
+     * @return noContinueCount銆丆ontinueCount 鍙� detail 鍒楄〃
+     */
+    Map<String, Object> getContinueNurseCount(ServiceSubtaskCotinueCountVO vo);
     }

--
Gitblit v1.9.3