IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs

@@ -34,7 +34,6 @@ namespace IRaCIS.Core.Application.Service
         private readonly IRepository<TaskConsistentRule> _taskConsistentRuleRepository;
         private readonly IRepository<VisitTask> _visitTaskRepository;
         private readonly IRepository<ReadingConsistentClinicalData> _readingConsistentClinicalDataRepository;
-        private readonly IRepository<ReadingQuestionCriterionTrial> _trialReadingCriterionRepository;
         private readonly IReadingClinicalDataService _readingClinicalDataService;
         private readonly IRepository<SubjectUser> _subjectUserRepository;
         private readonly IRepository<Subject> _subjectRepository;
@@ -50,7 +49,6 @@ namespace IRaCIS.Core.Application.Service
 
         public TaskConsistentRuleService(IRepository<VisitTask> visitTaskRepository,
                 IRepository<ReadingConsistentClinicalData> readingConsistentClinicalDataRepository,
-                  IRepository<ReadingQuestionCriterionTrial> trialReadingCriterionRepository,
                 IReadingClinicalDataService readingClinicalDataService,
             IRepository<Enroll> enrollRepository, IRepository<TaskConsistentRule> taskConsistentRuleRepository, IRepository<SubjectUser> subjectUserRepository, IRepository<Subject> subjectRepository, IDistributedLockProvider distributedLockProvider,
             IRepository<Trial> trialRepository, IRepository<TrialSite> trialSiteRepository, IRepository<TrialVirtualSiteCodeUpdate> trialVirtualSiteCodeUpdateRepository, IVisitTaskHelpeService visitTaskCommonService)
@@ -58,7 +56,6 @@ namespace IRaCIS.Core.Application.Service
             _taskConsistentRuleRepository = taskConsistentRuleRepository;
             _visitTaskRepository = visitTaskRepository;
             this._readingConsistentClinicalDataRepository = readingConsistentClinicalDataRepository;
-            this._trialReadingCriterionRepository = trialReadingCriterionRepository;
             this._readingClinicalDataService = readingClinicalDataService;
             _subjectUserRepository = subjectUserRepository;
             _subjectRepository = subjectRepository;
@@ -785,11 +782,9 @@ namespace IRaCIS.Core.Application.Service
 
 
         [HttpPost]
-        public async Task<(TaskConsistentRuleBasic?,object)> GetConsistentRule(TaskConsistentRuleQuery inQuery)
+        public async Task<TaskConsistentRuleBasic?> GetConsistentRule(TaskConsistentRuleQuery inQuery)
         {
-            return (await _taskConsistentRuleRepository.Where(t => t.TrialId == inQuery.TrialId && t.IsSelfAnalysis == inQuery.IsSelfAnalysis && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId).ProjectTo<TaskConsistentRuleBasic>(_mapper.ConfigurationProvider).FirstOrDefaultAsync(),
-                await _trialReadingCriterionRepository.Where(x=>x.Id==inQuery.TrialReadingCriterionId).Select(x=>x.IsReadingTaskViewInOrder).FirstNotNullAsync()
-                );
+            return await _taskConsistentRuleRepository.Where(t => t.TrialId == inQuery.TrialId && t.IsSelfAnalysis == inQuery.IsSelfAnalysis && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId).ProjectTo<TaskConsistentRuleBasic>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
         }
 
         /// <summary>