diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs index c357a9a35..8d30e0a12 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs @@ -614,6 +614,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public string GroupName { get; set; } + + /// + /// 全局阅片显示类型 + /// + public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.AllShow; + /// /// 问题类型 /// @@ -777,6 +783,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public TableQuestionType? QuestionGenre { get; set; } + + /// + /// 全局阅片显示类型 + /// + public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.AllShow; + /// /// 字典code /// @@ -1089,6 +1101,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public ValueUnit? Unit { get; set; } + /// + /// 全局阅片显示类型 + /// + public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.AllShow; + /// /// 分组 /// @@ -1223,6 +1240,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public Guid TrialId { get; set; } + /// + /// 全局阅片显示类型 + /// + public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.AllShow; + /// /// 系统标准Id /// diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs index 4810774c5..8759156da 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs @@ -602,6 +602,9 @@ namespace IRaCIS.Application.Services } }); break; + case JudgeTypeEnum.NotCalculate: + noteEqual = false; + break; } } } diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs index 76d017d88..10eb98c9d 100644 --- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs +++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs @@ -630,7 +630,27 @@ namespace IRaCIS.Core.Domain.Share Site = 1, } + /// + /// 全局阅片展示类型 + /// + public enum GlobalReadingShowType + { + /// + /// 全都显示 + /// + AllShow = 0, + + /// + /// 基线显示 + /// + BaseLineShow = 1, + + /// + /// 随访显示 + /// + FollowVisitShow = 2 + } @@ -1012,6 +1032,10 @@ namespace IRaCIS.Core.Domain.Share /// AnswerCombination = 3, + /// + /// 不计算 + /// + NotCalculate=4, } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs index d2b32e44b..a3c61b0df 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs @@ -140,6 +140,11 @@ namespace IRaCIS.Core.Domain.Models /// public TableQuestionType? QuestionGenre { get; set; } + /// + /// 全局阅片显示类型 + /// + public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.AllShow; + /// /// 数值类型 /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs index 67ae122f6..4f94ca1ff 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs @@ -77,6 +77,11 @@ namespace IRaCIS.Core.Domain.Models /// public QuestionType? QuestionType { get; set; } + /// + /// 全局阅片显示类型 + /// + public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.AllShow; + /// /// 备注 ///