【丽水】导出时间格式问题处理

陈昶聿

3 天以前 fbe0fc0d9ee2012f6083bd802670453d788002d6

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

@@ -21,6 +21,7 @@
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;

import java.math.BigDecimal;
@@ -163,178 +164,251 @@
        return serviceSubtaskAnswerMapper.deleteServiceSubtaskAnswerById(id);
    }

    /**
     * 保存问卷答案 (异步处理，快速返回)
     *
     * @param serviceSubTaskAnswerReq 答案请求
     * @param flag                    标志位
     * @return 结果
     */
    @Override
    @Async("threadPoolTaskExecutor")
    public Integer saveQuestionAnswer(ServiceSubTaskAnswerReq serviceSubTaskAnswerReq, Long flag) {
        Long tid = null;
        Long pid = null;
        Long subid = null;
        Double score = null;
        Long isabno = 0L;
        Set<String> allKeys = redisCache.getAllKeys();
        if (ObjectUtils.isNotEmpty(serviceSubTaskAnswerReq)) {
            //需要立即执行
            RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
        String threadName = Thread.currentThread().getName();
        log.info("[{}] 开始异步处理保存问卷答案", threadName);
        try {
            //参数解密
            Long tid = null;
            Long pid = null;
            Long subid = null;
            if (ObjectUtils.isNotEmpty(serviceSubTaskAnswerReq)) {
                RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();

            if (flag == 0) {
                tid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam1(), pri_key));
                pid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam2(), pri_key));
                if (StringUtils.isNotEmpty(serviceSubTaskAnswerReq.getParam6()))
                    subid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam6(), pri_key));
            } else if (flag == 1) {
                tid = Long.valueOf(serviceSubTaskAnswerReq.getParam1());
                pid = Long.valueOf(serviceSubTaskAnswerReq.getParam2());
                subid = Long.valueOf(serviceSubTaskAnswerReq.getParam6());
            }
            if (serviceSubTaskAnswerReq.getType() != null && serviceSubTaskAnswerReq.getType() == 2) {
                allKeys = new HashSet<>();
                allKeys.add(pid + "-" + tid + "-" + subid + "-WJscriptCache");
            } else if (serviceSubTaskAnswerReq.getType() != null && serviceSubTaskAnswerReq.getType() == 1) {
                allKeys = new HashSet<>();
                allKeys.add(pid + "-" + tid + "-" + subid + "-SFscriptCache");
            }
        }

        Long nextScriptno = null;
        aa:
        for (String key : allKeys) {
            String[] split = key.split("-");
            //先判断，是不是当前提交人的，不是当前提交人的，跳过
            try {
                if (ObjectUtils.isNotEmpty(split[0]) && ObjectUtils.isNotEmpty(split[1]) && !Long.valueOf(split[0]).equals(pid) && !Long.valueOf(split[1]).equals(tid) && !Objects.isNull(split[2]) && !Long.valueOf(split[2]).equals(subid)) {
                    continue;
                if (flag == 0) {
                    tid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam1(), pri_key));
                    pid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam2(), pri_key));
                    if (StringUtils.isNotEmpty(serviceSubTaskAnswerReq.getParam6()))
                        subid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam6(), pri_key));
                } else if (flag == 1) {
                    tid = Long.valueOf(serviceSubTaskAnswerReq.getParam1());
                    pid = Long.valueOf(serviceSubTaskAnswerReq.getParam2());
                    subid = Long.valueOf(serviceSubTaskAnswerReq.getParam6());
                }
            } catch (Exception e) {
                //这里之所以要处理异常，是因为有的KEY就不是我们要的KEY,没有去截取；有异常不处理，直接下一个
                continue;
            }
            if (key.contains("-WJscriptCache")) {
                List<SvyTaskTemplateScriptVO> cacheList = redisCache.getCacheList(key);
                cacheList.sort(Comparator.comparingLong(SvyTaskTemplateScriptVO::getSort));
                log.info("问卷回答结果：{}", CollectionUtils.isEmpty(cacheList) ? null : cacheList.size());

                //校验一下题的序号是否有问题 (如果根据选项无序跳转，就会导致错误)
                cacheList = checkQuestionSort(cacheList);
            //根据 PID、TID、SUBID 构建需要处理的 cache key
            String scriptCacheKeyPrefix = pid + "-" + tid + "-" + subid;
            Set<String> targetKeys = new HashSet<>();

                for (int i = 0; i < cacheList.size(); i++) {
                    if (i == 0) {
                        //这个时间要找到第一题
                        for (SvyTaskTemplateScriptVO svyTaskTemplateScriptVO : cacheList) {
                            if (svyTaskTemplateScriptVO.getSort() == 1L) {
                                //说明是第一题
                                List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = cacheList.get(0).getSvyTaskTemplateTargetoptions();
                                svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
                                Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, tid, pid, subid);
                                if (map == null) continue aa;
                                if (!Objects.isNull(map.get("nextScriptNo")))
                                    nextScriptno = Long.valueOf(map.get("nextScriptNo"));
                                if (score == null) {
                                    score = Double.valueOf(map.get("score"));
                                } else {
                                    score = score + Double.valueOf(map.get("score"));
                                }
                            }
                        }

                    } else {
                        SvyTaskTemplateScriptVO svyTaskTemplateScriptVO = cacheList.get(i);
                        log.info("svyTaskTemplateScriptVO的信息为：{}，i的值为：{}", svyTaskTemplateScriptVO.getScriptno(), i);
                        List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = cacheList.get(i).getSvyTaskTemplateTargetoptions();
                        svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);

                        if (svyTaskTemplateScriptVO.getSort() != null && svyTaskTemplateScriptVO.getSort().equals(nextScriptno)) {
                            Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, Long.valueOf(split[1]), Long.valueOf(split[0]), Objects.isNull(split[2]) ? null : Long.valueOf(split[2]));
                            log.error("nextScriptNo的信息为：{}", map.get("nextScriptNo"));
                            if (!Objects.isNull(map.get("nextScriptNo")))
                                nextScriptno = Long.valueOf(map.get("nextScriptNo"));
                            if (score == null) {
                                score = Double.valueOf(map.get("score"));
                            } else {
                                score = score + Double.valueOf(map.get("score"));
                            }
                        }
                    }
                }
            } else if (key.contains("-SFscriptCache")) {
                List<IvrTaskTemplateScriptVO> cacheList = redisCache.getCacheList(key);
                cacheList.sort(Comparator.comparingLong(IvrTaskTemplateScriptVO::getSort));
                log.error("电话随访问卷回答结果：{}", CollectionUtils.isEmpty(cacheList) ? null : cacheList.size());
                for (int i = 0; i < cacheList.size(); i++) {
                    if (i == 0) {
                        //这个时间要找到第一题
                        for (IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO : cacheList) {
                            if (ivrTaskTemplateScriptVO.getSort() == 1L) {
                                //说明是第一题
                                List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptions = cacheList.get(0).getIvrTaskScriptTargetoptionList();
                                ivrTaskTemplateScriptVO.setIvrTaskScriptTargetoptionList(ivrTaskTemplateTargetoptions);
                                Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, tid, pid, subid);
                                if (!Objects.isNull(map.get("nextScriptNo")))
                                    nextScriptno = Long.valueOf(map.get("nextScriptNo"));
                                if (score == null) {
                                    score = Double.valueOf(map.get("score"));
                                } else {
                                    score = score + Double.valueOf(map.get("score"));
                                }
                            }
                        }

                    } else {
                        IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO = DtoConversionUtils.sourceToTarget(cacheList.get(i), IvrTaskTemplateScriptVO.class);
                        List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptions = DtoConversionUtils.sourceToTarget(cacheList.get(i).getIvrTaskScriptTargetoptionList(), IvrTaskTemplateTargetoption.class);
                        ivrTaskTemplateScriptVO.setIvrTaskScriptTargetoptionList(ivrTaskTemplateTargetoptions);

                        if (ivrTaskTemplateScriptVO.getSort() != null && Long.valueOf(ivrTaskTemplateScriptVO.getSort()).equals(nextScriptno)) {
                            Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, Long.valueOf(split[1]), Long.valueOf(split[0]), Objects.isNull(split[2]) ? null : Long.valueOf(split[2]));
                            log.error("----nextScriptNo2的信息为：{}", map.get("nextScriptNo"));
                            if (!Objects.isNull(map.get("nextScriptNo")))
                                nextScriptno = Long.valueOf(map.get("nextScriptNo"));
                            if (score == null) {
                                score = Double.valueOf(map.get("score"));
                            } else {
                                score = score + Double.valueOf(map.get("score"));
                            }
                        }
                    }
            if (serviceSubTaskAnswerReq != null && serviceSubTaskAnswerReq.getType() != null) {
                if (serviceSubTaskAnswerReq.getType() == 2) {
                    targetKeys.add(scriptCacheKeyPrefix + "-WJscriptCache");
                } else if (serviceSubTaskAnswerReq.getType() == 1) {
                    targetKeys.add(scriptCacheKeyPrefix + "-SFscriptCache");
                }
            } else {
                continue;
                //如果没有 type，则遍历所有 key（保留原有兼容性）
                Set<String> allKeys = redisCache.getAllKeys();
                for (String key : allKeys) {
                    try {
                        if (key.contains(scriptCacheKeyPrefix) && (key.endsWith("-WJscriptCache") || key.endsWith("-SFscriptCache"))) {
                            targetKeys.add(key);
                        }
                    } catch (Exception e) {
                        continue;
                    }
                }
            }
            //将该key和value从redis中，删除
            redisCache.deleteObject(key);

            //查询出该任务中正在执行的患者信息
            //用于批量更新的子任务列表（避免在循环中重复查询）
            Map<String, ServiceSubtask> subtaskCache = new HashMap<>();
            String subtaskCacheKey = subid != null ? subid.toString() : pid + "-" + tid;

            //先查询一次子任务信息
            ServiceSubtaskEntity ssVO = new ServiceSubtaskEntity();
            ssVO.setTaskid(tid);
            ssVO.setPatid(pid);
