From a76654c210fdaaa6be525a306058f977021b63ec Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Wed, 3 Jan 2024 17:07:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../General/ReadingCalculateService.cs | 34 ++++++++----------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs index dd2c36627..5421e4804 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,21 @@ 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, + }); - } + } + + return result; + + + } /// /// 获取报告验证的信息(这里每个标准可能不一样 返回用object) From 676c5b0e74ada6fe7593b88dc03d22fd7d96279e Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Wed, 3 Jan 2024 17:17:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=86=8D=E6=AC=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReadingCalculate/General/ReadingCalculateService.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs index 5421e4804..53aea15cb 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs @@ -148,8 +148,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate await _visitTaskRepository.UpdatePartialFromQueryAsync(inDto.VisitTaskId, x => new VisitTask() { ReadingTaskState = ReadingTaskState.Reading, - }); - + },true); } return result; From 0d8319feaa340b002b9d4fcb82724693580525ba Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Wed, 3 Jan 2024 17:28:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reading/ReadingImageTask/ReadingImageTaskService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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()