修改仓储

IRaCIS.Core.Application/Service/Visit/PatientService.cs

@@ -53,6 +53,7 @@ namespace IRaCIS.Application.Services
         IRepository<Subject> _subjectRepository,
         IRepository<SubjectVisit> _subjectVisitRepository,
         IRepository<Dictionary> _dictionaryRepository,
+        IRepository<DicomStudy> _dicomStudyRepository,
         IDistributedLockProvider _distributedLockProvider) : BaseService
     {
 
@@ -318,11 +319,11 @@ namespace IRaCIS.Application.Services
 
             var subjectId = inCommand.SubjectId;
 
-            var isVerifyVisitImageDate = await _repository.Where<Trial>(t => t.Id == inCommand.TrialId).Select(t => t.IsVerifyVisitImageDate).FirstNotNullAsync();
+            var isVerifyVisitImageDate = await  _trialRepository.Where(t => t.Id == inCommand.TrialId).Select(t => t.IsVerifyVisitImageDate).FirstNotNullAsync();
 
             var result = new List<VerifySCPStudyUploadResult>();
 
-            var visitList = _repository.Where<SubjectVisit>(t => t.SubjectId == inCommand.SubjectId).Select(t => new { t.VisitNum, t.EarliestScanDate, t.LatestScanDate, t.Id }).ToList();
+            var visitList = _subjectVisitRepository.Where(t => t.SubjectId == inCommand.SubjectId).Select(t => new { t.VisitNum, t.EarliestScanDate, t.LatestScanDate, t.Id }).ToList();
 
             var currentVisitNum = visitList.First(t => t.Id == inCommand.SubjectVisitId).VisitNum;
 
@@ -355,7 +356,7 @@ namespace IRaCIS.Application.Services
                     }
                 }
 
-                var verifyStudyInfo = _repository.Where<DicomStudy>(t => t.TrialId == trialId && t.Id == waitUploadItem.Id).ProjectTo<VerifyStudyDto>(_mapper.ConfigurationProvider).FirstOrDefault();
+                var verifyStudyInfo = _dicomStudyRepository.Where(t => t.TrialId == trialId && t.Id == waitUploadItem.Id).ProjectTo<VerifyStudyDto>(_mapper.ConfigurationProvider).FirstOrDefault();
 
                 var currentStudyResult = new VerifySCPStudyUploadResult() { SCPStudyId = waitUploadItem.Id };
 
