修改一版

IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs

@@ -462,6 +462,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public string GroupName { get; set; }
 
+
+		/// <summary>
+		/// 字典code
+		/// </summary>
+		public string DictionaryCode { get; set; } = string.Empty;
+
+
 		/// <summary>
 		/// 系统标准Id
 		/// </summary>
@@ -588,6 +595,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public string GroupName { get; set; }
 
+		/// <summary>
+		/// 字典code
+		/// </summary>
+		public string DictionaryCode { get; set; } = string.Empty;
+
+
 		/// <summary>
 		/// 关联ID
 		/// </summary>
@@ -920,6 +933,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public string ParentTriggerValue { get; set; } = string.Empty;
 
+
+		/// <summary>
+		/// 字典code
+		/// </summary>
+		public string DictionaryCode { get; set; } = string.Empty;
+
 		/// <summary>
 		/// 问题名称
 		/// </summary>
@@ -1013,6 +1032,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public Guid ReadingQuestionCriterionTrialId { get; set; }
 
+
+		/// <summary>
+		/// 字典code
+		/// </summary>
+		public string DictionaryCode { get; set; } = string.Empty;
+
+
 		/// <summary>
 		/// 是否是裁判问题
 		/// </summary>

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 ? "有" : "无";
 		}

IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs

@@ -16,6 +16,142 @@ namespace IRaCIS.Core.Domain.Share
         public static readonly string Group = "group";
     }
 
+    /// <summary>
+    /// 整体肿瘤评估
+    /// </summary>
+    public enum OverallAssessment
+    {
+        /// <summary>
+        /// CR
+        /// </summary>
+        CR = 0,
+
+        /// <summary>
+        /// ND
+        /// </summary>
+        ND = 1,
+
+        /// <summary>
+        /// NE
+        /// </summary>
+        NE = 2,
+
+        /// <summary>
+        /// NN
+        /// </summary>
+        NN = 3,
+
+        /// <summary>
+        /// PD
+        /// </summary>
+        PD = 4,
+
+        /// <summary>
+        /// PR
+        /// </summary>
+        PR = 5,
+
+        /// <summary>
+        /// SD
+        /// </summary>
+        SD = 6
+    }
+
+    /// <summary>
+    /// 新病灶评估
+    /// </summary>
+    public enum NewLesionAssessment
+    {
+
+        /// <summary>
+        /// 是
+        /// </summary>
+        Yes = 0,
+
+        /// <summary>
+        /// 疑似
+        /// </summary>
+        Suspected = 1,
+
+        /// <summary>
+        /// NE
+        /// </summary>
+        NE = 2,
+
+        /// <summary>
+        /// 否
+        /// </summary>
+        No = 3
+    }
+
+    /// <summary>
+    /// 非靶病灶评估
+    /// </summary>
+    public enum NoTargetAssessment
+    {
+        /// <summary>
+        /// PD
+        /// </summary>
+        PD = 0,
+
+        /// <summary>
+        /// CR
+        /// </summary>
+        CR = 1,
+
+        /// <summary>
+        /// NE
+        /// </summary>
+        NE = 2,
+
+        /// <summary>
+        /// ND
+        /// </summary>
+        ND = 3,
+
+        /// <summary>
+        /// NN
+        /// </summary>
+        NN = 4
+    }
+
+    /// <summary>
+    /// 靶病灶评估
+    /// </summary>
+    public enum TargetAssessment
+    {
+        /// <summary>
+        /// CR
+        /// </summary>
+        CR = 0,
+
+        /// <summary>
+        /// PR
+        /// </summary>
+        PR = 1,
+
+        /// <summary>
+        /// SD
+        /// </summary>
+        SD = 2,
+
+        /// <summary>
+        /// PD
+        /// </summary>
+        PD = 3,
+
+        /// <summary>
+        /// NE
+        /// </summary>
+        NE = 4,
+
+        /// <summary>
+        /// ND
+        /// </summary>
+        ND = 5
+    }
+
+
     /// <summary>
     /// 非把病灶状态
     /// </summary>

IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs

@@ -163,6 +163,11 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public string OrderMark { get; set; } = string.Empty;
 
+		/// <summary>
+		/// 字典code
+		/// </summary>
+		public string DictionaryCode { get; set; }
+
 		/// <summary>
 		/// 分页标准
 		/// </summary>

IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs

@@ -38,6 +38,25 @@ namespace IRaCIS.Core.Infra.EFCore.Common
             }
         }
 
+        /// <summary>
+        /// 字符匹配枚举
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="value"></param>
+        /// <param name="enumValue"></param>
+        /// <returns></returns>
+        public static bool EqEnum<T>(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)