From 4c63d881d93c36984629b4203f3e9134d9905747 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Tue, 1 Nov 2022 09:45:24 +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/ReadingCriterion/OrganInfoService.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs index 7f064ffb..4c1e0be6 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs @@ -156,12 +156,9 @@ namespace IRaCIS.Core.Application.Service .WhereIf(inDto.OrganType != null, x => x.OrganType == inDto.OrganType) .WhereIf(inDto.IsLymphNodes != null, x => x.IsLymphNodes == inDto.IsLymphNodes) .WhereIf(inDto.LesionType != null, x => organs.Contains(x.OrganType)) - .WhereIf(!inDto.Part.IsNullOrEmpty(), x => x.Part.Contains(inDto.Part)) - .WhereIf(!inDto.TULOC.IsNullOrEmpty(), x => x.Part.Contains(inDto.TULOC)) - .WhereIf(!inDto.TULAT.IsNullOrEmpty(), x => x.Part.Contains(inDto.TULAT)) - .WhereIf(!inDto.PartEN.IsNullOrEmpty(), x => x.Part.Contains(inDto.PartEN)) - .WhereIf(!inDto.TULOC.IsNullOrEmpty(), x => x.Part.Contains(inDto.TULOC)) - .WhereIf(!inDto.TULATEN.IsNullOrEmpty(), x => x.Part.Contains(inDto.TULATEN)) + .WhereIf(!inDto.Part.IsNullOrEmpty(), x => x.Part.Contains(inDto.Part)||x.PartEN.Contains(inDto.Part)) + .WhereIf(!inDto.TULOC.IsNullOrEmpty(), x => x.TULOC.Contains(inDto.TULOC)|| x.TULATEN.Contains(inDto.TULOC)) + .WhereIf(!inDto.TULAT.IsNullOrEmpty(), x => x.TULAT.Contains(inDto.TULAT)||x.TULATEN.Contains(inDto.TULAT)) join trialData in _organTrialInfoRepository.WhereIf(inDto.IsEnable != null, x => x.IsEnable == inDto.IsEnable) .WhereIf(inDto.IsEnable != null, x => x.IsEnable == inDto.IsEnable)