From 83bdcdad1f40d016828dca746c832ae8cbc82d69 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Wed, 27 Sep 2023 15:24:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/ReadingImageTask/ReadingImageTaskService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 597da38e2..64e883d17 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -2040,7 +2040,7 @@ namespace IRaCIS.Application.Services rowInfo.Id = inDto.RowId == null ? NewId.NextGuid() : inDto.RowId.Value; result.RowId = rowInfo.Id; rowInfo.IsCurrentTaskAdd = isCurrentTaskAdd; - rowInfo.FristAddTaskId = inDto.RowId == null ? rowInfo.Id : rowInfo.FristAddTaskId; + rowInfo.FristAddTaskId = inDto.RowId == null ? inDto.VisitTaskId : rowInfo.FristAddTaskId; if (inDto.RowId == null) { From 5c89478ecbdc2b58c7654c56b09b82dd259ee159 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Wed, 27 Sep 2023 15:36:29 +0800 Subject: [PATCH 2/4] =?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 --- .../ReadingCalculate/LuganoCalculateService.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs index 319a72c29..d81f46d57 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs @@ -886,13 +886,20 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate List needCopyMarks = new List() { + + QuestionMark.IsLymph, + QuestionMark.Lesion, + QuestionMark.Organ, + QuestionMark.Location, + QuestionMark.Part, + QuestionMark.LowPPDLDi, QuestionMark.LowPPDSDi, QuestionMark.NadirPPD, - QuestionMark.LowPPDVisit, + QuestionMark.LowPPDVisit, }; - + var rowIndexList = copyTableAnswers.Select(x => x.RowIndex).Distinct().ToList(); // 找到靶病灶问题Id From 11395d8e5fa44d579ef7ae6fbb79f81e80e734d5 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Thu, 28 Sep 2023 09:46:10 +0800 Subject: [PATCH 3/4] =?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 --- .../Service/ReadingCalculate/LuganoCalculateService.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs index d81f46d57..2a1e48f84 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs @@ -958,6 +958,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate VisitTaskId= visitTaskId, FirstAddTaskId=x.FirstAddTaskId, QuestionId=x.QuestionId, + QuestionType=x.QuestionType, }).ToListAsync(); From 3d60c3af49cb97ecb8b6fa3580d3871da4bec641 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Sun, 8 Oct 2023 10:01:47 +0800 Subject: [PATCH 4/4] =?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/Dto/ReadingQuestionViewModel.cs | 22 +++++++++++++++++-- .../ReadingQuestionTrial.cs | 14 ++++++++++-- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs index 89b0b5bb0..37b96be24 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs @@ -812,9 +812,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public string GroupName { get; set; } + /// + /// 分类算法 + /// + public string ClassifyAlgorithms { get; set; } = string.Empty; - - public Guid? GroupId { get; set; } + /// + /// 分类问题Id + /// + public Guid? ClassifyQuestionId { get; set; } + + public Guid? GroupId { get; set; } /// /// 全局阅片显示类型 @@ -1775,6 +1783,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public Guid? Id { get; set; } public bool IsAdditional { get; set; } + + /// + /// 分类算法 + /// + public string ClassifyAlgorithms { get; set; } = string.Empty; + + /// + /// 分类问题Id + /// + public Guid? ClassifyQuestionId { get; set; } public Guid TrialId { get; set; } /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs index 771a12133..959790ed5 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs @@ -252,9 +252,19 @@ namespace IRaCIS.Core.Domain.Models public string GroupEnName { get; set; } = string.Empty; /// - /// 是否复制病灶 + /// 分类算法 /// - public bool IsCopyLesions { get; set; } = false; + public string ClassifyAlgorithms { get; set; } = string.Empty; + + /// + /// 分类问题Id + /// + public Guid? ClassifyQuestionId { get; set; } + + /// + /// 是否复制病灶 + /// + public bool IsCopyLesions { get; set; } = false; /// /// 分组ID