Merge remote-tracking branch 'origin/master'

陈昶聿

11 小时以前 0d10bc99eec75672b049339399e4f762fbd9746e

 smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java

@@ -2,12 +2,16 @@

import com.ruoyi.common.core.domain.AjaxResult;
import com.smartor.domain.*;
import com.smartor.domain.DTO.QuestionResultDTO;
import com.smartor.domain.ServiceSubtask;
import com.smartor.domain.VO.HeLibraryCountVO;
import com.smartor.domain.VO.QuestionResultVO;
import com.smartor.domain.VO.ServiceSubtaskCotinueCountVO;
import com.smartor.domain.VO.TransferDeptVO;
import com.smartor.domain.entity.ServiceSubtaskEntity;
import org.springframework.web.bind.annotation.RequestBody;

import java.util.Date;
import java.util.List;
import java.util.Map;

@@ -51,6 +55,16 @@
     */
    public List<ServiceSubtaskRes> patItem(ServiceSubtaskEntity serviceSubtaskEntity);

    public List<ServiceSubtask> getServiceSubtasks(ServiceSubtaskEntity serviceSubtaskEntity);

    /**
     * 转移科室病区
     *
     * @param transferDeptVO
     * @return
     */
    public Integer transferDept(TransferDeptVO transferDeptVO);

    public List<ServiceSubtask> patItem2(ServiceSubtaskEntity serviceSubtaskEntity);

    public Map<String, Object> patItemCount(ServiceSubtaskEntity serviceSubtaskEntity);
@@ -61,7 +75,7 @@
     * @param ServiceSubtask 单一任务（随访）
     * @return 结果
     */
    public int insertServiceSubtask(ServiceSubtask ServiceSubtask);
    public Map<String, Object> insertServiceSubtask(ServiceSubtask ServiceSubtask);

    /**
     * 再次新增单一任务（随访）
@@ -81,6 +95,7 @@

    /**
     * 子任务模板修改
     *
     * @param serviceSubtaskTemplateVO
     * @return
     */
@@ -118,6 +133,20 @@
     * @return 结果
     */
    public PhoneCallBackYQVO phoneCallBackYQ(PhoneCallReqYQVO phoneCallReqYQVO);

    public PhoneCallBackSHVO getFirstQues(PhoneCallReqYQVO phoneCallReqYQVO);

    public PhoneCallBackSHVO processResust(PhoneCallResultYQVO phoneCallReqYQVO);

    /**
     * 问题结果占比
     *
     * @param QuestionResultVO
     * @param serviceSubtaskRes
     * @return
     */
    public List<ServiceSubtaskDetailRatioExport> getDetailRatio(QuestionResultVO questionResultVO, List<ServiceSubtaskRes> serviceSubtaskRes);


    /**
     * 雨绮任务拉取
@@ -192,9 +221,22 @@
    Map<String, Object> smsSubTask(Long subid);

    /**
     * 统计问题的选项的百分比
     * 统计问题的选项的百分比 (用于服务类型 2)
     *
     * @param taskIds
     * @return
     */
    public List<ServiceSubtaskDetailRatioExport> statQuestionOption(List<Long> taskIds);
    public List<ServiceSubtaskDetailRatioExport> statQuestionOption(List<Long> taskIds, Date startOutHospTime, Date endOutHospTime, String scriptContent, Double scoreStart, Double scoreEnd, String valueType);

    /**
     * 根据子任务 ID 统计问题的选项的百分比（用于满意度统计 serviceType=6）
     *
     * @param subtaskIds 子任务 ID 列表
     * @return
     */
    public List<ServiceSubtaskDetailRatioExport> statQuestionOptionBySubtaskIds(List<Long> subtaskIds, Date startOutHospTime, Date endOutHospTime, String scriptContent, Double scoreStart, Double scoreEnd, String valueType);

    public String scanGenerateSubtask(ServiceTask serviceTaskVo);

    public Integer matchOptionIndex(String url, String questionText, String voiceText, List<IvrTaskTemplateTargetoption> options, String uuid);
}