Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs

@@ -44,7 +44,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         IRepository<NoneDicomStudyFile> _noneDicomStudyFileReposiotry,
         IDistributedLockProvider _distributedLockProvider,
         IRepository<TrialImageDownload> _trialImageDownloadRepository,
-        IRepository<Subject> _subjectRepository, 
+        IRepository<Subject> _subjectRepository,
         IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IFusionCache _fusionCache) : BaseService, IDownloadAndUploadService
     {
 
@@ -257,7 +257,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         }
 
 
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
 
         public async Task<IResponseOutput> PreArchiveDicomStudy(PriArchiveTaskStudyCommand preArchiveStudyCommand)
         {
@@ -356,7 +356,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         }
 
 
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         public async Task<IResponseOutput> AddOrUpdateArchiveTaskStudy(TaskArchiveStudyCommand incommand)
         {
             #region 获取该subject 已生成任务的访视的检查
@@ -620,12 +620,25 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             {
                 if (dicomStudyId == null)
                 {
+                    var deleteStudyPathList = await _taskInstanceRepository.Where(t => t.VisitTaskId == visitTaskId).GroupBy(t => t.StudyId).Select(g => g.First().Path).ToListAsync();
+
+                    foreach (var fisrtPath in deleteStudyPathList)
+                    {
+                        var prefix = fisrtPath.Substring(1, fisrtPath.LastIndexOf('/') - 1);
+                        await _oSSService.DeleteFromPrefix(prefix, true);
+                    }
+
+
                     await _taskStudyRepository.DeleteFromQueryAsync(t => t.VisitTaskId == visitTaskId);
                     await _taskSeriesRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId);
                     await _taskInstanceRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId);
                 }
                 else
                 {
+                    var fisrtPath = await _taskInstanceRepository.Where(t => t.VisitTaskId == visitTaskId && t.StudyId == dicomStudyId).Select(t => t.Path).FirstOrDefaultAsync();
+                    var prefix = fisrtPath.Substring(1, fisrtPath.LastIndexOf('/') - 1);
+                    await _oSSService.DeleteFromPrefix(prefix, true);
+
                     await _taskStudyRepository.DeleteFromQueryAsync(t => t.VisitTaskId == visitTaskId && t.Id == dicomStudyId);
                     await _taskSeriesRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId && t.Id == dicomStudyId);
                     await _taskInstanceRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId && t.Id == dicomStudyId);
@@ -689,7 +702,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                             SubjectCode = u.IsSelfAnalysis == true ? u.BlindSubjectCode : u.Subject.Code,
                             TaskBlindName = u.TaskBlindName,
                             TaskName = u.TaskName,
-                            ReadingTaskState=u.ReadingTaskState,
+                            ReadingTaskState = u.ReadingTaskState,
                             SourceSubjectVisitId = u.SourceSubjectVisitId,
                             VisitTaskId = u.Id,
 
