From 3d453a41ccd7c69a40bd9bfa31f8c5b159513b6b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 10 十月 2025 16:09:00 +0800
Subject: [PATCH] 修改BUG
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java | 274 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 228 insertions(+), 46 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..a58d12c 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -1,17 +1,12 @@
package com.smartor.service.impl;
-import afu.org.checkerframework.checker.oigj.qual.O;
-import com.alibaba.fastjson2.JSON;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.RSAPublicKeyExample;
import com.ruoyi.common.utils.StringUtils;
import com.smartor.domain.*;
-import com.smartor.mapper.ServiceSubtaskAnswerMapper;
-import com.smartor.mapper.ServiceSubtaskDetailMapper;
-import com.smartor.mapper.ServiceSubtaskMapper;
-import com.smartor.mapper.SvyTaskTemplateTargetoptionMapper;
+import com.smartor.mapper.*;
import com.smartor.service.IServiceSubtaskAnswerService;
import com.smartor.service.IServiceTaskService;
import lombok.extern.slf4j.Slf4j;
@@ -23,7 +18,6 @@
import java.math.BigDecimal;
import java.util.*;
-import java.util.concurrent.TimeUnit;
/**
* 浠诲姟闂嵎闂閫夐」Service涓氬姟灞傚鐞�
@@ -41,6 +35,9 @@
private ServiceSubtaskMapper serviceSubtaskMapper;
@Autowired
+ private ServiceSubtaskPreachformMapper serviceSubtaskPreachformMapper;
+
+ @Autowired
private RedisCache redisCache;
@Autowired
@@ -50,10 +47,20 @@
private IServiceTaskService serviceTaskService;
@Autowired
- private SvyTaskTemplateTargetoptionMapper svyTaskTemplateTargetoptionMapper;
+ private PatArchiveMapper patArchiveMapper;
+
+
+ @Autowired
+ private PatMedInhospMapper patMedInhospMapper;
+
+ @Autowired
+ private PatMedOuthospMapper patMedOuthospMapper;
@Value("${pri_key}")
private String pri_key;
+
+ @Value("${dealDeptCode}")
+ private String dealDeptCode;
/**
* 鏌ヨ浠诲姟闂嵎闂閫夐」
@@ -129,6 +136,7 @@
Long tid = null;
Long pid = null;
Double score = null;
+ Long isabno = 0L;
Set<String> allKeys = redisCache.getAllKeys();
if (ObjectUtils.isNotEmpty(serviceSubTaskAnswerReq)) {
//闇�瑕佺珛鍗虫墽琛�
@@ -179,7 +187,8 @@
svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, tid, pid);
if (map == null) continue aa;
- 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"));
} else {
@@ -197,7 +206,8 @@
log.error("svyTaskTemplateScriptVO鐨勫�间负锛歿}", svyTaskTemplateScriptVO);
Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, Long.valueOf(split[1]), Long.valueOf(split[0]));
log.error("map鐨勪俊鎭负锛歿}", map);
- 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"));
} else {
@@ -221,7 +231,8 @@
List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptions = DtoConversionUtils.sourceToTarget(ivrLibaTemplateTargetoptions, IvrTaskTemplateTargetoption.class);
ivrTaskTemplateScriptVO.setIvrTaskScriptTargetoptionList(ivrTaskTemplateTargetoptions);
Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, tid, pid);
- 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"));
} else {
@@ -238,7 +249,8 @@
if (ivrTaskTemplateScriptVO.getSort() != null && Long.valueOf(ivrTaskTemplateScriptVO.getSort()).equals(nextScriptno)) {
Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, Long.valueOf(split[1]), Long.valueOf(split[0]));
log.error("map鐨勪俊鎭负锛歿}", map);
- 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"));
} else {
@@ -252,6 +264,14 @@
}
//灏嗚key鍜寁alue浠巖edis涓紝鍒犻櫎
redisCache.deleteObject(key);
+
+ //鏌ヨ鍑鸿浠诲姟涓鍦ㄦ墽琛岀殑鎮ｈ�呬俊鎭�
+ ServiceSubtaskVO ssVO = new ServiceSubtaskVO();
+ ssVO.setTaskid(tid);
+ ssVO.setPatid(pid);
+ ssVO.setSendstate(3L);
+ List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(ssVO);
+
ServiceSubtask serviceSubtask = new ServiceSubtask();
serviceSubtask.setTaskid(tid);
serviceSubtask.setPatid(pid);
@@ -263,8 +283,186 @@
log.error("灏嗚key鍜寁alue浠巖edis涓�,serviceSubtask鐨勫�间负--------锛歿}", serviceSubtask);
if (score != null) serviceSubtask.setScore(BigDecimal.valueOf(score));
serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);
+
+ //灏嗗綋鍓嶅彂閫佺姸鎬佹敼鎴�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);
+ }
+
}
return 1;
+ }
+
+ @Override
+ public Boolean saveMYDQuestionAnswer(ServiceSubTaskMYDAnswerReq serviceSubTaskMYDAnswerReq) {
+ //鐢ㄦ潵澶勭悊鎶曡瘔寤鸿鐨勯儴闂�
+ String dealDept = null;
+
+ Long patid = null;
+ List<PatMedInhosp> patMedInhospList = null;
+ List<PatMedOuthosp> patMedOuthosps = null;
+ List<Long> idList = new ArrayList<>();
+ if (serviceSubTaskMYDAnswerReq.getMzzy().equals("1")) {
+ //浣忛櫌
+ PatMedInhosp patMedInhosp = new PatMedInhosp();
+ patMedInhosp.setSerialnum(serviceSubTaskMYDAnswerReq.getSerialnum());
+ patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
+ if (CollectionUtils.isNotEmpty(patMedInhospList)) patid = patMedInhospList.get(0).getPatid();
+ } else if (serviceSubTaskMYDAnswerReq.getMzzy().equals("2")) {
+ //闂ㄨ瘖
+ PatMedOuthosp patMedOuthosp = new PatMedOuthosp();
+ patMedOuthosp.setSerialnum(serviceSubTaskMYDAnswerReq.getSerialnum());
+ patMedOuthosps = patMedOuthospMapper.selectPatMedOuthospList(patMedOuthosp);
+ if (CollectionUtils.isNotEmpty(patMedOuthosps)) patid = patMedOuthosps.get(0).getPatid();
+ } else if (serviceSubTaskMYDAnswerReq.getMzzy().equals("3")) {
+ //鎸囧畾涓�涓儴闂紝鐢ㄦ潵澶勭悊鎶曡瘔寤鸿
+ dealDept = dealDeptCode;
+ String serialnum = serviceSubTaskMYDAnswerReq.getSerialnum();
+ PatArchive patArchive = new PatArchive();
+ patArchive.setPatientno(serialnum);
+ List<PatArchive> patArchives = patArchiveMapper.selectPatArchiveList(patArchive);
+ if (CollectionUtils.isNotEmpty(patArchives)) {
+ patid = patArchives.get(0).getId();
+ }
+ }
+
+ if (CollectionUtils.isNotEmpty(serviceSubTaskMYDAnswerReq.getSvyLibTemplateScriptVOS())) {
+ Double score = null;
+ List<SvyLibTemplateScriptVO> svyLibTemplateScriptVOS = serviceSubTaskMYDAnswerReq.getSvyLibTemplateScriptVOS();
+ Long nextScriptno = null;
+ for (int i = 0; i < svyLibTemplateScriptVOS.size(); i++) {
+ if (i == 0) {
+ //杩欎釜鏃堕棿瑕佹壘鍒扮涓�棰�
+ for (SvyLibTemplateScriptVO svyLibTemplateScriptVO : svyLibTemplateScriptVOS) {
+ if (svyLibTemplateScriptVO.getSort() == 1L) {
+ //璇存槑鏄涓�棰�
+ SvyTaskTemplateScriptVO svyTaskTemplateScriptVO = DtoConversionUtils.sourceToTarget(svyLibTemplateScriptVOS.get(0), SvyTaskTemplateScriptVO.class);
+ List<SvyLibTemplateTargetoption> svyLibTemplateTargetoptions = svyLibTemplateScriptVOS.get(0).getSvyLibTemplateTargetoptions();
+ List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = DtoConversionUtils.sourceToTarget(svyLibTemplateTargetoptions, SvyTaskTemplateTargetoption.class);
+ svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
+ Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, Long.valueOf(serviceSubTaskMYDAnswerReq.getTaskId()), patid);
+ 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")));
+ }
+ }
+ }
+
+ } else {
+ SvyTaskTemplateScriptVO svyTaskTemplateScriptVO = DtoConversionUtils.sourceToTarget(svyLibTemplateScriptVOS.get(i), SvyTaskTemplateScriptVO.class);
+ 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);
+ 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")));
+ }
+ }
+ }
+ }
+ ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(Long.valueOf(serviceSubTaskMYDAnswerReq.getTaskId()));
+ PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patid);
+
+ if (!Objects.isNull(serviceTask)) {
+ ServiceSubtask serviceSubtask = new ServiceSubtask();
+ serviceSubtask.setTaskid(serviceTask.getTaskid());
+ serviceSubtask.setTaskName(serviceTask.getTaskName());
+ serviceSubtask.setTaskDesc(serviceTask.getTaskDesc());
+ serviceSubtask.setTemplateid(serviceTask.getTemplateid());
+ serviceSubtask.setTemplatename(serviceTask.getTemplatename());
+ 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.setLeavehospitaldistrictcode(patMedInhospList.get(0).getLeavehospitaldistrictcode());
+ serviceSubtask.setLeavehospitaldistrictname(patMedInhospList.get(0).getLeavehospitaldistrictname());
+ serviceSubtask.setDrname(patMedInhospList.get(0).getDrname());
+ serviceSubtask.setDrcode(patMedInhospList.get(0).getDrcode());
+ serviceSubtask.setNurseName(patMedInhospList.get(0).getNurseName());
+ serviceSubtask.setNurseId(patMedInhospList.get(0).getNurseId());
+ serviceSubtask.setInhospid(patMedInhospList.get(0).getInhospid());
+ 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.setDrname(patMedOuthosps.get(0).getDrname());
+ serviceSubtask.setDrcode(patMedOuthosps.get(0).getDrcode());
+ serviceSubtask.setServiceType("14");
+ }
+ if (!Objects.isNull(patArchive)) {
+ serviceSubtask.setPatid(patArchive.getId());
+ serviceSubtask.setSendname(patArchive.getName());
+ serviceSubtask.setSex(patArchive.getSex());
+ serviceSubtask.setPhone(patArchive.getTelcode());
+ serviceSubtask.setSfzh(patArchive.getIdcardno());
+ serviceSubtask.setAddr(patArchive.getPlaceOfResidence());
+ serviceSubtask.setOrgid(patArchive.getOrgid());
+ }
+ if (StringUtils.isNotEmpty(dealDept)) {
+ //鎶曡瘔寤鸿鐨勫鐞嗛儴闂�
+ serviceSubtask.setDeptcode(dealDept);
+ serviceSubtask.setServiceType("15");
+ }
+ serviceSubtask.setSubmit(1L);
+ serviceSubtask.setSendstate(6L);
+ serviceSubtask.setType("2");
+ serviceSubtask.setExcep(null);
+ serviceSubtask.setFinishtime(new Date());
+ serviceSubtask.setUpdateTime(new Date());
+ serviceSubtask.setCreateTime(new Date());
+ serviceSubtask.setVisitTime(new Date());
+ if (score != null) serviceSubtask.setScore(BigDecimal.valueOf(score));
+ serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
+ //灏嗗綋鍓嶅彂閫佺姸鎬佹敼鎴�9瀹屾垚
+ ServiceSubtaskPreachform serviceSubtaskPreachform = new ServiceSubtaskPreachform();
+ serviceSubtaskPreachform.setPreachform(serviceSubtask.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);
+ }
+
+ for (Long detailId : idList) {
+ ServiceSubtaskDetail serviceSubtaskDetail = new ServiceSubtaskDetail();
+ serviceSubtaskDetail.setId(detailId);
+ serviceSubtaskDetail.setSubId(serviceSubtask.getId());
+ serviceSubtaskDetailMapper.updateServiceSubtaskDetail(serviceSubtaskDetail);
+ }
+ }
+ }
+
+ return true;
}
@@ -287,7 +485,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 +493,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 +562,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,9 +580,10 @@
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");
+ List<IvrTaskTemplateScriptVO> ivrTaskTemplateScriptVOS = (List<IvrTaskTemplateScriptVO>) scriptInfoByCondition.get("script");
+ List<IvrLibaTemplateScriptVO> ivrLibaTemplateScriptVOList = DtoConversionUtils.sourceToTarget(ivrTaskTemplateScriptVOS, IvrLibaTemplateScriptVO.class);
for (IvrLibaTemplateScriptVO ivrLibaTemplateScriptVO : ivrLibaTemplateScriptVOList) {
Map<String, String> scriptResult = getScriptResult(subid, patid, ivrLibaTemplateScriptVO.getId());
if (ObjectUtils.isNotEmpty(scriptResult)) {
@@ -402,6 +601,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);
@@ -426,7 +627,8 @@
List<ServiceSubtaskDetail> serviceSubtaskDetails = serviceSubtaskDetailMapper.selectServiceSubtaskDetailList(serviceSubtaskDetail);
if (CollectionUtils.isNotEmpty(serviceSubtaskDetails)) {
map.put("asrtext", serviceSubtaskDetails.get(0).getAsrtext());
- map.put("asrtextId", serviceSubtaskDetails.get(0).getId());
+ map.put("asrtextId", "" + serviceSubtaskDetails.get(0).getId());
+ map.put("answerps", serviceSubtaskDetails.get(0).getAnswerps());
return map;
}
return null;
@@ -437,7 +639,6 @@
serviceSubtaskVO.setTaskid(taskid);
serviceSubtaskVO.setPatid(patid);
List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
-
String score = "0";
//涓嬮璺宠浆
String nextScriptNo = null;
@@ -452,35 +653,15 @@
} else {
serviceSubtaskDetailVO.setTargetvalue(serviceSubtaskDetailVO.getTargetvalue() + "&" + svyTaskTemplateTargetoption.getOptioncontent());
}
-// if (svyTaskTemplateTargetoption.getIsUserOperation() == true) {
-// //灏嗛�変腑鐨勭粨鏋滄斁鍒癮srtext涓�
-// if (StringUtils.isEmpty(serviceSubtaskDetailVO.getAsrtext())) {
-// //鍜屽墠绔晢閲忥紝鍓嶇浼氬皢閫変腑鐨勭粨鏋滄洿鏂板埌闂涓�
-//// serviceSubtaskDetailVO.setAsrtext(svyTaskTemplateTargetoption.getTargetvalue());
-// serviceSubtaskDetailVO.setAsrtext(svyTaskTemplateScriptVO.getScriptResult());
-// } else {
-// //濡傛灉鏄閫夛紝绛旀闇�瑕佺敤 & 杩涜鎷兼帴(//鍜屽墠绔晢閲忥紝鍓嶇浼氬皢閫変腑鐨勭粨鏋滄洿鏂板埌闂涓�)
-//// serviceSubtaskDetailVO.setAsrtext(serviceSubtaskDetailVO.getAnswerps() + "&" + svyTaskTemplateTargetoption.getTargetvalue());
-// serviceSubtaskDetailVO.setAsrtext(svyTaskTemplateScriptVO.getScriptResult());
-// }
-// if (svyTaskTemplateScriptVO.getScriptType().equals("1") && svyTaskTemplateScriptVO.getBranchFlag().equals("1")) {
-// //鏄崟閫夛紝骞朵笖鏄湁鍒嗘敮鐨�(鍜屽墠绔晢閲忥紝鍦ㄥ閾剧粨鏋滀繚瀛樻椂锛屼細灏嗛�変腑鐨勯�夐」涓婄殑璺宠浆鏇存柊鍒伴鐩笂)
-//// nextScriptNo = svyTaskTemplateTargetoption.getNextQuestion().toString();
-// nextScriptNo = svyTaskTemplateScriptVO.getNextScriptno().toString();
-// score = svyTaskTemplateTargetoption.getScore().toString();
-// } else {
-// nextScriptNo = svyTaskTemplateScriptVO.getNextScriptno().toString();
-// score = svyTaskTemplateScriptVO.getScore().toString();
-// }
-// }
+
}
- nextScriptNo = svyTaskTemplateScriptVO.getNextScriptno().toString();
+ nextScriptNo = svyTaskTemplateScriptVO.getNextScriptno();
if (svyTaskTemplateScriptVO.getScore() != null) {
score = String.valueOf(svyTaskTemplateScriptVO.getScore());
}
- serviceSubtaskDetailVO.setAsrtext(svyTaskTemplateScriptVO.getScriptResult().replaceAll("^\"|\"$", ""));
- serviceSubtaskDetailVO.setMatchedtext(svyTaskTemplateScriptVO.getScriptResult().replaceAll("^\"|\"$", ""));
-// if (StringUtils.isEmpty(serviceSubtaskDetailVO.getAsrtext())) {
+ 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();
// }
// serviceSubtaskDetailVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateScriptVO.getSvyTaskTemplateTargetoptions());
@@ -509,7 +690,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);
@@ -517,6 +698,7 @@
Map<String, String> map = new HashMap<>();
map.put("nextScriptNo", nextScriptNo);
map.put("score", score);
+ map.put("id", "" + serviceSubtaskDetail.getId());
return map;
}
--
Gitblit v1.9.3