代码提交

liusheng

昨天 c24d16a37523a49080392610357872ce580cbc38

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

@@ -11,9 +11,7 @@
import com.ruoyi.common.utils.RSAPublicKeyExample;
import com.ruoyi.common.utils.StringUtils;
import com.smartor.domain.*;
import com.smartor.domain.DTO.ServiceSubtaskDetailDTO;
import com.smartor.domain.VO.ServiceSubtaskDetailTraceVO;
import com.smartor.domain.entity.ServiceSubtaskEntity;
import com.ruoyi.task.domain.VO.ServiceSubtaskDetailTraceVO;
import com.smartor.mapper.*;
import com.smartor.service.*;
import lombok.extern.slf4j.Slf4j;
@@ -29,6 +27,42 @@
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

import com.ruoyi.template.domain.HeLibrary;
import com.ruoyi.template.domain.IvrLibaScriptAssort;
import com.ruoyi.inhospvisit.domain.PatMedInhosp;
import com.ruoyi.outpatientvisit.domain.PatMedOuthosp;
import com.ruoyi.outpatientvisit.domain.PatMedOuthospQueryReq;
import com.ruoyi.inhospvisit.api.InhospVisitFacade;
import com.ruoyi.outpatientvisit.api.OuthospDataFacade;
import com.ruoyi.template.domain.IvrTaskTemplate;
import com.ruoyi.template.domain.IvrTaskTemplateScriptVO;
import com.ruoyi.template.domain.IvrTaskTemplateTargetoption;
import com.ruoyi.template.service.IIvrTaskTemplateService;
import com.ruoyi.template.domain.IvrLibaTemplateScript;
import com.ruoyi.template.mapper.IvrLibaScriptAssortMapper;
import com.ruoyi.template.service.IIvrLibaTemplateScriptService;
import com.ruoyi.template.domain.SvyLibScriptCategory;
import com.ruoyi.template.domain.SvyLibTemplateScript;
import com.ruoyi.template.domain.SvyTaskTemplate;
import com.ruoyi.template.domain.SvyTaskTemplateScriptVO;
import com.ruoyi.template.domain.SvyTaskTemplateTargetoption;
import com.ruoyi.template.mapper.SvyLibScriptCategoryMapper;
import com.ruoyi.template.service.ISvyTaskTemplateService;
import com.ruoyi.common.core.domain.entity.PatArchive;
import com.ruoyi.task.domain.DTO.ServiceSubtaskDetailDTO;
import com.ruoyi.task.domain.entity.ServiceSubtaskEntity;
import com.ruoyi.task.domain.ServiceSubtask;
import com.ruoyi.task.domain.ServiceSubtaskDetail;
import com.ruoyi.task.domain.ServiceSubtaskDetailVO;
import com.ruoyi.task.domain.ServiceTask;
import com.ruoyi.task.domain.TaskSendTimeVO;
import com.ruoyi.task.mapper.ServiceSubtaskDetailMapper;
import com.ruoyi.task.mapper.ServiceSubtaskMapper;
import com.ruoyi.task.domain.ServiceSubtaskDetailTrace;
import com.ruoyi.task.domain.VO.ServiceSubtaskDetailTraceVO;
import com.ruoyi.task.service.IServiceSubtaskDetailTraceService;
import com.ruoyi.task.domain.ServiceSubtaskPreachform;
import com.ruoyi.task.service.IServiceTaskService;
/**
 * 任务问卷问题选项Service业务层处理
 *
@@ -40,6 +74,18 @@
public class ServiceSubtaskAnswerServiceImpl implements IServiceSubtaskAnswerService {
    @Autowired
    private ServiceSubtaskAnswerMapper serviceSubtaskAnswerMapper;

    /**
     * 跨模块访问一律经模块门面（禁止直连已搬走的 Mapper）。
     */
    @Autowired
    private OuthospDataFacade outhospDataFacade;

    /**
     * 跨模块访问一律经模块门面（禁止直连已搬走的 Mapper）。
     */
    @Autowired
    private InhospVisitFacade inhospVisitFacade;

    @Autowired
    private ServiceSubtaskMapper serviceSubtaskMapper;
