修改仓储

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

@@ -21,6 +21,8 @@ namespace IRaCIS.Core.Application.Service
     public class TaskAllocationRuleService(
         IRepository<TaskAllocationRule> _taskAllocationRuleRepository,
         IRepository<User> _userRepository,
+        IRepository<Enroll> _enrollRepository,
+        IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
         IRepository<SubjectCanceDoctor> _subjectCanceDoctorRepository) : BaseService, ITaskAllocationRuleService
     {
 
@@ -37,7 +39,7 @@ namespace IRaCIS.Core.Application.Service
             var list = await _taskAllocationRuleRepository.Where(t => t.TrialId == trialId).ProjectTo<TaskAllocationRuleDTO>(_mapper.ConfigurationProvider).ToListAsync();
 
             //所有标准都是一样  后台只返回任意一个标准的就好了
-            var trialTaskConfig = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.TrialId == trialId && t.IsConfirm).ProjectTo<TrialTaskConfigView>(_mapper.ConfigurationProvider).FirstNotNullAsync();
+            var trialTaskConfig = await _readingQuestionCriterionTrialRepository.Where(t => t.TrialId == trialId && t.IsConfirm).ProjectTo<TrialTaskConfigView>(_mapper.ConfigurationProvider).FirstNotNullAsync();
 
             return (list, trialTaskConfig);
         }
@@ -53,7 +55,7 @@ namespace IRaCIS.Core.Application.Service
 
             //冗余 存
 
-            var enrollId = _repository.Where<Enroll>(t => t.TrialId == addOrEditTaskAllocationRule.TrialId && t.DoctorUserId == addOrEditTaskAllocationRule.DoctorUserId).Select(t => t.Id).FirstOrDefault();
+            var enrollId = _enrollRepository.Where(t => t.TrialId == addOrEditTaskAllocationRule.TrialId && t.DoctorUserId == addOrEditTaskAllocationRule.DoctorUserId).Select(t => t.Id).FirstOrDefault();
 
             if (enrollId == Guid.Empty)
             {

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

@@ -37,6 +37,8 @@ namespace IRaCIS.Core.Application.Service
         IDistributedLockProvider _distributedLockProvider,
         IRepository<Trial> _trialRepository,
         IRepository<TrialSite> _trialSiteRepository,
+        IRepository<Enroll> _enrollRepository,
+        IRepository<User> _userRepository,
         IRepository<TrialVirtualSiteCodeUpdate> _trialVirtualSiteCodeUpdateRepository,
         IVisitTaskHelpeService _visitTaskCommonService) : BaseService, ITaskConsistentRuleService
     {
@@ -112,7 +114,7 @@ namespace IRaCIS.Core.Application.Service
             }
             #endregion
 
-            var trialTaskConfig = _repository.Where<Trial>(t => t.Id == inQuery.TrialId).Select(t => new { IsHaveDoubleReadCriterion = t.TrialReadingCriterionList.Any(t => t.IsSigned && t.IsConfirm && t.ReadingType == ReadingMethod.Double), t.VitrualSiteCode }).FirstOrDefault();
+            var trialTaskConfig =  _trialRepository.Where(t => t.Id == inQuery.TrialId).Select(t => new { IsHaveDoubleReadCriterion = t.TrialReadingCriterionList.Any(t => t.IsSigned && t.IsConfirm && t.ReadingType == ReadingMethod.Double), t.VitrualSiteCode }).FirstOrDefault();
 
             return ResponseOutput.Ok(pageList, trialTaskConfig);
         }
@@ -373,9 +375,9 @@ namespace IRaCIS.Core.Application.Service
 
             var subjectList = query.ToList();
 
-            var doctorUserIdQuery = from enroll in _repository.Where<Enroll>(t => t.TrialId == trialId).Where(t => t.EnrollReadingCategoryList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId).Any(c => c.ReadingCategory == ReadingCategory.Global || c.ReadingCategory == ReadingCategory.Visit))
+            var doctorUserIdQuery = from enroll in _enrollRepository.Where(t => t.TrialId == trialId).Where(t => t.EnrollReadingCategoryList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId).Any(c => c.ReadingCategory == ReadingCategory.Global || c.ReadingCategory == ReadingCategory.Visit))
                                     .Where(t => t.EnrollReadingCriteriaList.Any(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.IsJoinAnalysis == true))
