修改一版

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

@@ -35,13 +35,22 @@ namespace IRaCIS.Core.Application.ViewModel
 		/// </summary>
 		public string Remark { get; set; }
         public Guid CreateUserId { get; set; }
+
+
+        /// <summary>
+		/// 类型枚举
+		/// </summary>
+		public OrganType OrganType { get; set; }
     }
 
 
     public class GetTrialOrganListInDto
     {
         public Guid TrialId { get; set; }
-        public string TypeName { get; set; }
+        /// <summary>
+        /// 类型枚举
+        /// </summary>
+        public OrganType OrganType { get; set; }
     }
 
     public class GetTrialCheckOrganList : GetTrialOrganListOutDto
@@ -57,6 +66,11 @@ namespace IRaCIS.Core.Application.ViewModel
         public string TULAT { get; set; }
         public string TypeName { get; set; }
 
+        /// <summary>
+		/// 类型枚举
+		/// </summary>
+		public OrganType OrganType { get; set; }
+
         /// <summary>
 		/// 备注
 		/// </summary>
@@ -80,6 +94,11 @@ namespace IRaCIS.Core.Application.ViewModel
         public string TULAT { get; set; }
         public string TypeName { get; set; }
 
+        /// <summary>
+		/// 类型枚举
+		/// </summary>
+		public OrganType OrganType { get; set; }
+
         /// <summary>
 		/// 备注
 		/// </summary>

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

@@ -116,8 +116,8 @@ namespace IRaCIS.Core.Application.Service
         [HttpPost]
         public async Task<List<GetTrialOrganListOutDto>> GetTrialOrganList(GetTrialOrganListInDto inDto)
         {
-            var organInfoQueryable = from data in _organInfoRepository.Where(x => x.TypeName == inDto.TypeName)
+            var organInfoQueryable = from data in _organInfoRepository.Where(x => x.OrganType == inDto.OrganType)
-                                     join trialData in _organTrialInfoRepository.Where(x => x.TrialId == inDto.TrialId && x.TypeName == inDto.TypeName)
+                                     join trialData in _organTrialInfoRepository.Where(x => x.TrialId == inDto.TrialId && x.OrganType == inDto.OrganType)
                                      on data.Id equals trialData.OrganInfoId
                                      select new GetTrialOrganListOutDto()
                                      {
@@ -127,7 +127,7 @@ namespace IRaCIS.Core.Application.Service
                                          TULOC = data.TULOC,
                                          TypeName = data.TypeName,
                                          Remark= data.Remark,
-
+                                         OrganType=data.OrganType,
                                      };
 
 
@@ -144,8 +144,8 @@ namespace IRaCIS.Core.Application.Service
         [HttpPost]
         public async Task<List<GetTrialCheckOrganList>> GetTrialCheckOrganList(GetTrialOrganListInDto inDto)
         {
-            var organInfoQueryable = from data in _organInfoRepository.Where(x => x.TypeName == inDto.TypeName)
+            var organInfoQueryable = from data in _organInfoRepository.Where(x => x.OrganType == inDto.OrganType)
-                                     join trialData in _organTrialInfoRepository.Where(x => x.TrialId == inDto.TrialId && x.TypeName == inDto.TypeName)
+                                     join trialData in _organTrialInfoRepository.Where(x => x.TrialId == inDto.TrialId && x.OrganType == inDto.OrganType)
                                      on data.Id equals trialData.OrganInfoId into jtemp
                                      from leftjoin in jtemp.DefaultIfEmpty()
                                      select new GetTrialCheckOrganList()

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

@@ -155,6 +155,26 @@ namespace IRaCIS.Core.Domain.Share
         Hydrothorax = 2,
     }
 
+    public enum OrganType
+    {
+        /// <summary>
+        /// 非靶和新病灶
+        /// </summary>
+        OffTargetAndNewLesions = 0,
+
+
+        /// <summary>
+        /// 结节靶病灶
+        /// </summary>
+        NodularTargetLesions = 1,
+
+
+        /// <summary>
+        /// 非结节靶病灶
+        /// </summary>
+        NonNodularTargetLesions = 2,
+    }
+
     /// <summary>
     /// 临床分组级别
     /// </summary>

IRaCIS.Core.Domain/Reading/OrganInfo.cs

@@ -42,6 +42,12 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public string TypeName { get; set; }
 
+
+		/// <summary>
+		/// 类型枚举
+		/// </summary>
+		public OrganType OrganType { get; set; }
+
 		/// <summary>
 		/// 创建时间
 		/// </summary>

IRaCIS.Core.Domain/Reading/OrganTrialInfo.cs

@@ -26,6 +26,11 @@ namespace IRaCIS.Core.Domain.Models
         /// </summary>
 		public Guid TrialId { get; set; }
 
+		/// <summary>
+		/// 类型枚举
+		/// </summary>
+		public OrganType OrganType { get; set; }
+
 		/// <summary>
 		/// 类型名称
 		/// </summary>