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.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, } /// diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 2544b1ad8..bc1630905 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, @@ -3187,6 +3187,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common { Unit = (ValueUnit)int.Parse(x.Code), + UnitName = x.Value.ToString(), }).ToList(); //获取表格问题名称 组合成数组 @@ -3195,8 +3196,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,