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 /// /// 是否是淋巴结 /// - public bool IsLymphNodes { get; set; } + public IsLymph IsLymphNodes { get; set; } /// /// 器官类型 @@ -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 /// /// 是否是淋巴结 /// - public bool IsLymphNodes { get; set; } + public IsLymph IsLymphNodes { get; set; } } @@ -261,7 +263,7 @@ namespace IRaCIS.Core.Application.ViewModel /// /// 是否是淋巴结 /// - public bool IsLymphNodes { get; set; } + public IsLymph IsLymphNodes { get; set; } /// /// 病灶类型 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 /// /// 是否是淋巴结 /// - public bool IsLymphNodes { get; set; } + public IsLymph IsLymphNodes { get; set; } /// /// 器官类型