Merge branch 'master' into master-任务组

陈昶聿

昨天 db2a00f5df9990e55ebbdf16cf8c68c3d64fe09d

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

@@ -198,4 +198,6 @@
     * @return
     */
    public List<ServiceSubtaskDetailRatioExport> statQuestionOption(List<Long> taskIds, Date startOutHospTime, Date endOutHospTime);

    public String scanGenerateSubtask(ServiceTask serviceTaskVo);
}