diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs index a523c453f..77c645d57 100644 --- a/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs @@ -23,18 +23,21 @@ namespace IRaCIS.Core.Application.Service private readonly IRepository _taskMedicalReviewRepository; private readonly IRepository _trialRepository; private readonly IRepository _trialUserRepository; + private readonly IRepository _readingQuestionCriterionTrialRepository; private readonly IRepository _visitTaskRepository; private readonly IRepository _taskMedicalReviewRuleRepository; public TaskMedicalReviewService(IRepository taskMedicalReviewRepository, IRepository trialRepository, IRepository trialUserRepository, + IRepository readingQuestionCriterionTrialRepository, IRepository visitTaskRepository, IRepository taskMedicalReviewRuleRepository) { _taskMedicalReviewRepository = taskMedicalReviewRepository; this._trialRepository = trialRepository; _trialUserRepository = trialUserRepository; + this._readingQuestionCriterionTrialRepository = readingQuestionCriterionTrialRepository; _visitTaskRepository = visitTaskRepository; _taskMedicalReviewRuleRepository = taskMedicalReviewRuleRepository; @@ -150,7 +153,7 @@ namespace IRaCIS.Core.Application.Service return (pageList, new { - IsConfirmMedicineQuestion = await _trialRepository.Where(x => x.Id == inQuery.TrialId).Select(x => x.IsConfirmMedicineQuestion).FirstOrDefaultAsync() + IsConfirmMedicineQuestion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inQuery.TrialReadingCriterionId).Select(x => x.IsConfirmMedicineQuestion).FirstOrDefaultAsync() }); } diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs index 655a89854..245a544dc 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs @@ -340,6 +340,7 @@ namespace IRaCIS.Core.Application.ViewModel /// public Guid TrialId { get; set; } + public Guid TrialReadingCriterionId { get; set; } public string Type { get; set; } = string.Empty;