整理影像缩略图 和获取影像路径

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

@@ -6,7 +6,8 @@ using IRaCIS.Core.Domain.Share;
 using Microsoft.Extensions.Hosting;
 using System.Text;
 using IRaCIS.Core.Application.Contracts;
-
+using IRaCIS.Core.Application.Helper;
+using Microsoft.AspNetCore.Hosting;
 
 namespace IRaCIS.Core.Application.Services
 {
@@ -19,19 +20,20 @@ namespace IRaCIS.Core.Application.Services
         private readonly IEasyCachingProvider _provider;
         private readonly DicomFileStoreHelper _dicomFileStoreHelper;
 
+        private readonly IWebHostEnvironment _hostEnvironment;
 
         private static object lockCodeGenerate = new object();
 
         public DicomArchiveService(IRepository<DicomStudy> studyRepository,
             IRepository<DicomSeries> seriesRepository,
             IRepository<DicomInstance> instanceRepository,
-            IHostEnvironment hostEnvironment,
+            IWebHostEnvironment hostEnvironment,
             IRepository<DataInspection> inspectionService,
             DicomFileStoreHelper dicomFileStoreHelper,
             IEasyCachingProvider provider)
         {
             _dicomFileStoreHelper = dicomFileStoreHelper;
-
+            _hostEnvironment = hostEnvironment;
             _studyRepository = studyRepository;
 
             _seriesRepository = seriesRepository;
@@ -144,7 +146,7 @@ namespace IRaCIS.Core.Application.Services
 
 
 
-            string filePath = _dicomFileStoreHelper.CreateInstanceFilePath(dicomStudy, dicomSeries.Id, dicomInstance.Id);
+            string filePath = FileStoreHelper.GetDicomInstanceFilePath(_hostEnvironment, dicomStudy.TrialId, dicomStudy.SiteId, dicomStudy.SubjectId, dicomStudy.SubjectVisitId, dicomStudy.Id, dicomInstance.Id);
 
             var samplesPerPixel = dataset.GetSingleValueOrDefault(DicomTag.SamplesPerPixel, string.Empty);
             var photometricInterpretation = dataset.GetSingleValueOrDefault(DicomTag.PhotometricInterpretation, string.Empty);