From 274d8e2950e79e73b14783e497cdaf97f7dbb8d3 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 02 九月 2026 10:45:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java b/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
index f32a5fb..8662f84 100644
--- a/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
+++ b/smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
@@ -129,6 +129,10 @@
      */
     public PhoneCallBackYQVO phoneCallBackYQ(PhoneCallReqYQVO phoneCallReqYQVO);
 
+    public PhoneCallBackSHVO getFirstQues(PhoneCallReqYQVO phoneCallReqYQVO);
+
+    public PhoneCallBackSHVO processResust(PhoneCallResultYQVO phoneCallReqYQVO);
+
     /**
      * 闆ㄧ划浠诲姟鎷夊彇
      *
@@ -202,12 +206,22 @@
     Map<String, Object> smsSubTask(Long subid);
 
     /**
-     * 缁熻闂鐨勯�夐」鐨勭櫨鍒嗘瘮
+     * 缁熻闂鐨勯�夐」鐨勭櫨鍒嗘瘮 (鐢ㄤ簬鏈嶅姟绫诲瀷 2)
      *
      * @param taskIds
      * @return
      */
     public List<ServiceSubtaskDetailRatioExport> statQuestionOption(List<Long> taskIds, Date startOutHospTime, Date endOutHospTime);
 
+    /**
+     * 鏍规嵁瀛愪换鍔� ID 缁熻闂鐨勯�夐」鐨勭櫨鍒嗘瘮锛堢敤浜庢弧鎰忓害缁熻 serviceType=6锛�
+     *
+     * @param subtaskIds        瀛愪换鍔� ID 鍒楄〃
+     * @return
+     */
+    public List<ServiceSubtaskDetailRatioExport> statQuestionOptionBySubtaskIds(List<Long> subtaskIds, Date startOutHospTime, Date endOutHospTime);
+
     public String scanGenerateSubtask(ServiceTask serviceTaskVo);
+
+    public Integer matchOptionIndex(String url, String questionText, String voiceText, List<IvrTaskTemplateTargetoption> options, String uuid);
 }

--
Gitblit v1.9.3