修改一版

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

@@ -31,8 +31,10 @@ namespace IRaCIS.Core.Application.ViewModel
     {
         public Guid? Id { get; set; }
         public Guid CriterionId { get; set; }
-        public string NidusType { get; set; }
-        public string NidusTypeCN { get; set; }
+        /// <summary>
+        /// 病灶类型
+        /// </summary>
+        public LesionType LesionType { get; set; }
         public DateTime CreateTime { get; set; }
         public Guid CreateUserId { get; set; }
     }
@@ -65,12 +67,7 @@ namespace IRaCIS.Core.Application.ViewModel
         /// <summary>
         /// 病灶类型
         /// </summary>
-        public string NidusType { get; set; }
-
-        /// <summary>
-        /// 病灶类型
-        /// </summary>
-        public string NidusTypeCN { get; set; }
+        public LesionType LesionType { get; set; }
 
 
         /// <summary>
@@ -110,7 +107,10 @@ namespace IRaCIS.Core.Application.ViewModel
     {
         public Guid TrialId { get; set; }
 
-        public Guid? CriterionNidusId { get; set; }
+        /// <summary>
+        /// 病灶类型
+        /// </summary>
+        public LesionType? LesionType { get; set; }
 
         public bool? IsEnable { get; set; }
     }
@@ -127,19 +127,14 @@ namespace IRaCIS.Core.Application.ViewModel
         public string? TULOC { get; set; }
         public string? TULAT { get; set; }
 
-        public Guid? CriterionNidusId { get; set; }
+     
 
         public bool IsEnable { get; set; }
 
         /// <summary>
         /// 病灶类型
         /// </summary>
-        public string NidusType { get; set; }
-
-        /// <summary>
-        /// 病灶类型
-        /// </summary>
-        public string NidusTypeCN { get; set; }
+        public LesionType LesionType { get; set; }
 
         /// <summary>
 		/// 备注
@@ -150,8 +145,11 @@ namespace IRaCIS.Core.Application.ViewModel
     ///<summary>OrganInfoQuery  列表查询参数模型</summary>
     public class OrganInfoQuery
     {
-    
-        public Guid? CriterionNidusId { get; set; }
+
+        /// <summary>
+        /// 病灶类型
+        /// </summary>
+        public LesionType? LesionType { get; set; }
 
         public Guid? CriterionId { get; set; }
 
@@ -179,14 +177,14 @@ namespace IRaCIS.Core.Application.ViewModel
         public bool IsLymphNodes { get; set; }
 
         /// <summary>
-        /// 标准 病灶类型
+        /// 病灶类型
         /// </summary>
-        public Guid CriterionNidusId { get; set; }
+        public LesionType LesionType { get; set; }
 
         /// <summary>
 		/// 标准 病灶类型
 		/// </summary>
-		public Guid CriterionId { get; set; }
+		public Guid SystemCriterionId { get; set; }
 
         public DateTime CreateTime { get; set; }
         public Guid CreateUserId { get; set; }