修改一版

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

@@ -62,8 +62,16 @@ namespace IRaCIS.Core.Application.ViewModel
 		public string Remark { get; set; }
         public Guid CreateUserId { get; set; }
 
+        /// <summary>
+        /// 病灶类型
+        /// </summary>
+        public string NidusType { get; set; }
+
+        /// <summary>
+        /// 病灶类型
+        /// </summary>
+        public string NidusTypeCN { get; set; }
 
-     
 
         /// <summary>
         /// 是否关联
@@ -119,7 +127,7 @@ namespace IRaCIS.Core.Application.ViewModel
         public string? TULOC { get; set; }
         public string? TULAT { get; set; }
 
-        public Guid CriterionNidusId { get; set; }
+        public Guid? CriterionNidusId { get; set; }
 
         public bool IsEnable { get; set; }
 
@@ -135,6 +143,8 @@ namespace IRaCIS.Core.Application.ViewModel
     
         public Guid? CriterionNidusId { get; set; }
 
+        public Guid? CriterionId { get; set; }
+
     }
 
     ///<summary> OrganInfoAddOrEdit  列表查询参数模型</summary>

IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs

@@ -93,6 +93,7 @@ namespace IRaCIS.Core.Application.Service
             var organInfoQueryable = _organInfoRepository
          
                .WhereIf(inQuery.CriterionNidusId != null, x => x.CriterionNidusId == inQuery.CriterionNidusId)
+                .WhereIf(inQuery.CriterionId != null, x => x.CriterionId == inQuery.CriterionId)
             .ProjectTo<OrganInfoView>(_mapper.ConfigurationProvider);
             return await organInfoQueryable.ToListAsync();
         }

IRaCIS.Core.Application/Service/Reading/_MapConfig.cs

@@ -129,7 +129,9 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<CriterionNidus, CriterionNidusAddOrEdit>().ReverseMap();
 
             CreateMap<OrganInfoAddOrEdit, OrganInfo>();
-            CreateMap<OrganInfo, OrganInfoView>();
+            CreateMap<OrganInfo, OrganInfoView>()
+                .ForMember(d => d.NidusType, u => u.MapFrom(s => s.CriterionNidus.NidusType))
+                  .ForMember(d => d.NidusTypeCN, u => u.MapFrom(s => s.CriterionNidus.NidusTypeCN)); 
             #endregion
         }
     }

IRaCIS.Core.Domain/Reading/OrganInfo.cs

@@ -46,7 +46,7 @@ namespace IRaCIS.Core.Domain.Models
 		/// <summary>
 		/// 标准 病灶类型
 		/// </summary>
-		public Guid CriterionNidusId { get; set; }
+		public Guid? CriterionNidusId { get; set; }
 
 
 		/// <summary>
@@ -64,6 +64,9 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public Guid CreateUserId { get; set; }
 
+		[ForeignKey("CriterionNidusId")]
+		public CriterionNidus CriterionNidus { get; set; }
+
 	}
 
 	  

IRaCIS.Core.Domain/Reading/OrganTrialInfo.cs

@@ -42,7 +42,7 @@ namespace IRaCIS.Core.Domain.Models
 		/// <summary>
 		/// 标准 病灶类型
 		/// </summary>
-		public Guid CriterionNidusId { get; set; }
+		public Guid? CriterionNidusId { get; set; }
 
 	}