@@ -436,7 +437,7 @@ namespace IRaCIS.Application.Services
 
             using (await @lock.AcquireAsync())
             {
-                var dbStudyCodeIntMax = _repository.Where<DicomStudy>(s => s.TrialId == inCommand.TrialId).Select(t => t.Code).DefaultIfEmpty().Max();
+                var dbStudyCodeIntMax = _dicomStudyRepository.Where(s => s.TrialId == inCommand.TrialId).Select(t => t.Code).DefaultIfEmpty().Max();
 
                 int currentNextCodeInt = dbStudyCodeIntMax + 1;
 

IRaCIS.Core.Application/Service/Visit/SubjectService.cs

@@ -13,6 +13,7 @@ namespace IRaCIS.Application.Services
     [ApiExplorerSettings(GroupName = "Trial")]
     public class SubjectService(
         IRepository<Subject> _subjectRepository,
+        IRepository<Trial> _trialRepository,
         IRepository<SubjectVisit> _subjectVisitRepository) : BaseService, ISubjectService
     {
        
@@ -124,7 +125,7 @@ namespace IRaCIS.Application.Services
 
             var pageList = await subjectQuery.ToPagedListAsync(inQuery,nameof(SubjectQueryView.Code));
 
-            var trialConfig = await _repository.Where<Trial>(t => t.Id == inQuery.TrialId).ProjectTo<TrialSubjectConfig>(_mapper.ConfigurationProvider).FirstOrDefaultAsync().IfNullThrowException();
+            var trialConfig = await  _trialRepository.Where(t => t.Id == inQuery.TrialId).ProjectTo<TrialSubjectConfig>(_mapper.ConfigurationProvider).FirstOrDefaultAsync().IfNullThrowException();
 
             return ResponseOutput.Ok(pageList, trialConfig);
 

IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs

@@ -23,6 +23,7 @@ namespace IRaCIS.Core.Application.Services
     public class SubjectVisitService(
         IRepository<SubjectVisit> _subjectVisitRepository,
         IRepository<Trial> _trialRepository,
+        IRepository<DicomStudy> _dicomStudyRepository,
         IRepository<NoneDicomStudy> _noneDicomStudyRepository,
         IRepository<VisitTask> _visitTaskRepository,
         IRepository<ReadingTableAnswerRowInfo> _readingTableAnswerRowInfoRepository,
@@ -30,6 +31,7 @@ namespace IRaCIS.Core.Application.Services
         IRepository<NoneDicomStudyFile> _noneDicomStudyFileRepository,
         IRepository<Subject> _subjectRepository,
         IServiceProvider _serviceProvider,
+        IRepository<DicomSeries> _dicomSeriesRepository,
         IRepository<ReadingQuestionCriterionTrial> _trialReadingCriterionRepository
        ) : BaseService, ISubjectVisitService
     {
@@ -216,7 +218,7 @@ namespace IRaCIS.Core.Application.Services
         [AllowAnonymous]
         public async Task<List<VisitStudyDTO>> GetVisitStudyList(Guid trialId, Guid sujectVisitId, int isReading)
         {
-            var studyList = await _repository.Where<DicomStudy>(t => t.TrialId == trialId && t.SubjectVisitId == sujectVisitId).Select(k => new VisitStudyDTO()
+            var studyList = await _dicomStudyRepository.Where(t => t.TrialId == trialId && t.SubjectVisitId == sujectVisitId).Select(k => new VisitStudyDTO()
             {
                 InstanceCount = k.InstanceCount,
                 Modalities = k.Modalities,
@@ -231,7 +233,7 @@ namespace IRaCIS.Core.Application.Services
 
             foreach (var t in studyList)
             {
-                t.SeriesList = await _repository.Where<DicomSeries>(s => s.StudyId == t.StudyId)
+                t.SeriesList = await _dicomSeriesRepository.Where(s => s.StudyId == t.StudyId)
                .WhereIf(isReading == 1, s => s.IsReading).OrderBy(s => s.SeriesNumber).ThenBy(s => s.SeriesTime)
                .ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).ToListAsync();
 
@@ -275,7 +277,7 @@ namespace IRaCIS.Core.Application.Services
         [HttpPost]
         public async Task<DicomSeriesDTO> GetDicomSeriesInfo(GetDicomSeriesInfoInDto inDto)
         {
-            DicomSeriesDTO series = await _repository.Where<DicomSeries>(s => s.Id == inDto.SeriesId).ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).FirstNotNullAsync();
+            DicomSeriesDTO series = await _dicomSeriesRepository.Where(s => s.Id == inDto.SeriesId).ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).FirstNotNullAsync();
 
             var instanceList = await _repository.Where<DicomInstance>(t => t.SeriesId == inDto.SeriesId)
                .Select(t => new { t.SeriesId, t.StudyId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.WindowCenter, t.WindowWidth, t.HtmlPath, t.SliceLocation }).ToListAsync();
@@ -360,8 +362,8 @@ namespace IRaCIS.Core.Application.Services
             }
 
 
-            List<DicomSeriesDTO> ctseriesLists = await _repository.Where<DicomSeries>(s => ctseriesIds.Contains(s.Id)).ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).ToListAsync();
-            List<DicomSeriesDTO> ptseriesLists = await _repository.Where<DicomSeries>(s => ptseriesIds.Contains(s.Id)).ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).ToListAsync();
+            List<DicomSeriesDTO> ctseriesLists = await _dicomSeriesRepository.Where(s => ctseriesIds.Contains(s.Id)).ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).ToListAsync();
+            List<DicomSeriesDTO> ptseriesLists = await _dicomSeriesRepository.Where(s => ptseriesIds.Contains(s.Id)).ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).ToListAsync();
 
             var seriesIds = ctseriesIds.Union(ptseriesIds).ToList();  //并集
 
@@ -370,7 +372,7 @@ namespace IRaCIS.Core.Application.Services
 
             var studyIds = instanceList.Select(x => x.StudyId).Distinct().ToList();
 
-            var studyList = await _repository.Where<DicomStudy>(t => studyIds.Contains(t.Id))
+            var studyList = await _dicomStudyRepository.Where(t => studyIds.Contains(t.Id))
             .Select(k => new StudyInfo()
             {
                 InstanceCount = k.InstanceCount,
@@ -473,7 +475,7 @@ namespace IRaCIS.Core.Application.Services
 
                 var isManualGenerate = await _trialReadingCriterionRepository.AnyAsync(t => t.Id == taskInfo.TrialReadingCriterionId && t.IsAutoCreate == false);
 
-                var dicomStudyList = await _repository.Where<DicomStudy>(t => t.TrialId == indto.TrialId && t.SubjectVisitId == indto.SujectVisitId)
+                var dicomStudyList = await _dicomStudyRepository.Where(t => t.TrialId == indto.TrialId && t.SubjectVisitId == indto.SujectVisitId)
                     .WhereIf(taskInfo.IsImageFilter == true, t => taskInfo.CriterionModalitys.Contains(t.ModalityForEdit))
                     .WhereIf(isManualGenerate, t => t.SubjectCriteriaEvaluationVisitStudyFilterList.Any(t => t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId && t.IsConfirmed && t.IsReading))
                     .Select(k => new VisitStudyDTO()
@@ -490,7 +492,7 @@ namespace IRaCIS.Core.Application.Services
                 var instanceList = await _repository.Where<DicomInstance>(t => studyIds.Contains(t.StudyId))
                        .Select(t => new { t.SeriesId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.WindowCenter, t.WindowWidth, t.HtmlPath }).ToListAsync();
 
-                List<DicomSeriesDTO> seriesLists = await _repository.Where<DicomSeries>(s => studyIds.Contains(s.StudyId))
+                List<DicomSeriesDTO> seriesLists = await _dicomSeriesRepository.Where(s => studyIds.Contains(s.StudyId))
                      .WhereIf(isManualGenerate == false, t => t.IsReading)
                      .WhereIf(isManualGenerate, t => t.SubjectCriteriaEvaluationVisitStudyFilterList.Any(t => t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId && t.IsConfirmed && t.IsReading))
                     .OrderBy(s => s.SeriesNumber).ThenBy(s => s.SeriesTime).ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).ToListAsync();
@@ -558,7 +560,7 @@ namespace IRaCIS.Core.Application.Services
                     var thisSeriesIdIds = rowInfoList.Where(x => x.SeriesId != null).OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex).Select(x => x.SeriesId).Distinct().ToList();
                     if (rowInfoList.Count > 0)
                     {
-                        var thisVisitTaskStudy = await _repository.Where<DicomStudy>(t => thisStudyIds.Contains(t.Id)).Select(k => new VisitStudyDTO()
+                        var thisVisitTaskStudy = await _dicomStudyRepository.Where(t => thisStudyIds.Contains(t.Id)).Select(k => new VisitStudyDTO()
                         {
                             InstanceCount = k.InstanceCount,
 
@@ -572,7 +574,7 @@ namespace IRaCIS.Core.Application.Services
                         if (thisVisitTaskStudy != null)
                         {
                             thisVisitTaskStudy.StudyId = default(Guid);
-                            var item = await _repository.Where<DicomSeries>(s => thisSeriesIdIds.Contains(s.Id)).OrderBy(s => s.SeriesNumber).
+                            var item = await _dicomSeriesRepository.Where(s => thisSeriesIdIds.Contains(s.Id)).OrderBy(s => s.SeriesNumber).
                                 ThenBy(s => s.SeriesTime)
                                 .ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
 
@@ -613,7 +615,7 @@ namespace IRaCIS.Core.Application.Services
 
                                 item.Description = "Key Series";
 
-                                var modalityList = await _repository.Where<DicomSeries>(s => thisSeriesIdIds.Contains(s.Id)).OrderBy(s => s.SeriesNumber).ThenBy(s => s.SeriesTime).Select(x => x.Modality).Distinct().ToListAsync(); ;
+                                var modalityList = await _dicomSeriesRepository.Where(s => thisSeriesIdIds.Contains(s.Id)).OrderBy(s => s.SeriesNumber).ThenBy(s => s.SeriesTime).Select(x => x.Modality).Distinct().ToListAsync(); ;
                                 item.Modality = string.Join(",", modalityList);
                                 thisVisitTaskStudy.SeriesList.Add(item);
                                 //thisVisitTaskStudy.SeriesCount = thisVisitTaskStudy.SeriesList.Count;

IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs

@@ -179,7 +179,7 @@ namespace IRaCIS.Application.Services
 
                 if (stage.IsBaseLine && stage.IsBaseLine != visitPlan.IsBaseLine)
                 {
-                    if (await _repository.Where<SubjectVisit>(t => t.TrialId == visitPlan.TrialId).AnyAsync(v => v.IsBaseLine && v.SubmitState >= SubmitStateEnum.ToSubmit))
+                    if (await _subjectVisitRepository.Where(t => t.TrialId == visitPlan.TrialId).AnyAsync(v => v.IsBaseLine && v.SubmitState >= SubmitStateEnum.ToSubmit))
                     {
                 //---有受试者的基线已经上传了影像数据,不允许修改基线访视。
                         throw new BusinessValidationFailedException(_localizer["VisitPlan_ExistBaselineImgNoModify"]);