//            ssVO.setSendstate(3L);
            List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(ssVO);

            ServiceSubtask serviceSubtask = new ServiceSubtask();
            serviceSubtask.setTaskid(tid);
            serviceSubtask.setPatid(pid);
            serviceSubtask.setSubmit(1L);
            serviceSubtask.setIsabnormal(serviceSubTaskAnswerReq.getIsabnormal());
            serviceSubtask.setSendstate(6L);
            serviceSubtask.setExcep(serviceSubTaskAnswerReq.getExcep());
            serviceSubtask.setFinishtime(new Date());
            serviceSubtask.setUpdateTime(new Date());
            log.error("将该key和value从redis中,serviceSubtask的值为--------：{}", serviceSubtask);
            if (score != null) serviceSubtask.setScore(BigDecimal.valueOf(score));
            serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);

            //将当前发送状态改成9完成
            ServiceSubtaskPreachform serviceSubtaskPreachform = new ServiceSubtaskPreachform();
            serviceSubtaskPreachform.setPreachform(serviceSubtaskList.get(0).getCurrentPreachform());
            serviceSubtaskPreachform.setSubid(serviceSubtask.getId());
            serviceSubtaskPreachform.setTaskid(serviceSubtask.getTaskid());
            List<ServiceSubtaskPreachform> serviceSubtaskPreachforms = serviceSubtaskPreachformMapper.selectServiceSubtaskPreachformList(serviceSubtaskPreachform);
            if (CollectionUtils.isNotEmpty(serviceSubtaskPreachforms)) {
                ServiceSubtaskPreachform ssp = serviceSubtaskPreachforms.get(0);
                ssp.setSendstate("9");
                serviceSubtaskPreachformMapper.updateServiceSubtaskPreachform(ssp);
            if (subid != null) {
                ssVO.setSubId(subid);
            } else {
                ssVO.setTaskid(tid);
                ssVO.setPatid(pid);
            }
            List<ServiceSubtask> initialSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(ssVO);
            if (CollectionUtils.isNotEmpty(initialSubtaskList)) {
                subtaskCache.put(subtaskCacheKey, initialSubtaskList.get(0));
            }

            String score = "0";
            Long nextScriptno = null;
            aa:
            for (String key : targetKeys) {
                String[] split = key.split("-");
                //先判断，是不是当前提交人的，不是当前提交人的，跳过
                try {
                    if (ObjectUtils.isNotEmpty(split[0]) && ObjectUtils.isNotEmpty(split[1]) && !Long.valueOf(split[0]).equals(pid) && !Long.valueOf(split[1]).equals(tid) && !Objects.isNull(split[2]) && !Long.valueOf(split[2]).equals(subid)) {
                        continue;
                    }
                } catch (Exception e) {
                    //这里之所以要处理异常，是因为有的KEY就不是我们要的KEY,没有去截取；有异常不处理，直接下一个
                    continue;
                }
                if (key.contains("-WJscriptCache")) {
                    List<SvyTaskTemplateScriptVO> cacheList = redisCache.getCacheList(key);
                    cacheList.sort(Comparator.comparingLong(SvyTaskTemplateScriptVO::getSort));
                    log.info("问卷回答结果：{}", CollectionUtils.isEmpty(cacheList) ? null : cacheList.size());

                    //校验一下题的序号是否有问题 (如果根据选项无序跳转，就会导致错误)
                    cacheList = checkQuestionSort(cacheList);

                    for (int i = 0; i < cacheList.size(); i++) {
                        if (i == 0) {
                            //这个时间要找到第一题
                            for (SvyTaskTemplateScriptVO svyTaskTemplateScriptVO : cacheList) {
                                if (svyTaskTemplateScriptVO.getSort() == 1L) {
                                    //说明是第一题
                                    List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = cacheList.get(0).getSvyTaskTemplateTargetoptions();
                                    svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
                                    Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, tid, pid, subid);
                                    if (map == null) continue aa;
                                    if (!Objects.isNull(map.get("nextScriptNo")))
                                        nextScriptno = Long.valueOf(map.get("nextScriptNo"));
                                    if (score == null || score.isEmpty()) {
                                        score = map.get("score");
                                    } else {
                                        score = String.valueOf(Double.parseDouble(score) + Double.parseDouble(map.get("score")));
                                    }
                                }
                            }

                        } else {
                            SvyTaskTemplateScriptVO svyTaskTemplateScriptVO = cacheList.get(i);
                            log.info("svyTaskTemplateScriptVO的信息为：{}，i的值为：{}", svyTaskTemplateScriptVO.getScriptno(), i);
                            List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = cacheList.get(i).getSvyTaskTemplateTargetoptions();
                            svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);

                            if (svyTaskTemplateScriptVO.getSort() != null && svyTaskTemplateScriptVO.getSort().equals(nextScriptno)) {
                                Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, Long.valueOf(split[1]), Long.valueOf(split[0]), Objects.isNull(split[2]) ? null : Long.valueOf(split[2]));
                                log.error("nextScriptNo的信息为：{}", map.get("nextScriptNo"));
                                if (!Objects.isNull(map.get("nextScriptNo")))
                                    nextScriptno = Long.valueOf(map.get("nextScriptNo"));
                                if (score == null) {
                                    score = map.get("score");
                                } else {
                                    score = String.valueOf(Double.parseDouble(score) + Double.parseDouble(map.get("score")));
                                }
                            }
                        }
                    }
                } else if (key.contains("-SFscriptCache")) {
                    List<IvrTaskTemplateScriptVO> cacheList = redisCache.getCacheList(key);
                    cacheList.sort(Comparator.comparingLong(IvrTaskTemplateScriptVO::getSort));
                    log.error("电话随访问卷回答结果：{}", CollectionUtils.isEmpty(cacheList) ? null : cacheList.size());
                    for (int i = 0; i < cacheList.size(); i++) {
                        if (i == 0) {
                            //这个时间要找到第一题
                            for (IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO : cacheList) {
                                if (ivrTaskTemplateScriptVO.getSort() == 1L) {
                                    //说明是第一题
                                    List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptions = cacheList.get(0).getIvrTaskScriptTargetoptionList();
                                    ivrTaskTemplateScriptVO.setIvrTaskScriptTargetoptionList(ivrTaskTemplateTargetoptions);
                                    Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, tid, pid, subid);
                                    if (!Objects.isNull(map.get("nextScriptNo")))
                                        nextScriptno = Long.valueOf(map.get("nextScriptNo"));
                                    if (score == null || score.isEmpty()) {
                                        score = map.get("score");
                                    } else {
                                        score = String.valueOf(Double.parseDouble(score) + Double.parseDouble(map.get("score")));
                                    }
                                }
                            }

                        } else {
                            IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO = DtoConversionUtils.sourceToTarget(cacheList.get(i), IvrTaskTemplateScriptVO.class);
                            List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptions = DtoConversionUtils.sourceToTarget(cacheList.get(i).getIvrTaskScriptTargetoptionList(), IvrTaskTemplateTargetoption.class);
                            ivrTaskTemplateScriptVO.setIvrTaskScriptTargetoptionList(ivrTaskTemplateTargetoptions);

                            if (ivrTaskTemplateScriptVO.getSort() != null && Long.valueOf(ivrTaskTemplateScriptVO.getSort()).equals(nextScriptno)) {
                                Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, Long.valueOf(split[1]), Long.valueOf(split[0]), Objects.isNull(split[2]) ? null : Long.valueOf(split[2]));
                                log.error("----nextScriptNo2的信息为：{}", map.get("nextScriptNo"));
                                if (!Objects.isNull(map.get("nextScriptNo")))
                                    nextScriptno = Long.valueOf(map.get("nextScriptNo"));
                                if (score == null) {
                                    score = map.get("score");
                                } else {
                                    score = String.valueOf(Double.parseDouble(score) + Double.parseDouble(map.get("score")));
                                }
                            }
                        }
                    }
                } else {
                    continue;
                }
                //将该 key 和 value 从 redis 中，删除
                redisCache.deleteObject(key);

                //查询出该任务中正在执行的患者信息（使用缓存）
                String currentSubtaskKey = subid != null ? subid.toString() : pid + "-" + tid;
                ServiceSubtask serviceSubtask;

                if (!subtaskCache.containsKey(currentSubtaskKey)) {
                    ServiceSubtaskEntity serviceSubtaskEntity = new ServiceSubtaskEntity();
                    if (subid != null) {
                        serviceSubtaskEntity.setSubId(subid);
                    } else {
                        serviceSubtaskEntity.setTaskid(tid);
                        serviceSubtaskEntity.setPatid(pid);
                    }
//            ssVO.setSendstate(3L);
                    List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskEntity);
                    if (CollectionUtils.isNotEmpty(serviceSubtaskList)) {
                        serviceSubtask = serviceSubtaskList.get(0);
                        subtaskCache.put(currentSubtaskKey, serviceSubtask);
                    } else {
                        continue;
                    }
                } else {
                    serviceSubtask = subtaskCache.get(currentSubtaskKey);
                }

                serviceSubtask.setIsabnormal(serviceSubTaskAnswerReq.getIsabnormal());
                serviceSubtask.setSendstate(6L);
                serviceSubtask.setExcep(serviceSubTaskAnswerReq.getExcep());
                serviceSubtask.setFinishtime(new Date());
                serviceSubtask.setUpdateTime(new Date());
                log.error("将该key和value从redis中,serviceSubtask的值为--------：{}", serviceSubtask);
                if (score != null && !score.isEmpty()) serviceSubtask.setScore(score);
                serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);

                //将当前发送状态改成 9 完成（缓存 preachform 查询）
                String currentPreachform = serviceSubtask.getCurrentPreachform();
                if (StringUtils.isNotEmpty(currentPreachform)) {
                    ServiceSubtaskPreachform serviceSubtaskPreachform = new ServiceSubtaskPreachform();
                    serviceSubtaskPreachform.setPreachform(currentPreachform);
                    if (subid != null) {
                        serviceSubtaskPreachform.setSubid(subid);
                    } else {
                        Long id = serviceSubtask.getId();
                        Long tid_ = serviceSubtask.getTaskid();
                        if (id != null) {
                            serviceSubtaskPreachform.setSubid(id);
                        } else if (tid_ != null) {
                            serviceSubtaskPreachform.setTaskid(tid_);
                        }
                    }
                    List<ServiceSubtaskPreachform> serviceSubtaskPreachforms = serviceSubtaskPreachformMapper.selectServiceSubtaskPreachformList(serviceSubtaskPreachform);
                    if (CollectionUtils.isNotEmpty(serviceSubtaskPreachforms)) {
                        ServiceSubtaskPreachform ssp = serviceSubtaskPreachforms.get(0);
                        ssp.setSendstate("9");
                        serviceSubtaskPreachformMapper.updateServiceSubtaskPreachform(ssp);
                    }
                }

            }
            log.info("[{}] 完成异步处理保存问卷答案", Thread.currentThread().getName());
            return 1;
        } catch (Exception e) {
            log.error("[{}] 异步处理保存问卷答案发生异常 : {},请求的对象为：{}", Thread.currentThread().getName(), e.getMessage(), e, serviceSubTaskAnswerReq);
            throw new RuntimeException("保存问卷答案失败", e);
        }
        return 1;
    }

    @Override
