后处理DIR处理

IRaCIS.Core.Application/Helper/DicomDIRHelper.cs

@@ -13,6 +13,7 @@ namespace IRaCIS.Core.Application.Helper
 
     public class StudyDIRInfo
     {
+        public Guid SubjectVisitId { get; set; }
         // Study
         public Guid DicomStudyId { get; set; }
 

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

@@ -782,7 +782,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
             var imageType = (isQueryDicom && isQueryNoneDicom) ? ImageType.DicomAndNoneDicom : (isQueryDicom ? ImageType.Dicom : ImageType.NoneDicom);
 
-            #region 处理导出文件名，并将对应关系上传到OSS里面存储
+            #region DIR处理导出文件名，并将对应关系上传到OSS里面存储
 
 
             var list = _subjectVisitRepository.Where(t => t.Id == inQuery.SubjectVisitId).SelectMany(t => t.StudyList)
@@ -1068,6 +1068,62 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
             var trialSiteCode = _visitTaskRepository.Where(t => t.Id == taskIdList.FirstOrDefault()).Select(t => t.IsAnalysisCreate ? t.BlindTrialSiteCode : t.Subject.TrialSite.TrialSiteCode).FirstOrDefault() ?? string.Empty;
 
+            #region 在下载前先处理DIR文件
+
+            var list = _subjectRepository.Where(t => t.Id == inQuery.SubjectId).SelectMany(t => t.SubjectVisitList.Where(t => subjectVisitIdList.Contains(t.Id))).SelectMany(t => t.StudyList)
+               .Where(t => isQueryDicom ? inQuery.DicomStudyIdList.Contains(t.Id) : false)
+               .Where(t => info.IsImageFilter ? ("|" + info.CriterionModalitys + "|").Contains("|" + t.ModalityForEdit + "|") : true)
+               .SelectMany(t => t.InstanceList.Where(t => t.IsReading && t.DicomSerie.IsReading))
+               .Select(t => new StudyDIRInfo()
+               {
+                   SubjectVisitId = t.SubjectVisitId,
+
+                   DicomStudyId = t.DicomStudy.Id,
+
+                   PatientId = t.DicomStudy.PatientId,
+                   PatientName = t.DicomStudy.PatientName,
+                   PatientBirthDate = t.DicomStudy.PatientBirthDate,
+                   PatientSex = t.DicomStudy.PatientSex,
+
+                   StudyInstanceUid = t.StudyInstanceUid,
+                   StudyId = t.DicomStudy.StudyId,
+                   DicomStudyDate = t.DicomStudy.DicomStudyDate,
+                   DicomStudyTime = t.DicomStudy.DicomStudyTime,
+                   AccessionNumber = t.DicomStudy.AccessionNumber,
+
+                   StudyDescription = t.DicomStudy.Description,
+
+                   SeriesInstanceUid = t.DicomSerie.SeriesInstanceUid,
+                   Modality = t.DicomSerie.Modality,
+                   DicomSeriesDate = t.DicomSerie.DicomSeriesDate,
+                   DicomSeriesTime = t.DicomSerie.DicomSeriesTime,
+                   SeriesNumber = t.DicomSerie.SeriesNumber,
+                   SeriesDescription = t.DicomSerie.Description,
+
+                   InstanceId = t.Id,
+                   SopInstanceUid = t.SopInstanceUid,
+                   SOPClassUID = t.SOPClassUID,
+                   InstanceNumber = t.InstanceNumber,
+                   MediaStorageSOPClassUID = t.MediaStorageSOPClassUID,
+                   MediaStorageSOPInstanceUID = t.MediaStorageSOPInstanceUID,
+                   TransferSytaxUID = t.TransferSytaxUID,
+
+               }).ToList();
+
+            var pathInfo = await _subjectRepository.Where(t => t.Id == inQuery.SubjectId).Select(t => new { t.TrialId, SubjectId = t.Id }).FirstNotNullAsync();
+
+            foreach (var item in list.GroupBy(t => new { t.StudyInstanceUid, t.DicomStudyId }))
+            {
+                var visitId = item.First().SubjectVisitId;
+
+                var ossFolder = $"{pathInfo.TrialId}/Image/{pathInfo.SubjectId}/{visitId}/{item.Key.StudyInstanceUid}";
+
+                await DicomDIRHelper.GenerateStudyDIRAndUploadAsync(item.ToList(), ossFolder, _oSSService);
+
+                await _dicomStudyRepository.BatchUpdateNoTrackingAsync(t => t.Id == item.Key.DicomStudyId, u => new DicomStudy() { StudyDIRPath = $"/{ossFolder}/DICOMDIR" });
+            }
+            #endregion
+
             var query = from sv in _subjectRepository.Where(t => t.Id == inQuery.SubjectId).SelectMany(t => t.SubjectVisitList.Where(t => subjectVisitIdList.Contains(t.Id)))
                             //一致性分析，导致查询出来两条数据
                         join visitTask in _visitTaskRepository.Where(t => taskIdList.Contains(t.Id))
@@ -1085,6 +1141,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                                 u.PatientId,
                                 u.StudyTime,
                                 u.StudyCode,
+                                u.StudyDIRPath,
 
                                 SeriesList = u.SeriesList.Where(t => t.IsReading).Select(z => new
                                 {