diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 2851d19d5..13dd1861e 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -5964,6 +5964,16 @@ 阅片平台 + + + 系统标准ID + + + + + 阅片模式 + + 任务组织级别 diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index bccfb7fb9..df0b0f9b4 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -394,6 +394,8 @@ namespace IRaCIS.Application.Services [HttpPost] public async Task GetReadingReportEvaluation(GetReadingReportEvaluationInDto indto) { + + GetReadingReportEvaluationOutDto result = new GetReadingReportEvaluationOutDto(); result.CalculateResult = await _readingCalculateService.GetReportVerify(new GetReportVerifyInDto() { @@ -401,6 +403,11 @@ namespace IRaCIS.Application.Services }); var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == indto.VisitTaskId).FirstNotNullAsync(); + + if (visitTaskInfo.TaskState != TaskState.Effect) + { + throw new BusinessValidationFailedException($"当前任务已失效!"); + } result.ReadingTaskState = visitTaskInfo.ReadingTaskState; var taskInfoList = await _visitTaskRepository.Where(x => (x.SubjectId == visitTaskInfo.SubjectId && x.TaskState == TaskState.Effect &&x.ArmEnum== visitTaskInfo.ArmEnum @@ -590,6 +597,11 @@ namespace IRaCIS.Application.Services var result = new GetReadingQuestionAndAnswerOutDto(); var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync(); + + if (visitTaskInfo.TaskState != TaskState.Effect) + { + throw new BusinessValidationFailedException($"当前任务已失效!"); + } result.ReadingTaskState = taskinfo.ReadingTaskState; var baseLineVisitId = await _subjectVisitRepository.Where(x => x.SubjectId == taskinfo.SubjectId && x.IsBaseLine).Select(x => x.Id).FirstOrDefaultAsync(); @@ -779,6 +791,11 @@ namespace IRaCIS.Application.Services public async Task<(List, object)> GetRelatedVisitTask(GetRelatedVisitTaskInDto inDto) { var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync(); + + if (visitTaskInfo.TaskState != TaskState.Effect) + { + throw new BusinessValidationFailedException($"当前任务已失效!"); + } var baselineVisitId = await _subjectVisitRepository.Where(x => x.SubjectId == taskInfo.SubjectId && x.IsBaseLine && !x.IsLostVisit).Select(x => x.Id).FirstNotNullAsync(); var result = await _visitTaskRepository.Where(x => (x.TrialId == taskInfo.TrialId &&