@@ -342,7 +416,7 @@
        Long tid = Long.valueOf(serviceSubTaskCacheReq.getParam1());
        Long pid = Long.valueOf(serviceSubTaskCacheReq.getParam2());
        Long subid = Long.valueOf(serviceSubTaskCacheReq.getParam6());
        Double score = null;
        String score = "0";
        if (ObjectUtils.isNotEmpty(serviceSubTaskCacheReq)) {
            Long nextScriptno = null;
            String isabnormalFlag = "0";
@@ -396,9 +470,9 @@
                            nextScriptno = Long.valueOf(map.get("nextScriptNo"));

                        if (score == null) {
                            score = Double.valueOf(map.get("score"));
                            score = map.get("score");
                        } else {
                            score = score + Double.valueOf(map.get("score"));
                            score = String.valueOf(Double.parseDouble(score) + Double.parseDouble(map.get("score")));
                        }
                        isabnormalFlag = map.get("isabnormal");
                    }
@@ -439,9 +513,9 @@
                        if (!Objects.isNull(map.get("nextScriptNo")))
                            nextScriptno = Long.valueOf(map.get("nextScriptNo"));
                        if (score == null) {
                            score = Double.valueOf(map.get("score"));
                            score = map.get("score");
                        } else {
                            score = score + Double.valueOf(map.get("score"));
                            score = String.valueOf(Double.parseDouble(score) + Double.parseDouble(map.get("score")));
                        }
                        isabnormalFlag = map.get("isabnormal");
                    }
