From a389acecd582e81c34037326d5808152f97efffb Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 03 九月 2025 09:12:58 +0800
Subject: [PATCH] 接口题目层增加answerps字段门诊记录接口新加否已随访的标记
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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 6050ec9..aa9a70c 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -287,7 +287,7 @@
tid = Long.valueOf(serviceSubTaskCacheReq.getParam1());
pid = Long.valueOf(serviceSubTaskCacheReq.getParam2());
}
- if (serviceSubTaskCacheReq.getType() != null && serviceSubTaskCacheReq.getType() == 2) {
+ if (CollectionUtils.isNotEmpty(serviceSubTaskCacheReq.getSvyLibTemplateScriptVOS()) && serviceSubTaskCacheReq.getSvyLibTemplateScriptVOS().size() > 0) {
//闂嵎
redisCache.deleteObject(pid + "-" + tid + "-WJscriptCache");
redisCache.setCacheListRight(pid + "-" + tid + "-WJscriptCache", serviceSubTaskCacheReq.getSvyLibTemplateScriptVOS());
@@ -295,7 +295,7 @@
Long tims = Long.valueOf(3 * 24 * 3600);
boolean expire = redisCache.expire(pid + "-" + tid + "-WJscriptCache", tims);
return 1;
- } else if (serviceSubTaskCacheReq.getType() != null && serviceSubTaskCacheReq.getType() == 1) {
+ } else if (CollectionUtils.isNotEmpty(serviceSubTaskCacheReq.getIvrLibaTemplateScriptVOList()) && serviceSubTaskCacheReq.getIvrLibaTemplateScriptVOList().size() > 0) {
//闂嵎
redisCache.deleteObject(pid + "-" + tid + "-SFscriptCache");
redisCache.setCacheListRight(pid + "-" + tid + "-SFscriptCache", serviceSubTaskCacheReq.getIvrLibaTemplateScriptVOList());
@@ -364,11 +364,11 @@
//鑾峰彇涓婃鐨勯棶绛旂粨鏋�
ServiceSubtask serviceSubtask = serviceSubtaskMapper.selectServiceSubtaskById(serviceSubTaskQueryReq.getSubId());
+ map.put("upScriptResult", null);
+ map.put("upTaskName", null);
if (ObjectUtils.isNotEmpty(serviceSubtask) && serviceSubtask.getUpid() != null) {
Map<String, Object> scriptInfoByCondition2 = serviceTaskService.getScriptInfoByCondition(serviceSubTaskQueryReq.getTaskid(), serviceSubTaskQueryReq.getPatid(), serviceSubTaskQueryReq.getIsFinish(), serviceSubTaskQueryReq.getPatfrom());
Map<String, Object> map1 = getMap(scriptInfoByCondition2, Long.valueOf(serviceSubtask.getUpid()), serviceSubTaskQueryReq.getPatid());
- map.put("upScriptResult", null);
- map.put("upTaskName", null);
if (!map1.isEmpty()) {
map.put("upScriptResult", map1.get("scriptResult"));
map.put("upTaskName", map1.get("taskName"));
@@ -382,7 +382,7 @@
private Map<String, Object> getMap(Map<String, Object> scriptInfoByCondition, Long subid, Long patid) {
Map<String, Object> map = new HashMap<>();
if (ObjectUtils.isNotEmpty(scriptInfoByCondition) && ObjectUtils.isNotEmpty(scriptInfoByCondition.get("script"))) {
- log.error("-----------scriptInfoByCondition鐨勫�间负锛歿}", scriptInfoByCondition);
+// log.error("-----------scriptInfoByCondition鐨勫�间负锛歿}", scriptInfoByCondition);
if (scriptInfoByCondition.get("type").equals("1")) {
List<IvrLibaTemplateScriptVO> ivrLibaTemplateScriptVOList = (List) scriptInfoByCondition.get("script");
for (IvrLibaTemplateScriptVO ivrLibaTemplateScriptVO : ivrLibaTemplateScriptVOList) {
@@ -402,6 +402,8 @@
if (StringUtils.isNotEmpty(scriptResult.get("asrtext")))
svyLibTemplateScriptVO.setScriptResult(StringUtils.isNotEmpty(scriptResult.get("asrtext")) ? scriptResult.get("asrtext").replaceAll("^(\"|')(.*)\\1$", "$2") : "");
svyLibTemplateScriptVO.setScriptResultId(scriptResult.get("asrtextId"));
+ if (StringUtils.isNotEmpty(scriptResult.get("answerps")))
+ svyLibTemplateScriptVO.setAnswerps(scriptResult.get("answerps"));
}
}
map.put("scriptResult", svyLibTemplateScriptVOList);
@@ -427,6 +429,7 @@
if (CollectionUtils.isNotEmpty(serviceSubtaskDetails)) {
map.put("asrtext", serviceSubtaskDetails.get(0).getAsrtext());
map.put("asrtextId", serviceSubtaskDetails.get(0).getId());
+ map.put("answerps", serviceSubtaskDetails.get(0).getAnswerps());
return map;
}
return null;
@@ -478,8 +481,8 @@
if (svyTaskTemplateScriptVO.getScore() != null) {
score = String.valueOf(svyTaskTemplateScriptVO.getScore());
}
- serviceSubtaskDetailVO.setAsrtext(svyTaskTemplateScriptVO.getScriptResult().replaceAll("^\"|\"$", ""));
- serviceSubtaskDetailVO.setMatchedtext(svyTaskTemplateScriptVO.getScriptResult().replaceAll("^\"|\"$", ""));
+ serviceSubtaskDetailVO.setAsrtext(StringUtils.isEmpty(svyTaskTemplateScriptVO.getScriptResult()) ? "" : svyTaskTemplateScriptVO.getScriptResult().replaceAll("^\"|\"$", ""));
+ serviceSubtaskDetailVO.setMatchedtext(StringUtils.isEmpty(svyTaskTemplateScriptVO.getScriptResult()) ? "" : svyTaskTemplateScriptVO.getScriptResult().replaceAll("^\"|\"$", ""));
// if (StringUtils.isEmpty(serviceSubtaskDetailVO.getAsrtext())) {
// nextScriptNo = svyTaskTemplateScriptVO.getNextScriptno().toString();
// }
@@ -509,7 +512,7 @@
serviceSubtaskDetailVO.setGuid(serviceTask.getGuid());
serviceSubtaskDetailVO.setOrgid(serviceTask.getOrgid());
}
- serviceSubtaskDetailVO.setSubId(selectServiceSubtaskList.get(0).getId());
+ serviceSubtaskDetailVO.setSubId(CollectionUtils.isNotEmpty(selectServiceSubtaskList) ? selectServiceSubtaskList.get(0).getId() : null);
serviceSubtaskDetailVO.setTemplatequestionnum(svyTaskTemplateScriptVO.getId());
ServiceSubtaskDetail serviceSubtaskDetail = DtoConversionUtils.sourceToTarget(serviceSubtaskDetailVO, ServiceSubtaskDetail.class);
serviceSubtaskDetailMapper.insertServiceSubtaskDetail(serviceSubtaskDetail);
--
Gitblit v1.9.3