From 396e83bfae9212306d7c6df8026121b93331c241 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 20 Sep 2022 16:51:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Reading/Dto/OrganInfoViewModel.cs             | 8 +++++---
 .../Service/Reading/OrganInfoService.cs                   | 1 +
 IRaCIS.Core.Domain/Reading/OrganInfo.cs                   | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
index e8729a0f7..6c4d886a5 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
@@ -131,7 +131,7 @@ namespace IRaCIS.Core.Application.ViewModel
         /// <summary>
         /// 是否是淋巴结
         /// </summary>
-        public bool IsLymphNodes { get; set; }
+        public IsLymph IsLymphNodes { get; set; }
 
         /// <summary>
         /// 器官类型
@@ -181,6 +181,8 @@ namespace IRaCIS.Core.Application.ViewModel
         public LesionType? LesionType { get; set; }
 
         public bool? IsEnable { get; set; }
+
+        public IsLymph? IsLymphNodes { get; set; }
     }
 
     public class GetTrialCheckOrganList : GetTrialOrganListOutDto
@@ -216,7 +218,7 @@ namespace IRaCIS.Core.Application.ViewModel
         /// <summary>
         /// 是否是淋巴结
         /// </summary>
-        public bool IsLymphNodes { get; set; }
+        public IsLymph IsLymphNodes { get; set; }
 
     }
 
@@ -261,7 +263,7 @@ namespace IRaCIS.Core.Application.ViewModel
         /// <summary>
         /// 是否是淋巴结
         /// </summary>
-        public bool IsLymphNodes { get; set; }
+        public IsLymph IsLymphNodes { get; set; }
 
         /// <summary>
         /// 病灶类型
diff --git a/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs b/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs
index 0a463e519..785f19c9a 100644
--- a/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs
@@ -250,6 +250,7 @@ namespace IRaCIS.Core.Application.Service
             }
 
             var organInfoQueryable = from data in _organInfoRepository.WhereIf(inDto.OrganType != null, x => x.OrganType == inDto.OrganType)
+                                     .WhereIf(inDto.IsLymphNodes!=null,x=>x.IsLymphNodes==inDto.IsLymphNodes)
                                      join trialData in _organTrialInfoRepository.WhereIf(inDto.IsEnable != null, x => x.IsEnable == inDto.IsEnable)
                                       .WhereIf(inDto.LesionType != null, x => organs.Contains(x.OrganType))
                                      .WhereIf(inDto.IsEnable != null, x => x.IsEnable == inDto.IsEnable)
diff --git a/IRaCIS.Core.Domain/Reading/OrganInfo.cs b/IRaCIS.Core.Domain/Reading/OrganInfo.cs
index 014773634..5ca2722e1 100644
--- a/IRaCIS.Core.Domain/Reading/OrganInfo.cs
+++ b/IRaCIS.Core.Domain/Reading/OrganInfo.cs
@@ -41,7 +41,7 @@ namespace IRaCIS.Core.Domain.Models
 	    /// <summary>
 		/// 是否是淋巴结
 		/// </summary>
-		public bool IsLymphNodes { get; set; }
+		public IsLymph IsLymphNodes { get; set; }
 
 		/// <summary>
 		/// 器官类型