@@ -66,11 +112,7 @@
    private PatArchiveMapper patArchiveMapper;


    @Autowired
    private PatMedInhospMapper patMedInhospMapper;

    @Autowired
    private PatMedOuthospMapper patMedOuthospMapper;

    @Autowired
    private IServiceSubtaskDetailTraceService traceService;
@@ -81,8 +123,6 @@
    @Autowired
    private ISvyLibTemplateScriptService svyLibTemplateScriptService;

    @Autowired
    private ISvyTaskTemplateTargetoptionService svyTaskTemplateTargetoptionService;

    @Autowired
    private IIvrTaskTemplateService ivrTaskTemplateService;
@@ -95,6 +135,66 @@

    @Value("${dealDeptCode}")
    private String dealDeptCode;

    /**
     * 安全解析分数：null、空串、空白串以及非法格式一律按 0 处理，避免 Double.parseDouble 抛 NumberFormatException
     *
     * @param scoreValue 分数字符串
     * @return 解析后的分数，无法解析时返回 0
     */
    private double parseScore(String scoreValue) {
        if (StringUtils.isEmpty(scoreValue)) {
            return 0D;
        }
        try {
            return Double.parseDouble(scoreValue.trim());
        } catch (NumberFormatException e) {
            log.warn("分数格式非法，按 0 处理，原始值：{}", scoreValue);
            return 0D;
        }
    }

    /**
     * 将累加后的分值格式化为落库字符串，去掉多余的小数位（如 5.0 -> 5）
     *
     * @param scoreValue 分值
     * @return 分数字符串
     */
    private String formatScore(double scoreValue) {
        if (Double.isNaN(scoreValue) || Double.isInfinite(scoreValue)) {
            log.warn("分数计算结果非法，按 0 处理，原始值：{}", scoreValue);
            return "0";
        }
        return BigDecimal.valueOf(scoreValue).stripTrailingZeros().toPlainString();
    }

    /**
     * 安全解析异常标记：null、空串、非法格式一律按 0（正常）处理
     *
     * @param isabnormalFlag 异常标记字符串
     * @return 异常标记值
     */
    private Integer parseIsabnormal(String isabnormalFlag) {
        if (StringUtils.isEmpty(isabnormalFlag)) {
            return 0;
        }
        try {
            return Integer.valueOf(isabnormalFlag.trim());
        } catch (NumberFormatException e) {
            log.warn("异常标记格式非法，按 0 处理，原始值：{}", isabnormalFlag);
            return 0;
        }
    }

    /**
     * 归一化分数字符串，避免把 null 或空串（前端未传/未作答）放到 map 中传递给累加逻辑
     *
     * @param scoreValue 原始分值
     * @return 非空分值，默认 "0"
     */
    private String normalizeScore(String scoreValue) {
        return StringUtils.isEmpty(scoreValue) ? "0" : scoreValue.trim();
    }

    /**
     * 查询任务问卷问题选项
@@ -176,6 +276,8 @@
    public Integer saveQuestionAnswer(ServiceSubTaskAnswerReq serviceSubTaskAnswerReq, Long flag) {
        String threadName = Thread.currentThread().getName();
        log.info("[{}] 开始异步处理保存问卷答案", threadName);
        // 幂等占位键：失败时要释放，允许患者重试
        String idemKey = null;
        try {
            //参数解密
            Long tid = null;
@@ -199,6 +301,17 @@
            //根据 PID、TID、SUBID 构建需要处理的 cache key
            String scriptCacheKeyPrefix = pid + "-" + tid + "-" + subid;
            Set<String> targetKeys = new HashSet<>();

            // ---------------- 幂等：同一份问卷 60 秒内只处理一次 ----------------
            // 本方法是 @Async 异步执行，患者端重复点击/网络重试会让它并发跑多次，
            // 每次都会 upsert 一遍明细；并发时彼此看不到对方还没提交的行 -> 插入重复副本
            // （nhfy 2026-09-08 就是这样堆出 2~6 份，并且把 del_flag 一起写坏）。
            idemKey = "subtaskAnswer:submit:" + scriptCacheKeyPrefix + ":"
                    + (serviceSubTaskAnswerReq == null || serviceSubTaskAnswerReq.getType() == null ? "all" : serviceSubTaskAnswerReq.getType());
            if (!redisCache.setCacheObjectIfAbsent(idemKey, "1", 60, TimeUnit.SECONDS)) {
                log.warn("[{}] 检测到重复提交，本次忽略：{}", threadName, idemKey);
                return 0;
            }

            if (serviceSubTaskAnswerReq != null && serviceSubTaskAnswerReq.getType() != null) {
                if (serviceSubTaskAnswerReq.getType() == 2) {
@@ -237,7 +350,7 @@
                subtaskCache.put(subtaskCacheKey, initialSubtaskList.get(0));
            }

            String score = "0";
            double scoreTotal = 0D;
            Long nextScriptno = null;
            aa:
            for (String key : targetKeys) {
@@ -271,11 +384,7 @@
                                    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")));
                                    }
                                    scoreTotal += parseScore(map.get("score"));
                                }
                            }

@@ -290,11 +399,7 @@
                                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")));
                                }
                                scoreTotal += parseScore(map.get("score"));
                            }
                        }
                    }
@@ -313,11 +418,7 @@
                                    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")));
                                    }
                                    scoreTotal += parseScore(map.get("score"));
                                }
                            }

@@ -331,11 +432,7 @@
                                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")));
                                }
                                scoreTotal += parseScore(map.get("score"));
                            }
                        }
                    }
@@ -375,7 +472,7 @@
                serviceSubtask.setFinishtime(new Date());
                serviceSubtask.setUpdateTime(new Date());
                log.error("将该key和value从redis中,serviceSubtask的值为--------：{}", serviceSubtask);
                if (score != null && !score.isEmpty()) serviceSubtask.setScore(score);
                serviceSubtask.setScore(formatScore(scoreTotal));
                serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);

                //将当前发送状态改成 9 完成（缓存 preachform 查询）
@@ -407,6 +504,14 @@
            return 1;
        } catch (Exception e) {
            log.error("[{}] 异步处理保存问卷答案发生异常 : {},请求的对象为：{}", Thread.currentThread().getName(), e.getMessage(), e, serviceSubTaskAnswerReq);
            // 处理失败时释放幂等键，允许患者重新提交
            if (idemKey != null) {
                try {
                    redisCache.deleteObject(idemKey);
                } catch (Exception ignore) {
                    log.warn("[{}] 释放幂等键失败：{}", Thread.currentThread().getName(), idemKey);
                }
            }
            throw new RuntimeException("保存问卷答案失败", e);
        }
    }
@@ -416,7 +521,7 @@
        Long tid = Long.valueOf(serviceSubTaskCacheReq.getParam1());
        Long pid = Long.valueOf(serviceSubTaskCacheReq.getParam2());
        Long subid = Long.valueOf(serviceSubTaskCacheReq.getParam6());
        String score = "0";
        double scoreTotal = 0D;
        if (ObjectUtils.isNotEmpty(serviceSubTaskCacheReq)) {
            Long nextScriptno = null;
            String isabnormalFlag = "0";
@@ -463,18 +568,16 @@

                    if (shouldProcess) {
                        Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, tid, pid, subid, preServiceSubtaskList, preServiceTask, preDetailIdMap, preTraceIdMap);
                        log.error("nextScriptNo 的信息为：{}", map.get("nextScriptNo"));
                        if (map == null) continue;
                        log.info("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")));
                        scoreTotal += parseScore(map.get("score"));
                        if (StringUtils.isNotEmpty(map.get("isabnormal"))) {
                            isabnormalFlag = map.get("isabnormal");
                        }
                        isabnormalFlag = map.get("isabnormal");
                    }
                }
            } else if (serviceSubTaskCacheReq.getType() == 1) {
@@ -512,12 +615,10 @@
                        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")));
                        scoreTotal += parseScore(map.get("score"));
                        if (StringUtils.isNotEmpty(map.get("isabnormal"))) {
                            isabnormalFlag = map.get("isabnormal");
                        }
                        isabnormalFlag = map.get("isabnormal");
                    }
                }
            }
@@ -533,12 +634,12 @@
            serviceSubtask.setTaskid(tid);
            serviceSubtask.setPatid(pid);
            serviceSubtask.setSubmit(1L);
            serviceSubtask.setIsabnormal(Integer.valueOf(isabnormalFlag));
            serviceSubtask.setIsabnormal(parseIsabnormal(isabnormalFlag));
            serviceSubtask.setSendstate(6L);
            serviceSubtask.setExcep(isabnormalFlag);
            serviceSubtask.setFinishtime(new Date());
            serviceSubtask.setUpdateTime(new Date());
            if (score != null && !score.isEmpty()) serviceSubtask.setScore(score);
            serviceSubtask.setScore(formatScore(scoreTotal));
            serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);

            //将当前发送状态改成9完成
@@ -573,13 +674,13 @@
            //住院
            PatMedInhosp patMedInhosp = new PatMedInhosp();
            patMedInhosp.setSerialnum(serviceSubTaskMYDAnswerReq.getSerialnum());
            patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
            patMedInhospList = inhospVisitFacade.selectPatMedInhospList(patMedInhosp);
            if (CollectionUtils.isNotEmpty(patMedInhospList)) patid = patMedInhospList.get(0).getPatid();
        } else if (serviceSubTaskMYDAnswerReq.getMzzy().equals("2")) {
            //门诊
            PatMedOuthospQueryReq patMedOuthosp = new PatMedOuthospQueryReq();
            patMedOuthosp.setSerialnum(serviceSubTaskMYDAnswerReq.getSerialnum());
            patMedOuthosps = patMedOuthospMapper.callSpQueryOuthosp(patMedOuthosp);
            patMedOuthosps = outhospDataFacade.callSpQueryOuthosp(patMedOuthosp);
            if (CollectionUtils.isNotEmpty(patMedOuthosps)) patid = patMedOuthosps.get(0).getPatid();
        } else if (serviceSubTaskMYDAnswerReq.getMzzy().equals("3")) {
            //指定一个部门，用来处理投诉建议
@@ -594,7 +695,7 @@
        }

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

@@ -628,11 +729,7 @@
                    log.error("nextScriptNo 的信息为：{}", map.get("nextScriptNo"));
                    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")));
                    }
                    scoreTotal += parseScore(map.get("score"));

                    if (!Objects.isNull(map.get("id"))) {
                        idList.add(Long.valueOf(map.get("id")));
@@ -652,8 +749,8 @@
                serviceSubtask.setLibtemplateid(Long.valueOf(serviceTask.getLibtemplateid()));
                if (CollectionUtils.isNotEmpty(patMedInhospList)) {
                    serviceSubtask.setHospType("2");
                    serviceSubtask.setDeptname(patMedInhospList.get(0).getDeptname());
                    serviceSubtask.setDeptcode(patMedInhospList.get(0).getDeptcode());
                    serviceSubtask.setLeaveldeptname(patMedInhospList.get(0).getDeptname());
                    serviceSubtask.setLeaveldeptcode(patMedInhospList.get(0).getDeptcode());
                    serviceSubtask.setLeavehospitaldistrictcode(patMedInhospList.get(0).getLeavehospitaldistrictcode());
                    serviceSubtask.setLeavehospitaldistrictname(patMedInhospList.get(0).getLeavehospitaldistrictname());
                    serviceSubtask.setDrname(patMedInhospList.get(0).getDrname());
@@ -661,15 +758,17 @@
                    serviceSubtask.setNurseName(patMedInhospList.get(0).getNurseName());
                    serviceSubtask.setNurseId(patMedInhospList.get(0).getNurseId());
                    serviceSubtask.setInhospid(patMedInhospList.get(0).getInhospid());
                    serviceSubtask.setCampusid(patMedInhospList.get(0).getCampusid());
                    serviceSubtask.setServiceType("6");
                } else if (CollectionUtils.isNotEmpty(patMedOuthosps)) {
                    serviceSubtask.setHospType("1");
                    serviceSubtask.setAdmindate(patMedOuthosps.get(0).getAdmitdate());
                    serviceSubtask.setHospno(patMedOuthosps.get(0).getOuthospno());
                    serviceSubtask.setDeptname(patMedOuthosps.get(0).getDeptname());
                    serviceSubtask.setDeptcode(patMedOuthosps.get(0).getDeptcode());
                    serviceSubtask.setLeaveldeptname(patMedOuthosps.get(0).getDeptname());
                    serviceSubtask.setLeaveldeptcode(patMedOuthosps.get(0).getDeptcode());
                    serviceSubtask.setDrname(patMedOuthosps.get(0).getDrname());
                    serviceSubtask.setDrcode(patMedOuthosps.get(0).getDrcode());
                    serviceSubtask.setCampusid(patMedOuthosps.get(0).getCampusid());
                    serviceSubtask.setServiceType("14");
                }
                if (!Objects.isNull(patArchive)) {
@@ -680,10 +779,15 @@
                    serviceSubtask.setSfzh(patArchive.getIdcardno());
                    serviceSubtask.setAddr(patArchive.getPlaceOfResidence());
                    serviceSubtask.setOrgid(patArchive.getOrgid());
                    // 院区兜底：住院/门急诊记录的院区在本库常为空，用患者档案的院区补上，
                    // 否则统计接口（@AddOrgId 按登录用户院区过滤 service_subtask.campusid）会把这些子任务整批丢掉
                    if (StringUtils.isEmpty(serviceSubtask.getCampusid())) {
                        serviceSubtask.setCampusid(patArchive.getCampusid());
                    }
                }
                if (StringUtils.isNotEmpty(dealDept)) {
                    //投诉建议的处理部门
                    serviceSubtask.setDeptcode(dealDept);
                    serviceSubtask.setLeaveldeptcode(dealDept);
                    serviceSubtask.setServiceType("15");
                }
                serviceSubtask.setSubmit(1L);
@@ -694,7 +798,7 @@
                serviceSubtask.setUpdateTime(new Date());
                serviceSubtask.setCreateTime(new Date());
                serviceSubtask.setVisitTime(new Date());
                if (score != null && !score.isEmpty()) serviceSubtask.setScore(score);
                serviceSubtask.setScore(formatScore(scoreTotal));
                serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
                //将当前发送状态改成9完成
                ServiceSubtaskPreachform serviceSubtaskPreachform = new ServiceSubtaskPreachform();
@@ -942,6 +1046,11 @@

    /**
     * 批量查询已存在的明细记录ID，按scriptid分组（避免循环中逐条查询）
     * <p>
     * ⚠️ 2026-10-21：<b>不再过滤 del_flag</b>，同一 scriptid 取 id 最大（最新）的那一行。
     * 原来只认 del_flag=0，明细被逻辑删除后就查不到 → 下一次保存必然 INSERT 新副本，
     * 同一患者同一题会堆出 2~6 条重复明细（nhfy 2026-09-08）。
     * 命中被删副本时由调用方再调 {@code reviveServiceSubtaskDetail} 置回 '0'。
     */
    private Map<Long, Long> getExistingDetailIdMap(Long subid) {
        if (subid == null) return Collections.emptyMap();
@@ -951,7 +1060,9 @@
        if (CollectionUtils.isEmpty(details)) return Collections.emptyMap();
        Map<Long, Long> map = new HashMap<>();
        for (ServiceSubtaskDetail d : details) {
            if ((d.getDelFlag() == null || "0".equals(d.getDelFlag())) && d.getScriptid() != null && !map.containsKey(d.getScriptid())) {
            if (d.getScriptid() == null || d.getId() == null) continue;
            Long existId = map.get(d.getScriptid());
            if (existId == null || d.getId() > existId) {
                map.put(d.getScriptid(), d.getId());
            }
        }
@@ -998,7 +1109,7 @@
                nextScriptNo = getNextScriptNo(svyTaskTemplateScriptVO.getTemplateID(), svyTaskTemplateScriptVO.getScriptContent());
            }
            if (svyTaskTemplateScriptVO.getScore() != null) {
                score = String.valueOf(svyTaskTemplateScriptVO.getScore());
                score = normalizeScore(String.valueOf(svyTaskTemplateScriptVO.getScore()));
            }
            serviceSubtaskDetailVO.setAsrtext(StringUtils.isEmpty(svyTaskTemplateScriptVO.getScriptResult()) ? "" : svyTaskTemplateScriptVO.getScriptResult().replaceAll("^\"|\"$", ""));
            serviceSubtaskDetailVO.setMatchedtext(StringUtils.isEmpty(svyTaskTemplateScriptVO.getScriptResult()) ? "" : svyTaskTemplateScriptVO.getScriptResult().replaceAll("^\"|\"$", ""));
@@ -1009,7 +1120,7 @@
            if (StringUtils.isNotEmpty(svyTaskTemplateScriptVO.getScriptResult())) {
                serviceSubtaskDetailVO.setAsrtext(svyTaskTemplateScriptVO.getScriptResult());
                if (svyTaskTemplateScriptVO.getScore() != null) {
                    score = String.valueOf(svyTaskTemplateScriptVO.getScore());
                    score = normalizeScore(String.valueOf(svyTaskTemplateScriptVO.getScore()));
                }
            }
            nextScriptNo = svyTaskTemplateScriptVO.getNextScriptno();
@@ -1048,6 +1159,8 @@
            serviceSubtaskDetail.setId(existDetailId);
            serviceSubtaskDetail.setUpdateTime(new Date());
            serviceSubtaskDetailMapper.updateServiceSubtaskDetail(serviceSubtaskDetail);
            //命中历史被逻辑删除的副本时置回 del_flag='0'（否则答案写进去了却查不到，且下次又会新增副本）
            serviceSubtaskDetailMapper.reviveServiceSubtaskDetail(existDetailId);
        } else {
            serviceSubtaskDetailMapper.insertServiceSubtaskDetail(serviceSubtaskDetail);
        }
