质控下载dir 文件处理

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

@@ -1,5 +1,6 @@
 using DocumentFormat.OpenXml.EMMA;
 using FellowOakDicom;
+using FellowOakDicom.Media;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Contracts.Dicom.DTO;
 using IRaCIS.Core.Application.Filter;
@@ -14,9 +15,11 @@ using MassTransit;
 using MassTransit.Initializers;
 using Medallion.Threading;
 using Microsoft.AspNetCore.Mvc;
+using NetTopologySuite.Mathematics;
 using Newtonsoft.Json;
 using NPOI.SS.Formula.Functions;
 using System.Data;
+using System.IO;
 using System.IO.Compression;
 using System.Text;
 using System.Web;
@@ -32,7 +35,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
     }
 
     [ApiExplorerSettings(GroupName = "Trial")]
-    public class DownloadAndUploadService(IRepository<SystemAnonymization> _systemAnonymizationRepository,
+    public class DownloadAndUploadService(IRepository<SystemAnonymization> _systemAnonymizationRepository, IRepository<DicomStudy> _dicomStudyRepository,
         IRepository<VisitTask> _visitTaskRepository,
         IRepository<SubjectVisit> _subjectVisitRepository,
         IOSSService _oSSService,
@@ -779,6 +782,62 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
             var imageType = (isQueryDicom && isQueryNoneDicom) ? ImageType.DicomAndNoneDicom : (isQueryDicom ? ImageType.Dicom : ImageType.NoneDicom);
 
+            #region 处理导出文件名，并将对应关系上传到OSS里面存储
+
+
+            var list = _subjectVisitRepository.Where(t => t.Id == inQuery.SubjectVisitId).SelectMany(t => t.StudyList)
+                .Where(t => isQueryDicom ? inQuery.DicomStudyIdList.Contains(t.Id) : false)
+                .SelectMany(t => t.InstanceList)
+                .Select(t => new StudyDIRInfo()
+                {
+
+                    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 _subjectVisitRepository.Where(t => t.Id == inQuery.SubjectVisitId).Select(t => new { t.TrialId, t.SubjectId, VisitId = t.Id }).FirstNotNullAsync();
+
+            foreach (var item in list.GroupBy(t => new { t.StudyInstanceUid, t.DicomStudyId }))
+            {
+                var ossFolder = $"{pathInfo.TrialId}/Image/{pathInfo.SubjectId}/{pathInfo.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 _subjectVisitRepository.Where(t => t.Id == inQuery.SubjectVisitId)
 
 
@@ -789,6 +848,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                             SubjectCode = sv.Subject.Code,
                             TrialSiteCode = sv.TrialSite.TrialSiteCode,
                             VisitName = sv.VisitName,
+                            VisitId = sv.Id,
 
                             StudyList = sv.StudyList.Where(t => isQueryDicom ? inQuery.DicomStudyIdList.Contains(t.Id) : false)
 
@@ -797,6 +857,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                                 u.PatientId,
                                 u.StudyTime,
                                 u.StudyCode,
+                                u.StudyInstanceUid,
+                                u.StudyDIRPath,
 
                                 SeriesList = u.SeriesList.Select(z => new
                                 {
@@ -831,6 +893,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
             var result = query.FirstOrDefault();
 
+
+
             var preDownloadInfo = new TrialImageDownload()
             {
                 Id = NewId.NextSequentialGuid(),
@@ -1268,9 +1332,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
             var totalImageSize = subjectImageList.Sum(t => t.ImageSize);
 
-            var totalReadingImageSize= subjectImageList.Sum(t => t.ReadingImageSize);
+            var totalReadingImageSize = subjectImageList.Sum(t => t.ReadingImageSize);
 
-            return ResponseOutput.Ok(new TrialImageStatInfo { SubjectCount = subjectCount, SubjectVisitCount = subjectVisitCount, TotalImageSize = totalImageSize, TotalReadingImageSize= totalReadingImageSize });
+            return ResponseOutput.Ok(new TrialImageStatInfo { SubjectCount = subjectCount, SubjectVisitCount = subjectVisitCount, TotalImageSize = totalImageSize, TotalReadingImageSize = totalReadingImageSize });
 
 
         }