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 | 212 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 145 insertions(+), 67 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 63a5cda..c52c87f 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -165,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) {
@@ -185,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 {
@@ -227,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")));
}
}
}
@@ -247,9 +279,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")));
}
}
}
@@ -269,10 +301,10 @@
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")));
}
}
}
@@ -288,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")));
}
}
}
@@ -298,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);
+ }
}
}
@@ -342,7 +409,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 +463,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 +506,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 +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瀹屾垚
@@ -520,7 +587,7 @@
}
if (CollectionUtils.isNotEmpty(serviceSubTaskMYDAnswerReq.getSvyTaskTemplateScriptVOS())) {
- Double score = null;
+ String score = "0";
List<SvyTaskTemplateScriptVO> svyTaskTemplateScriptVOS = serviceSubTaskMYDAnswerReq.getSvyTaskTemplateScriptVOS();
Long nextScriptno = null;
@@ -552,13 +619,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 +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();
@@ -982,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());
@@ -996,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();
@@ -1039,7 +1116,7 @@
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) {
@@ -1261,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()));
@@ -1276,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() : ""));
--
Gitblit v1.9.3