From 569e8be78cc357147a403daa1af8dfe6dd7d5308 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 18 八月 2026 18:22:10 +0800
Subject: [PATCH] 1.处理药品宣教的问题 2.处理南华满意度的功能 3.处理随访导出的问题 4.处理南华短信的问题
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java | 584 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 398 insertions(+), 186 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 07484ad..c52c87f 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -5,6 +5,7 @@
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.RSAPublicKeyExample;
@@ -15,7 +16,6 @@
import com.smartor.domain.entity.ServiceSubtaskEntity;
import com.smartor.mapper.*;
import com.smartor.service.*;
-import com.sun.org.apache.bcel.internal.generic.NEW;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
@@ -79,6 +79,9 @@
@Autowired
private ISvyLibTemplateScriptService svyLibTemplateScriptService;
+
+ @Autowired
+ private ISvyTaskTemplateTargetoptionService svyTaskTemplateTargetoptionService;
@Autowired
private IIvrTaskTemplateService ivrTaskTemplateService;
@@ -162,14 +165,11 @@
@Override
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();
if (flag == 0) {
@@ -182,18 +182,53 @@
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");
+ }
+
+ //鏍规嵁 PID銆乀ID銆丼UBID 鏋勫缓闇�瑕佸鐞嗙殑 cache key
+ String scriptCacheKeyPrefix = pid + "-" + tid + "-" + subid;
+ Set<String> targetKeys = new HashSet<>();
+
+ if (serviceSubTaskAnswerReq != null && serviceSubTaskAnswerReq.getType() != null) {
+ if (serviceSubTaskAnswerReq.getType() == 2) {
+ targetKeys.add(scriptCacheKeyPrefix + "-WJscriptCache");
+ } else if (serviceSubTaskAnswerReq.getType() == 1) {
+ targetKeys.add(scriptCacheKeyPrefix + "-SFscriptCache");
+ }
+ } else {
+ //濡傛灉娌℃湁 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;
+ }
}
}
+ //鐢ㄤ簬鎵归噺鏇存柊鐨勫瓙浠诲姟鍒楄〃锛堥伩鍏嶅湪寰幆涓噸澶嶆煡璇級
+ Map<String, ServiceSubtask> subtaskCache = new HashMap<>();
+ String subtaskCacheKey = subid != null ? subid.toString() : pid + "-" + tid;
+
+ //鍏堟煡璇竴娆″瓙浠诲姟淇℃伅
+ ServiceSubtaskEntity ssVO = new ServiceSubtaskEntity();
+ 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 : allKeys) {
+ for (String key : targetKeys) {
String[] split = key.split("-");
//鍏堝垽鏂紝鏄笉鏄綋鍓嶆彁浜や汉鐨勶紝涓嶆槸褰撳墠鎻愪氦浜虹殑锛岃烦杩�
try {
@@ -207,7 +242,11 @@
if (key.contains("-WJscriptCache")) {
List<SvyTaskTemplateScriptVO> cacheList = redisCache.getCacheList(key);
cacheList.sort(Comparator.comparingLong(SvyTaskTemplateScriptVO::getSort));
- log.info("闂嵎鍥炵瓟缁撴灉锛歿}", cacheList);
+ log.info("闂嵎鍥炵瓟缁撴灉锛歿}", CollectionUtils.isEmpty(cacheList) ? null : cacheList.size());
+
+ //鏍￠獙涓�涓嬮鐨勫簭鍙锋槸鍚︽湁闂 (濡傛灉鏍规嵁閫夐」鏃犲簭璺宠浆锛屽氨浼氬鑷撮敊璇�)
+ cacheList = checkQuestionSort(cacheList);
+
for (int i = 0; i < cacheList.size(); i++) {
if (i == 0) {
//杩欎釜鏃堕棿瑕佹壘鍒扮涓�棰�
@@ -220,10 +259,10 @@
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"));
+ 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")));
}
}
}
@@ -231,21 +270,18 @@
} else {
SvyTaskTemplateScriptVO svyTaskTemplateScriptVO = cacheList.get(i);
log.info("svyTaskTemplateScriptVO鐨勪俊鎭负锛歿}锛宨鐨勫�间负锛歿}", svyTaskTemplateScriptVO.getScriptno(), i);
-// SvyTaskTemplateScriptVO svyTaskTemplateScriptVO = DtoConversionUtils.sourceToTarget(cacheList.get(i), SvyTaskTemplateScriptVO.class);
List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = cacheList.get(i).getSvyTaskTemplateTargetoptions();
-// List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = DtoConversionUtils.sourceToTarget(cacheList.get(i).getSvyTaskTemplateTargetoptions(), SvyTaskTemplateTargetoption.class);
svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
if (svyTaskTemplateScriptVO.getSort() != null && svyTaskTemplateScriptVO.getSort().equals(nextScriptno)) {
-// log.error("svyTaskTemplateScriptVO鐨勫�间负锛歿}", svyTaskTemplateScriptVO);
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"));
+ score = map.get("score");
} else {
- score = score + Double.valueOf(map.get("score"));
+ score = String.valueOf(Double.parseDouble(score) + Double.parseDouble(map.get("score")));
}
}
}
@@ -253,24 +289,22 @@
} else if (key.contains("-SFscriptCache")) {
List<IvrTaskTemplateScriptVO> cacheList = redisCache.getCacheList(key);
cacheList.sort(Comparator.comparingLong(IvrTaskTemplateScriptVO::getSort));
- log.error("鐢佃瘽闅忚闂嵎鍥炵瓟缁撴灉锛歿}", cacheList.size());
+ 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) {
//璇存槑鏄涓�棰�
-// IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO = DtoConversionUtils.sourceToTarget(cacheList.get(0), IvrTaskTemplateScriptVO.class);
List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptions = cacheList.get(0).getIvrTaskScriptTargetoptionList();
-// List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptions = DtoConversionUtils.sourceToTarget(ivrLibaTemplateTargetoptions, IvrTaskTemplateTargetoption.class);
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"));
+ 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")));
}
}
}
@@ -286,9 +320,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")));
}
}
}
@@ -296,39 +330,74 @@
} else {
continue;
}
- //灏嗚key鍜寁alue浠巖edis涓紝鍒犻櫎
+ //灏嗚 key 鍜� value 浠� redis 涓紝鍒犻櫎
redisCache.deleteObject(key);
- //鏌ヨ鍑鸿浠诲姟涓鍦ㄦ墽琛岀殑鎮ｈ�呬俊鎭�
- ServiceSubtaskEntity ssVO = new ServiceSubtaskEntity();
- ssVO.setTaskid(tid);
- ssVO.setPatid(pid);
-// ssVO.setSendstate(3L);
- List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(ssVO);
+ //鏌ヨ鍑鸿浠诲姟涓鍦ㄦ墽琛岀殑鎮ｈ�呬俊鎭紙浣跨敤缂撳瓨锛�
+ String currentSubtaskKey = subid != null ? subid.toString() : pid + "-" + tid;
+ ServiceSubtask serviceSubtask;
- ServiceSubtask serviceSubtask = new ServiceSubtask();
- serviceSubtask.setTaskid(tid);
- serviceSubtask.setPatid(pid);
- serviceSubtask.setSubmit(1L);
+ 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鍜寁alue浠巖edis涓�,serviceSubtask鐨勫�间负--------锛歿}", serviceSubtask);
- if (score != null) serviceSubtask.setScore(BigDecimal.valueOf(score));
+ if (score != null && !score.isEmpty()) serviceSubtask.setScore(score);
serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);
+ //淇敼浣忛櫌婊℃剰搴︾姸鎬侊紙閬垮厤閲嶅鏌ヨ锛�
+ if (serviceSubtask.getServiceType() != null && "6".equals(serviceSubtask.getServiceType())) {
+ Long inhospid = serviceSubtask.getInhospid();
+ if (inhospid != null) {
+ PatMedInhosp patMedInhosp = new PatMedInhosp();
+ patMedInhosp.setInhospMydFlag("1");
+ patMedInhosp.setInhospid(inhospid);
+ patMedInhospMapper.updatePatMedInhosp(patMedInhosp);
+ }
+ }
- //灏嗗綋鍓嶅彂閫佺姸鎬佹敼鎴�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);
+ //灏嗗綋鍓嶅彂閫佺姸鎬佹敼鎴� 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);
+ }
}
}
@@ -340,14 +409,16 @@
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";
if (serviceSubTaskCacheReq.getType() == 2) {
List<SvyTaskTemplateScriptVO> cacheList = serviceSubTaskCacheReq.getSvyTaskTemplateScriptVOS();
+ //妫�鏌ュ苟淇闂嵎棰樼洰鎺掑簭
+ cacheList = checkQuestionSort(cacheList);
cacheList.sort(Comparator.comparingLong(SvyTaskTemplateScriptVO::getSort));
- log.info("闂嵎鍥炵瓟缁撴灉锛歿}", cacheList);
+ log.info("闂嵎鍥炵瓟缁撴灉锛歿}", CollectionUtils.isEmpty(cacheList) ? null : cacheList.size());
// 棰勬煡璇㈠惊鐜腑涓嶅彉鐨勬暟鎹紝閬垮厤姣忛閲嶅鏌ユ暟鎹簱
ServiceSubtaskEntity preSubtaskVO = new ServiceSubtaskEntity();
preSubtaskVO.setTaskid(tid);
@@ -357,90 +428,89 @@
ServiceTask preServiceTask = serviceTaskService.selectServiceTaskByTaskid(tid);
Map<Long, Long> preDetailIdMap = getExistingDetailIdMap(subid);
Map<Long, Long> preTraceIdMap = getExistingTraceIdMap(subid);
+
+ // 鎻愬墠瀹氫綅绗竴棰樼殑绱㈠紩锛岄伩鍏嶅悗缁祵濂楀惊鐜�
+ Integer firstSortIndex = -1;
+ if (CollectionUtils.isNotEmpty(cacheList)) {
+ for (int j = 0; j < cacheList.size(); j++) {
+ if (cacheList.get(j).getSort() != null && cacheList.get(j).getSort() == 1L) {
+ firstSortIndex = j;
+ break;
+ }
+ }
+ }
+
for (int i = 0; i < cacheList.size(); i++) {
- if (i == 0) {
- //杩欎釜鏃堕棿瑕佹壘鍒扮涓�棰�
- for (SvyTaskTemplateScriptVO svyTaskTemplateScriptVO : cacheList) {
- if (svyTaskTemplateScriptVO.getSort() == 1L) {
- //璇存槑鏄涓�棰�
- List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = svyTaskTemplateScriptVO.getSvyTaskTemplateTargetoptions();
- svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
- Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, tid, pid, subid, preServiceSubtaskList, preServiceTask, preDetailIdMap, preTraceIdMap);
- if (map == null) continue;
- 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"));
- }
- isabnormalFlag = map.get("isabnormal");
- }
- }
+ SvyTaskTemplateScriptVO svyTaskTemplateScriptVO = cacheList.get(i);
+ log.info("svyTaskTemplateScriptVO 鐨勪俊鎭负锛歿}锛宨 鐨勫�间负锛歿}", svyTaskTemplateScriptVO.getScriptno(), i);
+ List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = svyTaskTemplateScriptVO.getSvyTaskTemplateTargetoptions();
+ svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
- } else {
- SvyTaskTemplateScriptVO svyTaskTemplateScriptVO = cacheList.get(i);
- log.info("svyTaskTemplateScriptVO鐨勪俊鎭负锛歿}锛宨鐨勫�间负锛歿}", svyTaskTemplateScriptVO.getScriptno(), i);
- List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = cacheList.get(i).getSvyTaskTemplateTargetoptions();
- svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
+ // 濡傛灉鏄涓�棰樻垨鑰呭尮閰� nextScriptno 鐨勯鐩�
+ boolean shouldProcess = false;
+ if (i == firstSortIndex) {
+ shouldProcess = true;
+ } else if (nextScriptno != null && svyTaskTemplateScriptVO.getSort() != null && svyTaskTemplateScriptVO.getSort().equals(nextScriptno)) {
+ shouldProcess = true;
+ }
- if (svyTaskTemplateScriptVO.getSort() != null && svyTaskTemplateScriptVO.getSort().equals(nextScriptno)) {
- Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, tid, pid, subid, preServiceSubtaskList, preServiceTask, preDetailIdMap, preTraceIdMap);
- 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"));
- }
- isabnormalFlag = map.get("isabnormal");
+ 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;
+
+ 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")));
}
+ isabnormalFlag = map.get("isabnormal");
}
}
} else if (serviceSubTaskCacheReq.getType() == 1) {
List<IvrTaskTemplateScriptVO> cacheList = serviceSubTaskCacheReq.getIvrTaskTemplateScriptVOList();
cacheList.sort(Comparator.comparingLong(vo -> Optional.ofNullable(vo.getSort()).orElse(0)));
- log.error("鐢佃瘽闅忚闂嵎鍥炵瓟缁撴灉锛歿}", cacheList.size());
+ log.error("鐢佃瘽闅忚闂嵎鍥炵瓟缁撴灉锛歿}", CollectionUtils.isEmpty(cacheList) ? null : cacheList.size());
+
+ // 鎻愬墠瀹氫綅绗竴棰樼殑绱㈠紩
+ Integer firstIvrSortIndex = -1;
+ if (CollectionUtils.isNotEmpty(cacheList)) {
+ for (int j = 0; j < cacheList.size(); j++) {
+ if (cacheList.get(j).getSort() != null && cacheList.get(j).getSort() == 1L) {
+ firstIvrSortIndex = j;
+ break;
+ }
+ }
+ }
+
for (int i = 0; i < cacheList.size(); i++) {
- if (i == 0) {
- //杩欎釜鏃堕棿瑕佹壘鍒扮涓�棰�
- for (IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO : cacheList) {
- if (ivrTaskTemplateScriptVO.getSort() != null && ivrTaskTemplateScriptVO.getSort() == 1L) {
- //璇存槑鏄涓�棰�
- List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptions = ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList();
- ivrTaskTemplateScriptVO.setIvrTaskScriptTargetoptionList(ivrTaskTemplateTargetoptions);
- //瀹冧咯閮芥槸ivr_task_templatescript_id,鎵�浠ヨ繖閲岄渶瑕佽缃竴涓�
- ivrTaskTemplateScriptVO.setId(ivrTaskTemplateScriptVO.getScriptID());
- 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"));
- }
- isabnormalFlag = map.get("isabnormal");
- }
- }
+ IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO = DtoConversionUtils.sourceToTarget(cacheList.get(i), IvrTaskTemplateScriptVO.class);
+ List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptions = DtoConversionUtils.sourceToTarget(cacheList.get(i).getIvrTaskScriptTargetoptionList(), IvrTaskTemplateTargetoption.class);
+ ivrTaskTemplateScriptVO.setIvrTaskScriptTargetoptionList(ivrTaskTemplateTargetoptions);
+ //瀹冧咯閮芥槸 ivr_task_templatescript_id,鎵�浠ヨ繖閲岄渶瑕佽缃竴涓�
+ ivrTaskTemplateScriptVO.setId(ivrTaskTemplateScriptVO.getScriptID());
- } else {
- IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO = DtoConversionUtils.sourceToTarget(cacheList.get(i), IvrTaskTemplateScriptVO.class);
- List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptions = DtoConversionUtils.sourceToTarget(cacheList.get(i).getIvrTaskScriptTargetoptionList(), IvrTaskTemplateTargetoption.class);
- ivrTaskTemplateScriptVO.setIvrTaskScriptTargetoptionList(ivrTaskTemplateTargetoptions);
+ boolean shouldProcess = false;
+ if (i == firstIvrSortIndex) {
+ shouldProcess = true;
+ } else if (nextScriptno != null && ivrTaskTemplateScriptVO.getSort() != null && Long.valueOf(ivrTaskTemplateScriptVO.getSort()).equals(nextScriptno)) {
+ shouldProcess = true;
+ }
- if (ivrTaskTemplateScriptVO.getSort() != null && Long.valueOf(ivrTaskTemplateScriptVO.getSort()).equals(nextScriptno)) {
- Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, tid, pid, subid);
- 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"));
- }
- isabnormalFlag = map.get("isabnormal");
+ if (shouldProcess) {
+ Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, tid, pid, subid);
+ 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")));
}
+ isabnormalFlag = map.get("isabnormal");
}
}
}
@@ -461,7 +531,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瀹屾垚
@@ -517,55 +587,48 @@
}
if (CollectionUtils.isNotEmpty(serviceSubTaskMYDAnswerReq.getSvyTaskTemplateScriptVOS())) {
- Double score = null;
+ String score = "0";
List<SvyTaskTemplateScriptVO> svyTaskTemplateScriptVOS = serviceSubTaskMYDAnswerReq.getSvyTaskTemplateScriptVOS();
Long nextScriptno = null;
+
+ // 鎻愬墠瀹氫綅绗竴棰樼殑绱㈠紩
+ Integer firstMydSortIndex = -1;
+ if (CollectionUtils.isNotEmpty(svyTaskTemplateScriptVOS)) {
+ for (int j = 0; j < svyTaskTemplateScriptVOS.size(); j++) {
+ if (svyTaskTemplateScriptVOS.get(j).getSort() != null && svyTaskTemplateScriptVOS.get(j).getSort() == 1L) {
+ firstMydSortIndex = j;
+ break;
+ }
+ }
+ }
+
for (int i = 0; i < svyTaskTemplateScriptVOS.size(); i++) {
- if (i == 0) {
- //杩欎釜鏃堕棿瑕佹壘鍒扮涓�棰�
- for (SvyTaskTemplateScriptVO svyTaskTemplateScriptVO : svyTaskTemplateScriptVOS) {
- if (svyTaskTemplateScriptVO.getSort() == 1L) {
- //璇存槑鏄涓�棰�
-// SvyTaskTemplateScriptVO svyTaskTemplateScriptVO = DtoConversionUtils.sourceToTarget(svyLibTemplateScriptVOS.get(0), SvyTaskTemplateScriptVO.class);
- List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = svyTaskTemplateScriptVOS.get(0).getSvyTaskTemplateTargetoptions();
-// List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = DtoConversionUtils.sourceToTarget(svyTaskTemplateTargetoptions, SvyTaskTemplateTargetoption.class);
- svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
- Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, Long.valueOf(serviceSubTaskMYDAnswerReq.getTaskId()), patid, serviceSubTaskMYDAnswerReq.getSubId());
- if (map == null) continue;
- 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 (!Objects.isNull(map.get("id"))) {
- idList.add(Long.valueOf(map.get("id")));
- }
- }
+ SvyTaskTemplateScriptVO svyTaskTemplateScriptVO = svyTaskTemplateScriptVOS.get(i);
+ List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = svyTaskTemplateScriptVOS.get(i).getSvyTaskTemplateTargetoptions();
+ svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
+
+ boolean shouldProcess = false;
+ if (i == firstMydSortIndex) {
+ shouldProcess = true;
+ } else if (nextScriptno != null && svyTaskTemplateScriptVO.getSort() != null && svyTaskTemplateScriptVO.getSort().equals(nextScriptno)) {
+ shouldProcess = true;
+ }
+
+ if (shouldProcess) {
+ Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, Long.valueOf(serviceSubTaskMYDAnswerReq.getTaskId()), patid, serviceSubTaskMYDAnswerReq.getSubId());
+ if (map == null) continue;
+
+ 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")));
}
- } else {
- SvyTaskTemplateScriptVO svyTaskTemplateScriptVO = svyTaskTemplateScriptVOS.get(i);
-// SvyTaskTemplateScriptVO svyTaskTemplateScriptVO = DtoConversionUtils.sourceToTarget(svyLibTemplateScriptVOS.get(i), SvyTaskTemplateScriptVO.class);
- List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = svyTaskTemplateScriptVOS.get(i).getSvyTaskTemplateTargetoptions();
-// List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = DtoConversionUtils.sourceToTarget(svyLibTemplateScriptVOS.get(i).getSvyLibTemplateTargetoptions(), SvyTaskTemplateTargetoption.class);
- svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
-
- if (svyTaskTemplateScriptVO.getSort() != null && svyTaskTemplateScriptVO.getSort().equals(nextScriptno)) {
- log.error("svyTaskTemplateScriptVO鐨勫�间负锛歿}", svyTaskTemplateScriptVO);
- Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, Long.valueOf(serviceSubTaskMYDAnswerReq.getTaskId()), patid, serviceSubTaskMYDAnswerReq.getSubId());
- log.error("map鐨勪俊鎭负锛歿}", map);
- 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 (!Objects.isNull(map.get("id"))) {
- idList.add(Long.valueOf(map.get("id")));
- }
+ if (!Objects.isNull(map.get("id"))) {
+ idList.add(Long.valueOf(map.get("id")));
}
}
}
@@ -624,7 +687,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();
@@ -649,7 +712,6 @@
return true;
}
-
/**
* 灏嗛棶棰樹繚瀛樺埌缂撳瓨涓�
@@ -745,6 +807,13 @@
public Map<String, Object> selectPatQuestionResult(ServiceSubTaskQueryReq serviceSubTaskQueryReq) {
log.info("selectPatQuesTionResult鐨勫叆鍙備负锛歿}", serviceSubTaskQueryReq);
Map<String, Object> map = new HashMap<>();
+ if (serviceSubTaskQueryReq.getSubId() != null) {
+ ServiceSubtask serviceSubtask = serviceSubtaskMapper.selectServiceSubtaskById(serviceSubTaskQueryReq.getSubId());
+ if (serviceSubtask.getSendstate() == 4L) {
+ log.info("鎮ｈ�呭瓙浠诲姟ID涓猴細{}锛岀姸鎬佷负锛歿}", serviceSubTaskQueryReq.getSubId(), serviceSubtask.getSendstate());
+ throw new BaseException("璇ヤ换鍔′笉鎵ц");
+ }
+ }
//鑾峰彇鏈鐨勯棶绛旂粨鏋�
Map<String, Object> scriptInfoByCondition = serviceTaskService.getScriptInfoByCondition(serviceSubTaskQueryReq.getTaskid(), serviceSubTaskQueryReq.getPatid(), serviceSubTaskQueryReq.getIsFinish(), serviceSubTaskQueryReq.getPatfrom(), serviceSubTaskQueryReq.getSubId());
@@ -756,7 +825,7 @@
map.put("templateName", serviceSubtask.getTemplatename());
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(),serviceSubTaskQueryReq.getSubId());
+ Map<String, Object> scriptInfoByCondition2 = serviceTaskService.getScriptInfoByCondition(serviceSubTaskQueryReq.getTaskid(), serviceSubTaskQueryReq.getPatid(), serviceSubTaskQueryReq.getIsFinish(), serviceSubTaskQueryReq.getPatfrom(), serviceSubTaskQueryReq.getSubId());
Map<String, Object> map1 = getMap(scriptInfoByCondition2, Long.valueOf(serviceSubtask.getUpid()), serviceSubTaskQueryReq.getPatid());
if (!map1.isEmpty()) {
map.put("upScriptResult", map1.get("scriptResult"));
@@ -901,9 +970,7 @@
return map;
}
- 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) {
+ 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";
//涓嬮璺宠浆
@@ -931,6 +998,7 @@
serviceSubtaskDetailVO.setAsrtext(StringUtils.isEmpty(svyTaskTemplateScriptVO.getScriptResult()) ? "" : svyTaskTemplateScriptVO.getScriptResult().replaceAll("^\"|\"$", ""));
serviceSubtaskDetailVO.setMatchedtext(StringUtils.isEmpty(svyTaskTemplateScriptVO.getScriptResult()) ? "" : svyTaskTemplateScriptVO.getScriptResult().replaceAll("^\"|\"$", ""));
serviceSubtaskDetailVO.setScore(svyTaskTemplateScriptVO.getScore() != null ? svyTaskTemplateScriptVO.getScore().toString() : "0");
+ serviceSubtaskDetailVO.setAnswerps(svyTaskTemplateScriptVO.getAnswerps());
} else {
//闈炲崟澶氶��
if (StringUtils.isNotEmpty(svyTaskTemplateScriptVO.getScriptResult())) {
@@ -980,13 +1048,23 @@
//鑾峰彇涓�涓嬮棶棰橀�夐」
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;
+ log.error("鎵惧埌鍖归厤鐨勯�夐」");
+ break; // 鎵惧埌鍖归厤椤瑰悗璺冲嚭寰幆
+ }
+ }
}
- //鍒ゆ柇涓�涓嬪綋鍓嶇殑闂鏄笉鏄弧鎰忓害闂锛屽苟涓攄utyDeptCode鏄惁鏈夊�硷紝骞朵笖閫夐」鏄笉鏄紓甯搁�夐」锛屽鏋滃叏绗﹀悎锛屽垯寰�婊℃剰搴﹂棶棰樺紓甯歌〃鏂板
- if (StringUtils.isNotEmpty(svyTaskTemplateScriptVO.getDutyDeptCode()) && stt != null && 1 == stt.getIsabnormal()) {
+ //鍒ゆ柇涓�涓嬪綋鍓嶇殑闂鏄笉鏄弧鎰忓害闂锛屽苟涓� dutyDeptCode 鏄惁鏈夊�硷紝骞朵笖閫夐」鏄笉鏄紓甯搁�夐」锛屽鏋滃叏绗﹀悎锛屽垯寰�婊℃剰搴﹂棶棰樺紓甯歌〃鏂板
+ if (StringUtils.isNotEmpty(svyTaskTemplateScriptVO.getDutyDeptCode()) && stt != null && Long.valueOf(1L).equals(stt.getIsabnormal()) || StringUtils.isNotEmpty(svyTaskTemplateScriptVO.getDutyDeptCode()) && StringUtils.isNotEmpty(svyTaskTemplateScriptVO.getIsMydException())) {
isabnormalFlag = 1L;
ServiceSubtaskDetailTrace subtaskDetailTrace = new ServiceSubtaskDetailTrace();
subtaskDetailTrace.setDetailId(serviceSubtaskDetail.getId());
@@ -994,24 +1072,25 @@
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.setMatchedtext(stt != null ? stt.getOptioncontent() : svyTaskTemplateScriptVO.getIsMydException());
subtaskDetailTrace.setGuid(svyTaskTemplateScriptVO.getGuid());
subtaskDetailTrace.setValueType(serviceSubtaskDetail.getValueType());
+ subtaskDetailTrace.setIsMydException(svyTaskTemplateScriptVO.getIsMydException());
subtaskDetailTrace.setTemplateType(2);
SvyLibScriptCategory svyLibScriptCategory = svyLibScriptCategoryMapper.selectSvyLibScriptCategoryById(svyTaskTemplateScriptVO.getCategoryid());
subtaskDetailTrace.setType(svyLibScriptCategory != null ? svyLibScriptCategory.getType() : null);
subtaskDetailTrace.setScriptid(svyTaskTemplateScriptVO.getId());
- subtaskDetailTrace.setAsrtext(stt.getOptioncontent());
+ subtaskDetailTrace.setAsrtext(stt != null ? stt.getOptioncontent() : svyTaskTemplateScriptVO.getIsMydException());
subtaskDetailTrace.setRecordpath(null);
subtaskDetailTrace.setPatid(selectServiceSubtaskList.get(0).getPatid());
JSONObject patdescJson1 = new JSONObject();
@@ -1027,13 +1106,17 @@
subtaskDetailTrace.setCreateTime(new Date());
subtaskDetailTrace.setUpdateTime(new Date());
subtaskDetailTrace.setOrgid(selectServiceSubtaskList.get(0).getOrgid());
+ subtaskDetailTrace.setDutyDeptPersonCode(svyTaskTemplateScriptVO.getDutyDeptPersonCode());
+ subtaskDetailTrace.setDutyDeptPersonName(svyTaskTemplateScriptVO.getDutyDeptPersonName());
+ subtaskDetailTrace.setReportDeptPersonCode(svyTaskTemplateScriptVO.getReportDeptPersonCode());
+ subtaskDetailTrace.setReportDeptPersonName(svyTaskTemplateScriptVO.getReportDeptPersonName());
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) {
@@ -1255,12 +1338,13 @@
//鍒ゆ柇涓�涓嬪綋鍓嶇殑闂鏄笉鏄弧鎰忓害闂锛屽苟涓攄utyDeptCode鏄惁鏈夊�硷紝骞朵笖閫夐」鏄笉鏄紓甯搁�夐」锛屽鏋滃叏绗﹀悎锛屽垯寰�婊℃剰搴﹂棶棰樺紓甯歌〃鏂板
- if (StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getDutyDeptCode()) && 1 == stt.getIsabnormal()) {
+ if (StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getDutyDeptCode()) && 1 == stt.getIsabnormal() || StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getDutyDeptCode()) && StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getIsMydException())) {
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()));
@@ -1270,7 +1354,7 @@
ivrLibaScriptAssort = ivrLibaScriptAssortMapper.selectIvrLibaScriptAssortById(ivrTaskTemplateScriptVO.getScriptAssortid());
//鑾峰彇鐢ㄦ埛閫夊嚭鐨勯�夐」鐨処D
- 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() : ""));
@@ -1300,6 +1384,10 @@
subtaskDetailTrace.setCreateTime(new Date());
subtaskDetailTrace.setUpdateTime(new Date());
subtaskDetailTrace.setOrgid(selectServiceSubtaskList.get(0).getOrgid());
+ subtaskDetailTrace.setDutyDeptPersonCode(ivrTaskTemplateScriptVO.getDutyDeptPersonCode());
+ subtaskDetailTrace.setDutyDeptPersonName(ivrTaskTemplateScriptVO.getDutyDeptPersonName());
+ subtaskDetailTrace.setReportDeptPersonCode(ivrTaskTemplateScriptVO.getReportDeptPersonCode());
+ subtaskDetailTrace.setReportDeptPersonName(ivrTaskTemplateScriptVO.getReportDeptPersonName());
ServiceSubtaskDetailTraceVO ssdt = new ServiceSubtaskDetailTraceVO();
ssdt.setSubId(subtaskDetailTrace.getSubId());
@@ -1310,6 +1398,7 @@
subtaskDetailTrace.setId(serviceSubtaskDetailTraces.get(0).getId());
traceService.updateServiceSubtaskDetailTtrace(subtaskDetailTrace);
} else traceService.insertServiceSubtaskDetailTtrace(subtaskDetailTrace);
+
} else if (stt != null && stt.getIsabnormal() != null && stt.getIsabnormal() != 1L) {
//杩欓噷涓昏鏄�曞尰鎶や汉鍛樻妸寮傚父閫夐」鏀规垚浜嗛潪寮傚父鐨勶紝杩欓噷灏遍渶瑕佹煡涓�涓嬭繖鏉℃暟鎹槸涓嶆槸鍦ㄦ弧鎰忓害寮傚父琛紝濡傛灉鍦紝鍒欒鍒犻櫎
ServiceSubtaskDetailTraceVO subtaskDetailTraceVO = new ServiceSubtaskDetailTraceVO();
@@ -1333,4 +1422,127 @@
map.put("isabnormal", isabnormalFlag);
return map;
}
+
+ /**
+ * 妫�鏌ュ苟淇闂嵎棰樼洰鎺掑簭(濡傛灉鏍规嵁閫夐」鏃犲簭璺宠浆锛屽氨浼氬鑷撮敊璇�)
+ *
+ * @param svyTaskTemplateScriptVOList 闂嵎棰樼洰 VO 鍒楄〃
+ * @return 淇鍚庣殑闂嵎棰樼洰鍒楄〃
+ */
+ public List<SvyTaskTemplateScriptVO> checkQuestionSort(List<SvyTaskTemplateScriptVO> svyTaskTemplateScriptVOList) {
+ if (CollectionUtils.isEmpty(svyTaskTemplateScriptVOList)) {
+ return svyTaskTemplateScriptVOList;
+ }
+
+ // 鎸夊綋鍓� sort 鎺掑簭
+ svyTaskTemplateScriptVOList.sort(Comparator.comparingLong(SvyTaskTemplateScriptVO::getSort));
+
+ // 鍏堟鏌ヤ竴涓嬫槸鍚﹀凡缁忔槸姝ｇ‘鐨勯『搴忥細杩炵画鐨勫簭鍙� 1,2,3... 涓旀渶鍚庝竴涓棶棰樼殑 nextScriptno 涓� "0"
+ boolean isCorrect = true;
+ int expectedValue = 1;
+
+ for (int i = 0; i < svyTaskTemplateScriptVOList.size(); i++) {
+ SvyTaskTemplateScriptVO vo = svyTaskTemplateScriptVOList.get(i);
+
+ // 妫�鏌� sort 鏄惁杩炵画
+ if (!Objects.equals(expectedValue, vo.getSort())) {
+ isCorrect = false;
+ break;
+ }
+
+ // 濡傛灉涓嶆槸鏈�鍚庝竴涓棶棰橈紝妫�鏌� nextScriptno 鏄惁鏄笅涓�棰樼殑搴忓彿
+ if (i < svyTaskTemplateScriptVOList.size() - 1) {
+ String expectedNextScriptNo = String.valueOf(expectedValue + 1);
+ if (!expectedNextScriptNo.equals(vo.getNextScriptno())) {
+ isCorrect = false;
+ break;
+ }
+ } else {
+ // 鏈�鍚庝竴涓棶棰樼殑 nextScriptno 蹇呴』鏄� "0"
+ if (!"0".equals(vo.getNextScriptno())) {
+ isCorrect = false;
+ break;
+ }
+
+ // 妫�鏌ユ渶鍚庝竴涓棶棰樼殑鎵�鏈夐�夐」鐨� nextQuestion 鏄惁涓� 0
+ if (CollectionUtils.isNotEmpty(vo.getSvyTaskTemplateTargetoptions())) {
+ for (SvyTaskTemplateTargetoption option : vo.getSvyTaskTemplateTargetoptions()) {
+ if (option.getNextQuestion() == null || !option.getNextQuestion().equals(0)) {
+ isCorrect = false;
+ break;
+ }
+ }
+ }
+ }
+
+ expectedValue++;
+ }
+
+ // 濡傛灉宸茬粡鏄纭殑锛岀洿鎺ヨ繑鍥烇紝涓嶅啀杩涜鏁版嵁搴撴洿鏂�
+ if (isCorrect) {
+ log.debug("闂嵎棰樼洰鎺掑簭姝ｇ‘锛屾棤闇�淇锛屽叡 {} 涓鐩�", svyTaskTemplateScriptVOList.size());
+ return svyTaskTemplateScriptVOList;
+ }
+
+ log.info("妫�娴嬪埌闂嵎棰樼洰闇�瑕佷慨姝ｏ紝寮�濮嬪鐞�...");
+
+ // 閲嶆柊鍒嗛厤杩炵画鐨� sort 鍊硷細1, 2, 3...
+ int newSortValue = 1;
+ List<SvyTaskTemplateScriptVO> updatedList = new ArrayList<>();
+
+ for (int i = 0; i < svyTaskTemplateScriptVOList.size(); i++) {
+ SvyTaskTemplateScriptVO vo = svyTaskTemplateScriptVOList.get(i);
+ Long oldSort = vo.getSort();
+
+ // 濡傛灉 sort 涓嶆槸棰勬湡鐨勮繛缁�硷紝鍒欓渶瑕佹洿鏂�
+ if (!Objects.equals(newSortValue, oldSort)) {
+ log.warn("妫�娴嬪埌棰樼洰搴忓彿涓嶈繛缁紝棰樼洰 ID: {}锛屽師 sort: {}, 鏂� sort: {}", vo.getId(), oldSort, newSortValue);
+ vo.setSort((long) newSortValue);
+ }
+
+ // 澶勭悊涓嬩竴涓棶棰樼殑 nextScriptno锛氶櫎鏈�鍚庝竴涓锛宯extScriptno = 褰撳墠 sort + 1
+ if (i < svyTaskTemplateScriptVOList.size() - 1) {
+ String expectedNextScriptNo = String.valueOf(newSortValue + 1);
+ String currentNextScriptNo = vo.getNextScriptno();
+ if (!Objects.equals(expectedNextScriptNo, currentNextScriptNo)) {
+ log.warn("妫�娴嬪埌 nextScriptno 涓嶆纭紝棰樼洰 ID: {}锛屽師 nextScriptno: {}, 鏂� nextScriptno: {}", vo.getId(), currentNextScriptNo, expectedNextScriptNo);
+ vo.setNextScriptno(expectedNextScriptNo);
+ }
+ } else {
+ // 鏈�鍚庝竴涓棶棰樼殑 nextScriptno 蹇呴』鏄� "0"
+ String currentNextScriptNo = vo.getNextScriptno();
+ if (!"0".equals(currentNextScriptNo)) {
+ log.warn("妫�娴嬪埌鏈�鍚庝竴涓鐩殑 nextScriptno 搴斾负 0锛岄鐩� ID: {}锛屽師 nextScriptno: {}", vo.getId(), currentNextScriptNo);
+ vo.setNextScriptno("0");
+ }
+ }
+
+ // 澶勭悊姣忎釜閫夐」鐨� nextQuestion
+ if (CollectionUtils.isNotEmpty(vo.getSvyTaskTemplateTargetoptions())) {
+ // 鍒ゆ柇鏄惁鏄渶鍚庝竴涓棶棰�
+ boolean isLastQuestion = (i == svyTaskTemplateScriptVOList.size() - 1);
+ int expectedNextQuestion = isLastQuestion ? 0 : newSortValue;
+
+ for (SvyTaskTemplateTargetoption option : vo.getSvyTaskTemplateTargetoptions()) {
+ Integer optionNextQuestion = option.getNextQuestion();
+ int finalNextQuestion = expectedNextQuestion;
+
+ if (!isLastQuestion && (optionNextQuestion == null || !optionNextQuestion.equals(newSortValue))) {
+ log.info("妫�娴嬪埌閫夐」鐨� nextQuestion 涓嶆纭紝閫夐」 ID: {}锛岄鐩� ID: {}锛屽師 nextQuestion: {}, 鏂� nextQuestion: {}", option.getId(), vo.getId(), optionNextQuestion, newSortValue);
+ finalNextQuestion = newSortValue;
+ } else if (isLastQuestion && (optionNextQuestion == null || !optionNextQuestion.equals(0))) {
+ log.info("妫�娴嬪埌鏈�鍚庝竴涓棶棰樼殑閫夐」 nextQuestion 搴斾负 0锛岄�夐」 ID: {}锛岄鐩� ID: {}锛屽師 nextQuestion: {}, 鏂� nextQuestion: {}", option.getId(), vo.getId(), optionNextQuestion, 0);
+ }
+
+ option.setNextQuestion(finalNextQuestion);
+ }
+ }
+
+ updatedList.add(vo);
+ newSortValue++;
+ }
+
+ return updatedList;
+ }
+
}
--
Gitblit v1.9.3