Merge branch 'master' of http://116.62.18.175:6699/r/smartor

liusheng

19 小时以前 e4872d9fdd9f277eacc518459418cb406570b99a

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

@@ -5,6 +5,7 @@
import com.smartor.domain.ServiceSubtask;
import com.smartor.domain.VO.HeLibraryCountVO;
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;

@@ -51,6 +52,13 @@
     * 查询患者随访信息
     */
    public List<ServiceSubtaskRes> patItem(ServiceSubtaskEntity serviceSubtaskEntity);

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

    public List<ServiceSubtask> patItem2(ServiceSubtaskEntity serviceSubtaskEntity);

@@ -120,6 +128,10 @@
     * @return 结果
     */
    public PhoneCallBackYQVO phoneCallBackYQ(PhoneCallReqYQVO phoneCallReqYQVO);

    public PhoneCallBackSHVO getFirstQues(PhoneCallReqYQVO phoneCallReqYQVO);

    public PhoneCallBackSHVO processResust(PhoneCallResultYQVO phoneCallReqYQVO);

    /**
     * 雨绮任务拉取
@@ -194,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);
}