diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 0b8d9e488..c78247062 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -704,9 +704,9 @@ namespace IRaCIS.Application.Services { //await AddDefaultValueToTask(inDto.VisitTaskId); var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync(); - var result = await GetReadingQuestion(taskInfo.TrialReadingCriterionId, taskInfo.Id, inDto.QuestionClassify,inDto.GroupClassifyList); + var result = await GetReadingQuestion(taskInfo.TrialReadingCriterionId, taskInfo.Id); - return (result, new + return (result, new { ReadingTaskState = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Select(x => x.ReadingTaskState).FirstOrDefaultAsync() diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs index dd2c36627..53aea15cb 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs @@ -126,11 +126,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { var service = await this.GetService(inDto.VisitTaskId); var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync(); - if (service != null && visitTaskInfo.SourceSubjectVisitId != null) + var result = new AddTaskLesionAnswerFromLastTaskOutDto(); + var readingTaskState = visitTaskInfo.ReadingTaskState; + if (service != null && visitTaskInfo.SourceSubjectVisitId != null) { - var readingTaskState = visitTaskInfo.ReadingTaskState; - var result = new AddTaskLesionAnswerFromLastTaskOutDto(); - if (readingTaskState == ReadingTaskState.WaitReading) { if (visitTaskInfo.ReadingCategory == ReadingCategory.Visit) @@ -142,24 +141,20 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate VisitTaskId = inDto.VisitTaskId, }); } - - - await _visitTaskRepository.UpdatePartialFromQueryAsync(inDto.VisitTaskId, x => new VisitTask() - { - ReadingTaskState = ReadingTaskState.Reading, - - }); - } - - return result; - } - else - { - return new AddTaskLesionAnswerFromLastTaskOutDto(); } + if (readingTaskState == ReadingTaskState.WaitReading) + { + await _visitTaskRepository.UpdatePartialFromQueryAsync(inDto.VisitTaskId, x => new VisitTask() + { + ReadingTaskState = ReadingTaskState.Reading, + },true); + } - } + return result; + + + } /// /// 获取报告验证的信息(这里每个标准可能不一样 返回用object)