From 5dcd6447f315e821727508cd26bf05f8220b39c8 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 09 四月 2026 13:54:47 +0800
Subject: [PATCH] Merge branch 'master' into master-手术随访

---
 smartor/src/main/java/com/smartor/service/IServiceSubtaskDetailTraceService.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/IServiceSubtaskDetailTraceService.java b/smartor/src/main/java/com/smartor/service/IServiceSubtaskDetailTraceService.java
index 9e76f15..3391fbd 100644
--- a/smartor/src/main/java/com/smartor/service/IServiceSubtaskDetailTraceService.java
+++ b/smartor/src/main/java/com/smartor/service/IServiceSubtaskDetailTraceService.java
@@ -7,6 +7,7 @@
 import com.smartor.domain.ServiceSubtaskDetailTrace;
 import com.smartor.domain.VO.DetailTraceDealVO;
 import com.smartor.domain.VO.SatisfactionExceptConfigQuestionReqVO;
+import com.smartor.domain.VO.ServiceSubtaskDetailTraceVO;
 import org.springframework.web.bind.annotation.RequestBody;
 
 /**
@@ -28,17 +29,17 @@
     /**
      * 鏌ヨ闅忚浠诲姟寮傚父璁板綍璺熻釜鍒楄〃
      *
-     * @param serviceSubtaskDetailTtrace 闅忚浠诲姟寮傚父璁板綍璺熻釜
+     * @param subtaskDetailTraceVO 闅忚浠诲姟寮傚父璁板綍璺熻釜
      * @return 闅忚浠诲姟寮傚父璁板綍璺熻釜闆嗗悎
      */
-    public List<ServiceSubtaskDetailTrace> selectServiceSubtaskDetailTtraceList(ServiceSubtaskDetailTrace serviceSubtaskDetailTtrace);
+    public List<ServiceSubtaskDetailTrace> selectServiceSubtaskDetailTtraceList(ServiceSubtaskDetailTraceVO subtaskDetailTraceVO);
 
     /**
      * 寮傚父闂澶勭悊鎯呭喌鏌ヨ
      * @param detailTraceDealVO
-     * @return
+     * @return 鍖呭惈鍒嗛〉鍒楄〃鍙婃眹鎬荤粺璁★紙totalException/noDealException/yesDealException锛夌殑Map
      */
-    public List<DetailTraceDealDTO> tracedeallist(DetailTraceDealVO detailTraceDealVO);
+    public Map<String, Object> tracedeallist(DetailTraceDealVO detailTraceDealVO);
 
     /**
      * 鏂板闅忚浠诲姟寮傚父璁板綍璺熻釜

--
Gitblit v1.9.3