From 4ee760ed5336d7c45554415f626efead8becb608 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Tue, 24 Jun 2025 14:03:28 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9OCT=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/ReadingCalculate/OCTCalculateService.cs | 8 +++++++- IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs index 73f1e9b0e..c97b1abbc 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs @@ -828,7 +828,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate #region 计算 这里顺序非常重要 后面计算的值要依赖前面计算的结果 var needAddList = new List(); - if (inDto.ComputationTrigger != ComputationTrigger.PatchDataStatistics) + List< ComputationTrigger > computationTriggers = new List() + { + ComputationTrigger.PatchDataStatistics, + ComputationTrigger.SaveEICRFQuestions, + + }; + if (!computationTriggers.Contains(inDto.ComputationTrigger)) { // 计算斑块统计数据 await this.CalculatePatchDataStatistics(inDto); diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs index e515a80d9..04d4e46d0 100644 --- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs +++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs @@ -2920,6 +2920,11 @@ public enum PET5PSScore /// 保存肝脏分段 /// SaveLiverSegments = 11, + + /// + /// 保存eCRF + /// + SaveEICRFQuestions=12, } /// From 06af37f74cb1a38db182b9eaff7718d30ca4ee8a Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Tue, 24 Jun 2025 14:40:42 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 2544b1ad8..fdcd45647 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -3195,8 +3195,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common { TrialReadingCriterionId = t.ReadingQuestionTrial.ReadingQuestionCriterionTrialId, //标准Id Type = t.ReadingQuestionTrial.QuestionName, //病灶类型 - t.ReadingQuestionTrial.Unit, - t.ReadingQuestionTrial.CustomUnit, + t.Unit, + t.CustomUnit, t.DictionaryCode, t.QuestionName, t.QuestionEnName, From 61d164171658001547813fae1c6feeee6db7f7e1 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Tue, 24 Jun 2025 14:41:19 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E4=BD=8D1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index fdcd45647..ab8039269 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -3081,8 +3081,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common { TrialReadingCriterionId = t.ReadingQuestionTrial.ReadingQuestionCriterionTrialId, //标准Id Type = t.ReadingQuestionTrial.QuestionName, //病灶类型 - t.ReadingQuestionTrial.Unit, - t.ReadingQuestionTrial.CustomUnit, + t.Unit, + t.CustomUnit, t.DictionaryCode, t.QuestionName, t.QuestionEnName, From 3859dc0d790da9e23cb0bea4585f67c0ab16e7f5 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Tue, 24 Jun 2025 14:54:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E4=BF=AE=E6=94=B92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/IRaCIS.Core.Application.xml | 5 +++++ IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs | 1 + 2 files changed, 6 insertions(+) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 4841cf075..796298954 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -10660,6 +10660,11 @@ 阅片版本 + + + 阅片工具 + + 标准分组 diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index ab8039269..bc1630905 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -3187,6 +3187,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common { Unit = (ValueUnit)int.Parse(x.Code), + UnitName = x.Value.ToString(), }).ToList(); //获取表格问题名称 组合成数组