@@ -464,7 +538,7 @@
            serviceSubtask.setExcep(isabnormalFlag);
            serviceSubtask.setFinishtime(new Date());
            serviceSubtask.setUpdateTime(new Date());
            if (score != null) serviceSubtask.setScore(BigDecimal.valueOf(score));
            if (score != null && !score.isEmpty()) serviceSubtask.setScore(score);
            serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);

            //将当前发送状态改成9完成
@@ -520,7 +594,7 @@
        }

        if (CollectionUtils.isNotEmpty(serviceSubTaskMYDAnswerReq.getSvyTaskTemplateScriptVOS())) {
            Double score = null;
            String score = "0";
            List<SvyTaskTemplateScriptVO> svyTaskTemplateScriptVOS = serviceSubTaskMYDAnswerReq.getSvyTaskTemplateScriptVOS();
            Long nextScriptno = null;

@@ -552,13 +626,12 @@
                    if (map == null) continue;

                    log.error("nextScriptNo 的信息为：{}", map.get("nextScriptNo"));
                    if (!Objects.isNull(map.get("nextScriptNo")))
                        nextScriptno = Long.valueOf(map.get("nextScriptNo"));
                    if (!Objects.isNull(map.get("nextScriptNo"))) nextScriptno = Long.valueOf(map.get("nextScriptNo"));

                    if (score == null) {
                        score = Double.valueOf(map.get("score"));
                    if (score == null || score.isEmpty()) {
                        score = map.get("score");
                    } else {
                        score = score + Double.valueOf(map.get("score"));
                        score = String.valueOf(Double.parseDouble(score) + Double.parseDouble(map.get("score")));
                    }

                    if (!Objects.isNull(map.get("id"))) {
@@ -621,7 +694,7 @@
                serviceSubtask.setUpdateTime(new Date());
                serviceSubtask.setCreateTime(new Date());
                serviceSubtask.setVisitTime(new Date());
                if (score != null) serviceSubtask.setScore(BigDecimal.valueOf(score));
                if (score != null && !score.isEmpty()) serviceSubtask.setScore(score);
                serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
                //将当前发送状态改成9完成
                ServiceSubtaskPreachform serviceSubtaskPreachform = new ServiceSubtaskPreachform();
@@ -856,7 +929,6 @@
    }

    private Map<String, String> setWJInfo(SvyTaskTemplateScriptVO svyTaskTemplateScriptVO, Long taskid, Long patid, Long subid) {
        log.error("-----svyTaskTemplateScriptVO的值为：{}", svyTaskTemplateScriptVO);
        ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity();
        serviceSubtaskVO.setTaskid(taskid);
        serviceSubtaskVO.setPatid(patid);
@@ -905,7 +977,6 @@
    }

    private Map<String, String> setWJInfo(SvyTaskTemplateScriptVO svyTaskTemplateScriptVO, Long taskid, Long patid, Long subid, List<ServiceSubtask> selectServiceSubtaskList, ServiceTask serviceTask, Map<Long, Long> existingDetailIdMap, Map<Long, Long> existingTraceIdMap) {
        log.error("-----svyTaskTemplateScriptVO的值为：{}", svyTaskTemplateScriptVO);
        String score = "0";
        //下题跳转
        String nextScriptNo = null;
@@ -949,6 +1020,8 @@
        serviceSubtaskDetailVO.setQuestiontext(svyTaskTemplateScriptVO.getScriptContent());
        serviceSubtaskDetailVO.setIsMydException(svyTaskTemplateScriptVO.getIsMydException());
        serviceSubtaskDetailVO.setDimension(svyTaskTemplateScriptVO.getDimension());
        if (StringUtils.isNotEmpty(svyTaskTemplateScriptVO.getScore()))
            serviceSubtaskDetailVO.setScore(svyTaskTemplateScriptVO.getScore().replaceFirst("^0+(?!$)", ""));
        serviceSubtaskDetailVO.setCategoryid(svyTaskTemplateScriptVO.getCategoryid());
        serviceSubtaskDetailVO.setTaskid(Long.valueOf(taskid));
        serviceSubtaskDetailVO.setTargetid(svyTaskTemplateScriptVO.getTargetid() != null ? svyTaskTemplateScriptVO.getTargetid().intValue() : null);
@@ -982,13 +1055,32 @@
        //获取一下问题选项
        SvyTaskTemplateTargetoption stt = null;
        Long isabnormalFlag = 0L;
        String scriptResultRaw = svyTaskTemplateScriptVO.getScriptResult();
        //去除中文双引号和英文双引号以及空白字符
        String scriptResult = scriptResultRaw != null ? scriptResultRaw.replaceAll("^[\"\"]|[\"\"]$", "").trim() : null;
        for (SvyTaskTemplateTargetoption svyTaskTemplateTargetoption : svyTaskTemplateScriptVO.getSvyTaskTemplateTargetoptions()) {
            if (StringUtils.isNotEmpty(svyTaskTemplateTargetoption.getOptioncontent()) && svyTaskTemplateTargetoption.getOptioncontent().trim().equals(svyTaskTemplateScriptVO.getScriptResult()))
                stt = svyTaskTemplateTargetoption;
            String optionContent = svyTaskTemplateTargetoption.getOptioncontent();
            if (StringUtils.isNotEmpty(optionContent) && StringUtils.isNotEmpty(scriptResult)) {
                //去除两端空白并处理特殊字符进行比较
                if (optionContent.trim().replaceAll("\\s+", "").equals(scriptResult.replaceAll("\\s+", ""))) {
                    stt = svyTaskTemplateTargetoption;
                    break; // 找到匹配项后跳出循环
                }
            }
        }

        //判断一下当前的问题是不是满意度问题，并且dutyDeptCode是否有值，并且选项是不是异常选项，如果全符合，则往满意度问题异常表新增
        if (StringUtils.isNotEmpty(svyTaskTemplateScriptVO.getDutyDeptCode()) && stt != null && 1 == stt.getIsabnormal()) {
        String orgid = selectServiceSubtaskList.get(0).getOrgid();
        //景宁-随访异常提示 其他-异常满意度提示
        boolean addTrace = false;
        if (StringUtils.isNotEmpty(orgid) && orgid.equals("47255004333112711A1001")) {
            if (stt != null) {
                addTrace = Long.valueOf(1L).equals(stt.getIsabnormal());
            }
        } else {
            addTrace = StringUtils.isNotEmpty(svyTaskTemplateScriptVO.getIsMydException());
        }
        //判断一下当前的问题是不是满意度问题，并且 dutyDeptCode 是否有值，并且选项是不是异常选项，如果全符合，则往满意度问题异常表新增
        if (StringUtils.isNotEmpty(svyTaskTemplateScriptVO.getDutyDeptCode()) && stt != null && Long.valueOf(1L).equals(stt.getIsabnormal()) || StringUtils.isNotEmpty(svyTaskTemplateScriptVO.getDutyDeptCode()) && addTrace) {
            isabnormalFlag = 1L;
            ServiceSubtaskDetailTrace subtaskDetailTrace = new ServiceSubtaskDetailTrace();
            subtaskDetailTrace.setDetailId(serviceSubtaskDetail.getId());
@@ -996,15 +1088,14 @@
            subtaskDetailTrace.setTaskid(serviceSubtaskDetailVO.getTaskid());
            subtaskDetailTrace.setTemplateid(StringUtils.isNotEmpty(serviceSubtaskDetailVO.getTemplateid()) ? Long.valueOf(serviceSubtaskDetailVO.getTemplateid()) : null);
            subtaskDetailTrace.setTemplatequestionnum(svyTaskTemplateScriptVO.getScriptid());
            subtaskDetailTrace.setSwitchid(stt.getId());
            subtaskDetailTrace.setSwitchid(stt != null ? stt.getId() : null);
            subtaskDetailTrace.setQuestiontext(svyTaskTemplateScriptVO.getScriptContent());
            subtaskDetailTrace.setQuestionvoice(null);
            subtaskDetailTrace.setCategoryname(svyTaskTemplateScriptVO.getCategoryName());
            subtaskDetailTrace.setCategoryid(svyTaskTemplateScriptVO.getCategoryid());
            //获取所有选项
            subtaskDetailTrace.setTargetid(stt.getId());
            subtaskDetailTrace.setTargetid(stt != null ? stt.getId() : null);
            subtaskDetailTrace.setTargetvalue(serviceSubtaskDetailVO.getTargetvalue());
            subtaskDetailTrace.setMatchedtext(stt.getOptioncontent());
            subtaskDetailTrace.setGuid(svyTaskTemplateScriptVO.getGuid());
            subtaskDetailTrace.setValueType(serviceSubtaskDetail.getValueType());
            subtaskDetailTrace.setTemplateType(2);
@@ -1013,7 +1104,11 @@
            subtaskDetailTrace.setType(svyLibScriptCategory != null ? svyLibScriptCategory.getType() : null);

            subtaskDetailTrace.setScriptid(svyTaskTemplateScriptVO.getId());
            subtaskDetailTrace.setAsrtext(stt.getOptioncontent());
            //非满意度意见异常自动填入空
            subtaskDetailTrace.setMatchedtext(stt != null ? stt.getOptioncontent() : svyTaskTemplateScriptVO.getIsMydException());
            subtaskDetailTrace.setAsrtext(stt != null ? stt.getOptioncontent() : svyTaskTemplateScriptVO.getIsMydException());
            subtaskDetailTrace.setIsMydException(svyTaskTemplateScriptVO.getIsMydException());

            subtaskDetailTrace.setRecordpath(null);
            subtaskDetailTrace.setPatid(selectServiceSubtaskList.get(0).getPatid());
            JSONObject patdescJson1 = new JSONObject();
@@ -1033,13 +1128,15 @@
            subtaskDetailTrace.setDutyDeptPersonName(svyTaskTemplateScriptVO.getDutyDeptPersonName());
            subtaskDetailTrace.setReportDeptPersonCode(svyTaskTemplateScriptVO.getReportDeptPersonCode());
            subtaskDetailTrace.setReportDeptPersonName(svyTaskTemplateScriptVO.getReportDeptPersonName());
            subtaskDetailTrace.setCirculationDeptPersonCode(svyTaskTemplateScriptVO.getCirculationDeptPersonCode());
            subtaskDetailTrace.setCirculationDeptPersonName(svyTaskTemplateScriptVO.getCirculationDeptPersonName());

            Long existTraceId = existingTraceIdMap.get(subtaskDetailTrace.getScriptid());
            if (existTraceId != null) {
                subtaskDetailTrace.setId(existTraceId);
                traceService.updateServiceSubtaskDetailTtrace(subtaskDetailTrace);
            } else traceService.insertServiceSubtaskDetailTtrace(subtaskDetailTrace);
        } else if (ObjectUtils.isNotEmpty(stt) && stt.getIsabnormal() != 1L) {
        } else if (ObjectUtils.isNotEmpty(stt) && !Long.valueOf(1L).equals(stt.getIsabnormal())) {
            //这里主要是怕医护人员把异常选项改成了非异常的，这里就需要查一下这条数据是不是在满意度异常表，如果在，则要删除
            Long existTraceId = existingTraceIdMap.get(svyTaskTemplateScriptVO.getId());
            if (existTraceId != null) {
@@ -1259,14 +1356,24 @@
                stt = ivrTaskTemplateTargetoption;
        }


        String orgid = selectServiceSubtaskList.get(0).getOrgid();
        //景宁-随访异常提示 其他-异常满意度提示
        boolean addTrace = false;
        if (StringUtils.isNotEmpty(orgid) && orgid.equals("47255004333112711A1001")) {
            if (stt != null) {
                addTrace = Long.valueOf(1L).equals(stt.getIsabnormal());
            }
        } else {
            addTrace = StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getIsMydException());
        }
        //判断一下当前的问题是不是满意度问题，并且dutyDeptCode是否有值，并且选项是不是异常选项，如果全符合，则往满意度问题异常表新增
        if (StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getDutyDeptCode()) && 1 == stt.getIsabnormal()) {
        if (StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getDutyDeptCode()) && 1 == stt.getIsabnormal() || StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getDutyDeptCode()) && addTrace) {
            isabnormalFlag = "1";
            ServiceSubtaskDetailTrace subtaskDetailTrace = new ServiceSubtaskDetailTrace();
            subtaskDetailTrace.setDetailId(serviceSubtaskDetail.getId());
            subtaskDetailTrace.setSubId(serviceSubtaskDetailVO.getSubId());
            subtaskDetailTrace.setTaskid(serviceSubtaskDetailVO.getTaskid());
            subtaskDetailTrace.setIsMydException(serviceSubtaskDetailVO.getIsMydException());
            subtaskDetailTrace.setTemplateid(ivrTaskTemplateScriptVO.getTemplateID() != null ? Long.valueOf(ivrTaskTemplateScriptVO.getTemplateID()) : null);
            subtaskDetailTrace.setTemplatequestionnum(ivrTaskTemplateScriptVO.getSort() == null ? null : Long.valueOf(ivrTaskTemplateScriptVO.getSort()));

@@ -1276,7 +1383,7 @@
                ivrLibaScriptAssort = ivrLibaScriptAssortMapper.selectIvrLibaScriptAssortById(ivrTaskTemplateScriptVO.getScriptAssortid());

            //获取用户选出的选项的ID
            subtaskDetailTrace.setSwitchid(stt.getId());
            subtaskDetailTrace.setSwitchid(stt != null ? stt.getId() : null);
            subtaskDetailTrace.setQuestiontext(ivrTaskTemplateScriptVO.getScriptContent());
            subtaskDetailTrace.setQuestionvoice(null);
            subtaskDetailTrace.setCategoryname(StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getScriptAssortname()) ? ivrTaskTemplateScriptVO.getScriptAssortname() : (ivrLibaScriptAssort != null ? ivrLibaScriptAssort.getIndexAssortName() : ""));