smartor.git - Gitblit

			@@ -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;
			@@ -739,6 +739,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());
			@@ -1020,6 +1027,10 @@
			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) {
			@@ -1293,6 +1304,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());
			@@ -1303,6 +1318,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();