@@ -1146,14 +1259,14 @@


        //如何这需要服务补偿的服务ID不为空的话，则进行立即发送
        log.error("------svyTaskTemplateScriptVO.getSendTaskids()的值为：{},selectServiceSubtaskList的值为：{}", svyTaskTemplateScriptVO.getSendTaskids(), selectServiceSubtaskList.size());
        log.info("------svyTaskTemplateScriptVO.getSendTaskids()的值为：{},selectServiceSubtaskList的值为：{}", svyTaskTemplateScriptVO.getSendTaskids(), selectServiceSubtaskList.size());
        if (CollectionUtils.isNotEmpty(svyTaskTemplateScriptVO.getSendTaskids()) && CollectionUtils.isNotEmpty(selectServiceSubtaskList)) {
            sendTaskIds(svyTaskTemplateScriptVO.getSendTaskids(), selectServiceSubtaskList.get(0));
        }

        Map<String, String> map = new HashMap<>();
        map.put("nextScriptNo", nextScriptNo);
        map.put("score", score);
        map.put("score", normalizeScore(score));
        map.put("id", "" + serviceSubtaskDetail.getId());
        map.put("isabnormal", isabnormalFlag.toString());
        return map;
@@ -1298,7 +1411,7 @@
            }

            if (ivrTaskTemplateScriptVO.getScore() != null) {
                score = String.valueOf(ivrTaskTemplateScriptVO.getScore());
                score = normalizeScore(String.valueOf(ivrTaskTemplateScriptVO.getScore()));
            }
            if (StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getQuestionResult())) {
                serviceSubtaskDetailVO.setAsrtext(ivrTaskTemplateScriptVO.getQuestionResult().replaceAll("^\"|\"$", ""));
@@ -1319,7 +1432,7 @@
                    nextScriptNo = "" + getVoiceNextScriptNo(ivrTaskTemplateScriptVO.getTemplateID(), ivrTaskTemplateScriptVO.getScriptContent());
                }
                if (ivrTaskTemplateScriptVO.getScore() != null) {
                    score = String.valueOf(ivrTaskTemplateScriptVO.getScore());
                    score = normalizeScore(String.valueOf(ivrTaskTemplateScriptVO.getScore()));
                }
            }
        }
@@ -1347,6 +1460,8 @@
            serviceSubtaskDetail.setId(existServiceSubtaskDetail.getId());
            serviceSubtaskDetail.setUpdateTime(new Date());
            serviceSubtaskDetailMapper.updateServiceSubtaskDetail(serviceSubtaskDetail);
            //命中历史被逻辑删除的副本时置回 del_flag='0'，避免重复副本
            serviceSubtaskDetailMapper.reviveServiceSubtaskDetail(existServiceSubtaskDetail.getId());
        } else {
            serviceSubtaskDetailMapper.insertServiceSubtaskDetail(serviceSubtaskDetail);
        }
@@ -1447,7 +1562,7 @@

        Map<String, String> map = new HashMap<>();
        map.put("nextScriptNo", nextScriptNo);
        map.put("score", score);
        map.put("score", normalizeScore(score));
        map.put("isabnormal", isabnormalFlag);
        return map;
    }