From 7469d35bf8a8f86dab3abc056eae8417fb88482d Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期二, 18 三月 2025 18:14:33 +0800 Subject: [PATCH] 代码提交 --- smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java index ec22b52..d7b8332 100644 --- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java +++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java @@ -321,7 +321,8 @@ if (StringUtils.isNotEmpty(serviceSubTaskCacheReq.getParam6())) subId = Long.valueOf(serviceSubTaskCacheReq.getParam6()); - } ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO(); + } + ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO(); serviceSubtaskVO.setTaskid(tid); serviceSubtaskVO.setPatid(pid); serviceSubtaskVO.setSubId(subId); @@ -366,7 +367,8 @@ for (SvyLibTemplateScriptVO svyLibTemplateScriptVO : svyLibTemplateScriptVOList) { Map<String, String> scriptResult = getScriptResult(serviceSubTaskQueryReq.getSubId(), serviceSubTaskQueryReq.getPatid(), svyLibTemplateScriptVO.getId()); if (ObjectUtils.isNotEmpty(scriptResult)) { - svyLibTemplateScriptVO.setScriptResult(scriptResult.get("asrtext")); + if (StringUtils.isNotEmpty(scriptResult.get("asrtext"))) + svyLibTemplateScriptVO.setScriptResult(StringUtils.isNotEmpty(scriptResult.get("asrtext")) ? scriptResult.get("asrtext").replaceAll("^(\"|')(.*)\\1$", "$2") : ""); svyLibTemplateScriptVO.setScriptResultId(scriptResult.get("asrtextId")); } } @@ -463,6 +465,7 @@ ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(taskid); serviceSubtaskDetailVO.setQuestiontext(svyTaskTemplateScriptVO.getScriptContent()); serviceSubtaskDetailVO.setTaskid(Long.valueOf(taskid)); + serviceSubtaskDetailVO.setTargetid(svyTaskTemplateScriptVO.getTargetid() != null ? svyTaskTemplateScriptVO.getTargetid().intValue() : null); serviceSubtaskDetailVO.setPatid(Long.valueOf(patid)); serviceSubtaskDetailVO.setScriptid(svyTaskTemplateScriptVO.getId()); serviceSubtaskDetailVO.setValueType(svyTaskTemplateScriptVO.getScriptType()); @@ -525,6 +528,7 @@ } } } + serviceSubtaskDetailVO.setTargetid(ivrTaskTemplateScriptVO.getTargetid() != null ? ivrTaskTemplateScriptVO.getTargetid().intValue() : null); serviceSubtaskDetailVO.setQuestiontext(ivrTaskTemplateScriptVO.getScriptContent()); serviceSubtaskDetailVO.setTaskid(Long.valueOf(taskid)); serviceSubtaskDetailVO.setPatid(Long.valueOf(patid)); -- Gitblit v1.9.3