-                                    join user in _repository.Where<User>() on enroll.DoctorId equals user.DoctorId
+                                    join user in _userRepository.Where() on enroll.DoctorId equals user.DoctorId
                                     select user.Id;
 
             var configDoctorUserIdList = await doctorUserIdQuery.ToListAsync();
@@ -788,10 +790,10 @@ namespace IRaCIS.Core.Application.Service
             Expression<Func<VisitTask, bool>> visitTaskFilter = comonTaskFilter.And(t => t.ReadingCategory == ReadingCategory.Visit);
 
 
-            var taskConsistentRuleQueryable = from enroll in _repository.Where<Enroll>(t => t.TrialId == trialId && t.EnrollStatus == EnrollStatus.ConfirmIntoGroup
+            var taskConsistentRuleQueryable = from enroll in _enrollRepository.Where(t => t.TrialId == trialId && t.EnrollStatus == EnrollStatus.ConfirmIntoGroup
                                               && t.EnrollReadingCriteriaList.Any(c => c.TrialReadingCriterionId == inQuery.TrialReadingCriterionId && c.IsJoinAnalysis))
-                                              join user in _repository.Where<User>() on enroll.DoctorUserId equals user.Id
-                                              join taskConsistentRule in _repository.Where<TaskConsistentRule>(t => t.TrialId == trialId && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId && t.IsSelfAnalysis) on enroll.TrialId equals taskConsistentRule.TrialId
+                                              join user in _userRepository.Where() on enroll.DoctorUserId equals user.Id
+                                              join taskConsistentRule in _taskConsistentRuleRepository.Where(t => t.TrialId == trialId && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId && t.IsSelfAnalysis) on enroll.TrialId equals taskConsistentRule.TrialId
                                               select new TaskConsistentRuleView()
                                               {
                                                   Id = taskConsistentRule.Id,

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

@@ -43,6 +43,8 @@ namespace IRaCIS.Core.Application.Service.Allocation
         IRepository<SubjectCriteriaEvaluation> _subjectCriteriaEvaluationRepository,
         IRepository<SubjectCriteriaEvaluationVisitFilter> _subjectCriteriaEvaluationVisitFilterRepository,
         IRepository<ReadingQuestionCriterionTrial> _trialReadingCriterionRepository,
+        IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
+        IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository,
         IRepository<SubjectCriteriaEvaluationVisitStudyFilter> _subjectCriteriaEvaluationVisitStudyFilterRepository) : BaseService, IVisitTaskService
     {
 
@@ -63,13 +65,13 @@ namespace IRaCIS.Core.Application.Service.Allocation
                 TaskUrgentRemake = inDto.TaskUrgentRemake,
 
             });
-
+                                                     
             return await _visitTaskRepository.SaveChangesAsync();
         }
 
         public async Task<List<TrialReadingCriterionDto>> GetTrialCriterionList(Guid trialId, bool isHaveSigned = true, bool? isAutoCreate = null)
         {
-            var list = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.TrialId == trialId && t.IsConfirm)
+            var list = await _readingQuestionCriterionTrialRepository.Where(t => t.TrialId == trialId && t.IsConfirm)
 
                 .OrderBy(t => t.ShowOrder)
                 .Select(t => new TrialReadingCriterionDto()
@@ -2171,7 +2173,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
             _ = _repository.AddRangeAsync(readingTaskQuestionMarkList).Result;
 
-            var readingTaskQuestionAnswerList = _repository.Where<ReadingTaskQuestionAnswer>(t => t.VisitTaskId == origenalTask.Id).ToList();
+            var readingTaskQuestionAnswerList = _readingTaskQuestionAnswerRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList();
 
             foreach (var item in readingTaskQuestionAnswerList)
             {