XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
hang 2025-06-24 16:17:26 +08:00
parent e86a5e005c 3859dc0d79
commit df1e87897f
4 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -10660,6 +10660,11 @@
阅片版本
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionCriterionTrialInDto.ReadingToolList">
<summary>
阅片工具
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionCriterionSystemInDto.CriterionGroup">
<summary>
标准分组

8
IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs
View File

@ -828,7 +828,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
#region 计算 这里顺序非常重要 后面计算的值要依赖前面计算的结果
var needAddList = new List<ReadingTaskQuestionAnswer>();
if (inDto.ComputationTrigger != ComputationTrigger.PatchDataStatistics)
List< ComputationTrigger > computationTriggers = new List<ComputationTrigger>()
{
ComputationTrigger.PatchDataStatistics,
ComputationTrigger.SaveEICRFQuestions,
};
if (!computationTriggers.Contains(inDto.ComputationTrigger))
{
// 计算斑块统计数据
await this.CalculatePatchDataStatistics(inDto);

5
IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
View File

@ -2920,6 +2920,11 @@ public enum PET5PSScore
/// 保存肝脏分段
/// </summary>
SaveLiverSegments = 11,
/// <summary>
/// 保存eCRF
/// </summary>
SaveEICRFQuestions=12,
}
/// <summary>

9
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -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,