代码提交

liusheng

昨天 459aa78c84cf552ebea6ef056d978c2531d71ac8

 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java

@@ -9,6 +9,7 @@
import com.ruoyi.common.utils.RSAPublicKeyExample;
import com.ruoyi.common.utils.StringUtils;
import com.smartor.domain.*;
import com.smartor.domain.entity.ServiceSubtaskEntity;
import com.smartor.mapper.*;
import com.smartor.service.IServiceSubtaskAnswerService;
import com.smartor.service.IServiceTaskService;
@@ -177,7 +178,7 @@
            if (key.contains("-WJscriptCache")) {
                List<SvyTaskTemplateScriptVO> cacheList = redisCache.getCacheList(key);
                cacheList.sort(Comparator.comparingLong(SvyTaskTemplateScriptVO::getSort));
                log.error("问卷回答结果：{}", cacheList);
                log.info("问卷回答结果：{}", cacheList);
                for (int i = 0; i < cacheList.size(); i++) {
                    if (i == 0) {
                        //这个时间要找到第一题
@@ -272,7 +273,7 @@
            redisCache.deleteObject(key);

            //查询出该任务中正在执行的患者信息
            ServiceSubtaskVO ssVO = new ServiceSubtaskVO();
            ServiceSubtaskEntity ssVO = new ServiceSubtaskEntity();
            ssVO.setTaskid(tid);
            ssVO.setPatid(pid);
//            ssVO.setSendstate(3L);
@@ -540,7 +541,7 @@
                subId = Long.valueOf(serviceSubTaskCacheReq.getParam6());

        }
        ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
        ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
        serviceSubtaskVO.setTaskid(tid);
        serviceSubtaskVO.setPatid(pid);
        serviceSubtaskVO.setSubId(subId);
@@ -645,7 +646,7 @@

    private Map<String, String> setWJInfo(SvyTaskTemplateScriptVO svyTaskTemplateScriptVO, Long taskid, Long patid) {
        log.error("-----svyTaskTemplateScriptVO的值为：{}", svyTaskTemplateScriptVO);
        ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
        ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
        serviceSubtaskVO.setTaskid(taskid);
        serviceSubtaskVO.setPatid(patid);
        List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
@@ -683,6 +684,7 @@
        }
        ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(taskid);
        serviceSubtaskDetailVO.setQuestiontext(svyTaskTemplateScriptVO.getScriptContent());
        serviceSubtaskDetailVO.setCategoryid(svyTaskTemplateScriptVO.getCategoryid());
        serviceSubtaskDetailVO.setTaskid(Long.valueOf(taskid));
        serviceSubtaskDetailVO.setTargetid(svyTaskTemplateScriptVO.getTargetid() != null ? svyTaskTemplateScriptVO.getTargetid().intValue() : null);
        serviceSubtaskDetailVO.setPatid(Long.valueOf(patid));
@@ -717,6 +719,8 @@
    private Boolean sendTaskIds(List<Integer> sendTaskids, ServiceSubtask serviceSubtask) {
        for (Integer taskId : sendTaskids) {
            ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(Long.valueOf(taskId));
            if (Objects.isNull(serviceTask)) return false;

            String content = sendMQContent(serviceTask, null);
            //先查询一下，该患者在该service_task中，是否已经存在,如果已经存在，则不用再保存了
            ServiceSubtask ss = new ServiceSubtask();
@@ -745,6 +749,8 @@
        serviceSubtask.setTemplatename(serviceTask.getTemplatename());
        serviceSubtask.setTemplateid(serviceTask.getTemplateid());
        serviceSubtask.setSendstate(2L);
        serviceSubtask.setServiceType(serviceTask.getServiceType());
        serviceSubtask.setType(serviceTask.getType());
        serviceSubtask.setCurrentPreachform(null);
        serviceSubtask.setVisitTime(date);
        serviceSubtask.setId(null);
@@ -794,7 +800,7 @@
    }

    private Map<String, String> setSFInfo(IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO, Long taskid, Long patid) {
        ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
        ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
        serviceSubtaskVO.setTaskid(taskid);
        serviceSubtaskVO.setPatid(patid);
        List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);