diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs index e5f06d2ae..906d72146 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs @@ -304,7 +304,7 @@ namespace IRaCIS.Core.Application.Contracts } public class GetQCQuestionAnswerInDto { - public Guid SubjectVisit { get; set; } + public Guid SubjectVisitId { get; set; } public Guid TrialId { get; set; } diff --git a/IRaCIS.Core.Application/Service/QC/QCListService.cs b/IRaCIS.Core.Application/Service/QC/QCListService.cs index 0ac494f87..42067f28c 100644 --- a/IRaCIS.Core.Application/Service/QC/QCListService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCListService.cs @@ -587,7 +587,7 @@ namespace IRaCIS.Core.Application.Image.QA public async Task> GetQCQuestionAnswer(GetQCQuestionAnswerInDto inDto) { var questionAnswerlist =await (from data in _trialQCQuestionRepository.Where(x => x.TrialId == inDto.TrialId && x.IsEnable) - join answer in _trialQCQuestionAnswerRepository.AsQueryable() on data.Id equals answer.TrialQCQuestionConfigureId into answertemp + join answer in _trialQCQuestionAnswerRepository.Where(x=>x.SubjectVisitId==inDto.SubjectVisitId&&x.QCProcessEnum==inDto.QCProcessEnum&&x.CurrentQCEnum==inDto.CurrentQCEnum).AsQueryable() on data.Id equals answer.TrialQCQuestionConfigureId into answertemp from leftanswer in answertemp.DefaultIfEmpty() select new QCQuestionAnswer() {