diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs index b2ae24ff3..6f19d617c 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs @@ -462,6 +462,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public string GroupName { get; set; } + + /// + /// 字典code + /// + public string DictionaryCode { get; set; } = string.Empty; + + /// /// 系统标准Id /// @@ -588,6 +595,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public string GroupName { get; set; } + /// + /// 字典code + /// + public string DictionaryCode { get; set; } = string.Empty; + + /// /// 关联ID /// @@ -920,6 +933,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public string ParentTriggerValue { get; set; } = string.Empty; + + /// + /// 字典code + /// + public string DictionaryCode { get; set; } = string.Empty; + /// /// 问题名称 /// @@ -1013,6 +1032,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public Guid ReadingQuestionCriterionTrialId { get; set; } + + /// + /// 字典code + /// + public string DictionaryCode { get; set; } = string.Empty; + + /// /// 是否是裁判问题 /// diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCalculateService.cs index dc8d732a1..34049e0d2 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingCalculateService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingCalculateService.cs @@ -629,7 +629,7 @@ namespace IRaCIS.Core.Application.Service return "NA"; } - var result = inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.TargetLesion && x.Answer == "NE"); + var result = inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.TargetLesion && x.Answer.EqEnum(TargetAssessment.NE)); return result ? "有" : "无"; } diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs index 0531021cb..52d3f4434 100644 --- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs +++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs @@ -16,6 +16,142 @@ namespace IRaCIS.Core.Domain.Share public static readonly string Group = "group"; } + /// + /// 整体肿瘤评估 + /// + public enum OverallAssessment + { + /// + /// CR + /// + CR = 0, + + /// + /// ND + /// + ND = 1, + + /// + /// NE + /// + NE = 2, + + /// + /// NN + /// + NN = 3, + + /// + /// PD + /// + PD = 4, + + /// + /// PR + /// + PR = 5, + + /// + /// SD + /// + SD = 6 + } + + /// + /// 新病灶评估 + /// + public enum NewLesionAssessment + { + + /// + /// 是 + /// + Yes = 0, + + /// + /// 疑似 + /// + Suspected = 1, + + /// + /// NE + /// + NE = 2, + + /// + /// 否 + /// + No = 3 + } + + /// + /// 非靶病灶评估 + /// + public enum NoTargetAssessment + { + /// + /// PD + /// + PD = 0, + + /// + /// CR + /// + CR = 1, + + /// + /// NE + /// + NE = 2, + + /// + /// ND + /// + ND = 3, + + /// + /// NN + /// + NN = 4 + } + + /// + /// 靶病灶评估 + /// + public enum TargetAssessment + { + /// + /// CR + /// + CR = 0, + + /// + /// PR + /// + PR = 1, + + /// + /// SD + /// + SD = 2, + + /// + /// PD + /// + PD = 3, + + /// + /// NE + /// + NE = 4, + + /// + /// ND + /// + ND = 5 + } + + /// /// 非把病灶状态 /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs index da374a06e..51fc19a70 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs @@ -163,6 +163,11 @@ namespace IRaCIS.Core.Domain.Models /// public string OrderMark { get; set; } = string.Empty; + /// + /// 字典code + /// + public string DictionaryCode { get; set; } + /// /// 分页标准 /// diff --git a/IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs b/IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs index 52ec9470c..d526d5ae5 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs @@ -38,6 +38,25 @@ namespace IRaCIS.Core.Infra.EFCore.Common } } + /// + /// 字符匹配枚举 + /// + /// + /// + /// + /// + public static bool EqEnum(this string value, T enumValue) where T:Enum + { + try + { + return int.Parse(value) == int.Parse(enumValue.ToString()); + } + catch (Exception) + { + + return false; + } + } public static decimal NullChange0(this decimal? value) { if (value == null)