Merge branch 'master' into master-任务组

陈昶聿

昨天 fcb98e4558897945a316d04555923355b8e60605

 smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java

@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

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

@@ -248,9 +249,10 @@

    /**
     * 统计问题的选项的百分比
     *
     * @param taskIds
     * @return
     */
    List<ServiceSubtaskDetailRatioExport> statQuestionOption(@Param("taskIds") List<Long> taskIds);
    List<ServiceSubtaskDetailRatioExport> statQuestionOption(@Param("taskIds") List<Long> taskIds, @Param("startOutHospTime") Date startOutHospTime, @Param("endOutHospTime") Date endOutHospTime);

}