整理仓储

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

@@ -17,7 +17,8 @@ namespace IRaCIS.Core.Application.Service
     /// </summary>	
     [ApiExplorerSettings(GroupName = "Trial")]
     public class TaskMedicalReviewRuleService(
-        IRepository<TaskMedicalReviewRule> _taskMedicalReviewRuleRepository) : BaseService, ITaskMedicalReviewRuleService
+        IRepository<TaskMedicalReviewRule> _taskMedicalReviewRuleRepository,
+        IRepository<TrialUser> _trialUserRepository) : BaseService, ITaskMedicalReviewRuleService
     {
 
       
@@ -30,7 +31,7 @@ namespace IRaCIS.Core.Application.Service
             var taskTaskMedicalReviewRuleQueryable = _taskMedicalReviewRuleRepository.Where(t => t.TrialId == inQuery.TrialId)
             .ProjectTo<TaskMedicalReviewRuleView>(_mapper.ConfigurationProvider);
 
-            var isHaveMIM = await _repository.AnyAsync<TrialUser>(t => t.User.UserTypeEnum == Domain.Share.UserTypeEnum.MIM && t.TrialId==inQuery.TrialId);
+            var isHaveMIM = await _trialUserRepository.AnyAsync(t => t.User.UserTypeEnum == Domain.Share.UserTypeEnum.MIM && t.TrialId==inQuery.TrialId);
 
             return (await taskTaskMedicalReviewRuleQueryable.ToListAsync(),new {IsHaveMIM=isHaveMIM});
         }

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

@@ -45,6 +45,10 @@ namespace IRaCIS.Core.Application.Service.Allocation
         IRepository<ReadingQuestionCriterionTrial> _trialReadingCriterionRepository,
         IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
         IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository,
+        IRepository<DicomInstance> _dicomInstanceRepository,
+        IRepository<DicomSeries> _dicomSeriesRepository,
+        IRepository<SubjectCanceDoctor> _subjectCanceDoctorRepository,
+        IRepository<TrialQCQuestionAnswer> _trialQCQuestionAnswerRepository,
         IRepository<SubjectCriteriaEvaluationVisitStudyFilter> _subjectCriteriaEvaluationVisitStudyFilterRepository) : BaseService, IVisitTaskService
     {
 
@@ -277,7 +281,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
             var subjectId = cancelCommand.CancelList.First().SubjectId;
 
-            await _repository.AddAsync(new SubjectCanceDoctor() { SubjectId = subjectId, Note = cancelCommand.Note, TrialReadingCriterionId = cancelCommand.TrialReadingCriterionId });
+            await _subjectCanceDoctorRepository.AddAsync(new SubjectCanceDoctor() { SubjectId = subjectId, Note = cancelCommand.Note, TrialReadingCriterionId = cancelCommand.TrialReadingCriterionId });
 
             await _visitTaskRepository.SaveChangesAsync();
 
@@ -1555,7 +1559,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
         /// <returns></returns>
         private async Task PMReReadingConfirmOrBackInfluenceAnalysisAsync(Guid subjectId)
         {
-            if (await _repository.AnyAsync<VisitTask>(t => t.IsAnalysisCreate && t.SubjectId == subjectId))
+            if (await _visitTaskRepository.AnyAsync(t => t.IsAnalysisCreate && t.SubjectId == subjectId))
             {
                 await _repository.UpdatePartialFromQueryAsync<Subject>(t => t.Id == subjectId, u => new Subject() { IsReReadingOrBackInfluenceAnalysis = true });
 
@@ -2537,9 +2541,9 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
             //await _repository.AddAsync(new CheckChallengeDialog() { SubjectVisitId = subjectVisitId, TalkContent = "PM/APM同意一致性核查回退。", UserTypeEnum = (UserTypeEnum)_userInfo.UserTypeEnumInt });
 
-            await _repository.BatchDeleteAsync<TrialQCQuestionAnswer>(t => t.SubjectVisitId == subjectVisitId);
-            await _repository.BatchDeleteAsync<DicomInstance>(t => t.DicomSerie.IsDeleted);
-            await _repository.BatchDeleteAsync<DicomSeries>(t => t.IsDeleted);
+            await _trialQCQuestionAnswerRepository.BatchDeleteNoTrackingAsync(t => t.SubjectVisitId == subjectVisitId);
+            await _dicomInstanceRepository.BatchDeleteNoTrackingAsync(t => t.DicomSerie.IsDeleted);
+            await _dicomSeriesRepository.BatchDeleteNoTrackingAsync(t => t.IsDeleted);
 
             var success = await _subjectVisitRepository.SaveChangesAsync();