@@ -761,9 +774,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                         select new
                         {
                             TrialId = sv.TrialId,
-                            SubjectId=sv.SubjectId,
+                            SubjectId = sv.SubjectId,
                             SubjectCode = sv.Subject.Code,
-                            TrialSiteCode=sv.TrialSite.TrialSiteCode,
+                            TrialSiteCode = sv.TrialSite.TrialSiteCode,
                             VisitName = sv.VisitName,
 
                             StudyList = sv.StudyList.Where(t => isQueryDicom ? inQuery.DicomStudyIdList.Contains(t.Id) : false)
@@ -971,7 +984,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
             var subjectVisitIdList = inQuery.SubjectVisitTaskList.Select(t => t.SubjectVisitId).ToList();
 
-            var trialSiteCode = _visitTaskRepository.Where(t => t.Id == taskIdList.FirstOrDefault()).Select(t => t.IsAnalysisCreate ? t.BlindTrialSiteCode : t.Subject.TrialSite.TrialSiteCode).FirstOrDefault()??string.Empty;
+            var trialSiteCode = _visitTaskRepository.Where(t => t.Id == taskIdList.FirstOrDefault()).Select(t => t.IsAnalysisCreate ? t.BlindTrialSiteCode : t.Subject.TrialSite.TrialSiteCode).FirstOrDefault() ?? string.Empty;
 
             var query = from sv in _subjectRepository.Where(t => t.Id == inQuery.SubjectId).SelectMany(t => t.SubjectVisitList.Where(t => subjectVisitIdList.Contains(t.Id)))
                             //一致性分析，导致查询出来两条数据
@@ -1032,9 +1045,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             {
                 Id = NewId.NextSequentialGuid(),
                 TrialId = info.TrialId,
-                SubjectId=inQuery.SubjectId,
+                SubjectId = inQuery.SubjectId,
                 SubjectCode = inQuery.SubjectCode,
-                TrialSiteCode= trialSiteCode,
+                TrialSiteCode = trialSiteCode,
                 IP = _userInfo.IP,
                 DownloadStartTime = DateTime.Now,
                 IsSuccess = false,

IRaCIS.Core.Application/Service/QC/QCOperationService.cs

@@ -35,6 +35,7 @@ namespace IRaCIS.Core.Application.Image.QA
         IRepository<TrialQCQuestionAnswer> _trialQCQuestionAnswerRepository,
         IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
         IDistributedLockProvider _distributedLockProvider, IReadingClinicalDataService _readingClinicalDataService,
+        IOSSService _oSSService,
         IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IWebHostEnvironment _hostEnvironment) : BaseService, IQCOperationService
     {
 
@@ -717,7 +718,7 @@ namespace IRaCIS.Core.Application.Image.QA
                 var study = (await _dicomStudyRepository.Where(t => t.Id == series.StudyId, true).IgnoreQueryFilters().FirstOrDefaultAsync()).IfNullThrowException();
 
                 study.InstanceCount = study.InstanceCount + 1;
-            
+
 
             }
 
@@ -835,6 +836,8 @@ namespace IRaCIS.Core.Application.Image.QA
 
                 await _dicomStudyRepository.DeleteAsync(study);
 
+                var fisrtPath = await _dicomInstanceRepository.Where(t => t.StudyId == id).Select(t => t.Path).FirstOrDefaultAsync();
+
 
                 var succeess2 = await _dicomInstanceRepository.BatchDeleteNoTrackingAsync(t => t.StudyId == id);
                 var success3 = await _dicomSeriesrepository.BatchDeleteNoTrackingAsync(t => t.StudyId == id);
@@ -842,6 +845,9 @@ namespace IRaCIS.Core.Application.Image.QA
                 await _scpStudyRepository.BatchUpdateNoTrackingAsync(t => t.Id == id, u => new SCPStudy() { SubjectVisitId = null });
 
 
+                var prefix = fisrtPath.Substring(1, fisrtPath.LastIndexOf('/') - 1);
+
+                await _oSSService.DeleteFromPrefix(prefix, true);
 
                 //var success3 = await _dicomSeriesrepository.DeleteFromQueryAsync(t => t.StudyId == id, true);
                 //var success4 = await _repository.BatchDeleteAsync<StudyMonitor>(t => t.StudyId == id);
@@ -950,7 +956,7 @@ namespace IRaCIS.Core.Application.Image.QA
         {
             var nextIQCQuality = await this.GetNextIQCQuality(inDto);
 
-            if (nextIQCQuality.VisitId != null&& nextIQCQuality.IsReceived==false)
+            if (nextIQCQuality.VisitId != null && nextIQCQuality.IsReceived == false)
             {
                 var visit = await _subjectVisitRepository.Where(x => x.Id == nextIQCQuality.VisitId).FirstNotNullAsync();
                 if (!visit.IsTake)
@@ -988,7 +994,7 @@ namespace IRaCIS.Core.Application.Image.QA
                 return new GetNextIQCQualityOutDto()
                 {
                     IsReceived = true,
-                    SubjectId= currentActionList[0].SubjectId,
+                    SubjectId = currentActionList[0].SubjectId,
                     VisitId = currentActionList[0].Id,
 
                 };
@@ -1627,8 +1633,8 @@ namespace IRaCIS.Core.Application.Image.QA
 
 
             //删除 软删除的物理文件
-            var instancePathList = await _dicomInstanceRepository.Where(t => t.DicomSerie.IsDeleted && t.SubjectVisitId == subjectVisitId)
-                .Select(t => t.Path).ToListAsync();
+            var instancePathList = await _dicomInstanceRepository.Where(t => (t.DicomSerie.IsDeleted || t.IsDeleted) && t.SubjectVisitId == subjectVisitId, false, true)
+                .Select(t =>   t.Path).ToListAsync();
 
             //维护统一状态
             dbSubjectVisit.ReadingStatus = ReadingStatusEnum.ConsistencyCheck;
@@ -1666,17 +1672,9 @@ namespace IRaCIS.Core.Application.Image.QA
                         dbSubjectVisit.ReadingStatus = trialConfig.IsImageConsistencyVerification ? ReadingStatusEnum.ConsistencyCheck : ReadingStatusEnum.TaskAllocate;
 
                         //删除影像
-                        instancePathList.ForEach(path =>
-                        {
+                        await _dicomInstanceRepository.BatchDeleteNoTrackingAsync(t => (t.DicomSerie.IsDeleted || t.IsDeleted) && t.SubjectVisitId == subjectVisitId);
+                        await _oSSService.DeleteObjects(instancePathList.Select(t => t.TrimStart('/')).ToList());
 
-                            var physicalPath = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, path);
-
-                            if (System.IO.File.Exists(physicalPath))
-                            {
-                                File.Delete(physicalPath);
-                            }
-
-                        });
 
                     }
                     else
@@ -1730,17 +1728,8 @@ namespace IRaCIS.Core.Application.Image.QA
                         dbSubjectVisit.ReadingStatus = trialConfig.IsImageConsistencyVerification ? ReadingStatusEnum.ConsistencyCheck : ReadingStatusEnum.TaskAllocate;
 
                         //删除影像
-                        instancePathList.ForEach(path =>
-                        {
-
-                            var physicalPath = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, path);
-
-                            if (System.IO.File.Exists(physicalPath))
-                            {
-                                File.Delete(physicalPath);
-                            }
-
-                        });
+                        await _dicomInstanceRepository.BatchDeleteNoTrackingAsync(t => (t.DicomSerie.IsDeleted || t.IsDeleted) && t.SubjectVisitId == subjectVisitId);
+                        await _oSSService.DeleteObjects(instancePathList.Select(t => t.TrimStart('/')).ToList());
 
                     }
                     else