修改仓储

IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs

@@ -22,6 +22,7 @@ namespace IRaCIS.Application.Services
         IRepository<TrialRevenuesPrice> _trialRevenuesPriceRepository,
         IRepository<TrialRevenuesPriceVerification> _trialRevenuesPriceVerificationRepository,
         IRepository<EnrollReadingCriterion> _enrollReadingCriterionRepository,
+        IRepository<VisitTask> _visitTaskRepository,
         IRepository<TaskAllocationRule> _taskAllocationRuleRepository) : BaseService, IDoctorWorkloadService
     {
         
@@ -129,7 +130,7 @@ namespace IRaCIS.Application.Services
             var enroll = await _enrollRepository.FirstAsync(t => t.Id == inDto.EnrollId);
 
 
-            if (_repository.Where<VisitTask>(t => t.TrialId == enroll.TrialId && t.DoctorUserId == enroll.DoctorUserId && t.TaskAllocationState == TaskAllocationState.Allocated && t.TrialReadingCriterionId == inDto.TrialReadingCriterionId).Any())
+            if (_visitTaskRepository.Where(t => t.TrialId == enroll.TrialId && t.DoctorUserId == enroll.DoctorUserId && t.TaskAllocationState == TaskAllocationState.Allocated && t.TrialReadingCriterionId == inDto.TrialReadingCriterionId).Any())
             {
 
                 var readingCategoryList = await _enrollReadingCategoryRepository.Where(t => t.EnrollId == inDto.EnrollId && t.TrialReadingCriterionId == inDto.TrialReadingCriterionId).Select(t => t.ReadingCategory).ToListAsync();

IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs

@@ -19,6 +19,8 @@ namespace IRaCIS.Application.Services
         IRepository<Doctor> _doctorRepository,
         IRepository<EnrollDetail> _enrollDetailRepository,
         IRepository<Workload> _workloadRepository,
+        IRepository<User> _userRepository,
+        IRepository<TrialUser> _trialUserRepository,
         IMailVerificationService _mailVerificationService) : BaseService, IEnrollService
     {
        
@@ -140,7 +142,7 @@ namespace IRaCIS.Application.Services
                     TrialId = trialId,
                     EnrollStatus = EnrollStatus.HasApplyDownloadResume,
 
-                    DoctorUserId = _repository.Where<User>(t => t.DoctorId == doctorId).Select(t => t.Id).FirstOrDefault()
+                    DoctorUserId = _userRepository.Where(t => t.DoctorId == doctorId).Select(t => t.Id).FirstOrDefault()
                 }); ;
 
                 await _enrollDetailRepository.AddAsync(new EnrollDetail()
@@ -168,7 +170,7 @@ namespace IRaCIS.Application.Services
 
             var trial = await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialId);
 
-            var hasSPMOrCPM = await _repository.Where<TrialUser>(t => t.TrialId == trialId).AnyAsync(t=>  t.User.UserTypeEnum == UserTypeEnum.SPM || t.User.UserTypeEnum == UserTypeEnum.CPM);
+            var hasSPMOrCPM = await _trialUserRepository.Where(t => t.TrialId == trialId).AnyAsync(t=>  t.User.UserTypeEnum == UserTypeEnum.SPM || t.User.UserTypeEnum == UserTypeEnum.CPM);
 
             if (trial != null)
             {