diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs index 419b2b59b..c1b546ff2 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs @@ -177,7 +177,7 @@ namespace IRaCIS.Core.Application.ViewModel } public class GetTrialOrganListInDto { - public Guid TrialId { get; set; } + public Guid TrialReadingCriterionId { get; set; } public OrganType? OrganType { get; set; } diff --git a/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs b/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs index 5e3bc8276..2620174c4 100644 --- a/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs +++ b/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs @@ -234,7 +234,7 @@ namespace IRaCIS.Core.Application.Service if (inDto.LesionType != null) { - var criterion = await _readingQuestionCriterionTrial.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm).FirstOrDefaultAsync(); + var criterion = await _readingQuestionCriterionTrial.Where(x => x.Id==inDto.TrialReadingCriterionId).FirstOrDefaultAsync(); organs = await _criterionNidusRepository.Where(x => x.CriterionId == (criterion==null?default(Guid): criterion.Id) && x.LesionType == inDto.LesionType) .Select(x => x.OrganType).ToListAsync(); } @@ -246,7 +246,7 @@ namespace IRaCIS.Core.Application.Service join trialData in _organTrialInfoRepository.WhereIf(inDto.IsEnable != null, x => x.IsEnable == inDto.IsEnable) .WhereIf(inDto.IsEnable != null, x => x.IsEnable == inDto.IsEnable) - .Where(x => x.TrialId == inDto.TrialId) + .Where(x => x.TrialCriterionId == inDto.TrialReadingCriterionId) on data.Id equals trialData.OrganInfoId select new GetTrialOrganListOutDto() {