修改归档路径

IRaCIS.Core.Application/Helper/FileStoreHelper.cs

@@ -417,7 +417,7 @@ public static class FileStoreHelper
         return Path.Combine(rootPath, StaticData.Folder.TrialDataFolder, trialId.ToString(), siteId.ToString(), subjectId.ToString(), subjectVisitId.ToString(), StaticData.Folder.DicomFolder);
     }
 
-    public static string GetDicomInstanceFilePath(IWebHostEnvironment _hostEnvironment, Guid trialId, Guid siteId, Guid subjectId, Guid subjectVisitId, Guid studyId, Guid instanceId)
+    public static (string PhysicalPath, string RelativePath) GetDicomInstanceFilePath(IWebHostEnvironment _hostEnvironment, Guid trialId, Guid siteId, Guid subjectId, Guid subjectVisitId, Guid studyId, Guid instanceId)
     {
         var rootPath = FileStoreHelper.GetIRaCISRootDataFolder(_hostEnvironment);
 
@@ -429,10 +429,17 @@ public static class FileStoreHelper
         {
             Directory.CreateDirectory(path);
         }
-        return Path.Combine(path, instanceId.ToString() + ".dcm");
+
+        var physicalPath = Path.Combine(path, instanceId.ToString() + ".dcm");
+
+        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{siteId}/{subjectId}/{subjectVisitId}/{StaticData.Folder.DicomFolder}/{studyId}/{instanceId}.dcm";
+
+        return (physicalPath, relativePath);
     }
 
 
+   
+
     // 获取医生通用文件存放路径
 
     public static (string PhysicalPath, string RelativePath) GetDoctorOrdinaryFilePath(IWebHostEnvironment _hostEnvironment, string fileName,Guid doctorId,string attachmentType)

IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs

@@ -31,6 +31,8 @@
         public DateTime UpdateTime { get; set; }
 
         public List<Guid> InstanceList { get; set; } = new List<Guid>();
+
+        public List<string> InstancePathList { get; set; } = new List<string>();
     }
 
     public class DicomSeriesWithLabelDTO : DicomSeriesDTO

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

@@ -143,30 +143,30 @@ namespace IRaCIS.Core.Application.Services
             }
 
 
+            var (physicalPath, relativePath) = FileStoreHelper.GetDicomInstanceFilePath(_hostEnvironment, dicomStudy.TrialId, dicomStudy.SiteId, dicomStudy.SubjectId, dicomStudy.SubjectVisitId, dicomStudy.Id, dicomInstance.Id);
+
+            dicomInstance.Path = relativePath;
 
             await _instanceRepository.AddAsync(dicomInstance);
 
 
-
-            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);
             if (samplesPerPixel == "1" && (photometricInterpretation.ToUpper() == "MONOCHROME2" || photometricInterpretation.ToUpper() == "MONOCHROME1"))//MONOCHROME2
             {
                 if (dataset.InternalTransferSyntax.IsEncapsulated)
                 {
-                    await dicomFile.SaveAsync(filePath);
+                    await dicomFile.SaveAsync(physicalPath);
                 }
                 else
                 {
-                    await dicomFile.Clone(DicomTransferSyntax.JPEGLSLossless).SaveAsync(filePath);
+                    await dicomFile.Clone(DicomTransferSyntax.JPEGLSLossless).SaveAsync(physicalPath);
                 }
             }
             else
             {
-                if (dataset.InternalTransferSyntax.IsEncapsulated) await dicomFile.SaveAsync(filePath);
+                if (dataset.InternalTransferSyntax.IsEncapsulated) await dicomFile.SaveAsync(physicalPath);
-                else await dicomFile.Clone(DicomTransferSyntax.RLELossless).SaveAsync(filePath); //RLELossless
+                else await dicomFile.Clone(DicomTransferSyntax.RLELossless).SaveAsync(physicalPath); //RLELossless
             }
             return (dicomInstance.StudyId, dicomStudy.StudyCode);
         }

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

@@ -56,11 +56,11 @@ namespace IRaCIS.Core.Application.Services
 
             DicomStudy dicomStudy = await _studyRepository.FirstOrDefaultAsync(s => s.Id == dicomInstance.StudyId).IfNullThrowException();
 
-            path = FileStoreHelper.GetDicomInstanceFilePath(_hostEnvironment, dicomStudy.TrialId, dicomStudy.SiteId, dicomStudy.SubjectId, dicomStudy.SubjectVisitId, dicomStudy.Id, dicomInstance.Id);
+            var(physicalPath, relativePath)   = FileStoreHelper.GetDicomInstanceFilePath(_hostEnvironment, dicomStudy.TrialId, dicomStudy.SiteId, dicomStudy.SubjectId, dicomStudy.SubjectVisitId, dicomStudy.Id, dicomInstance.Id);
 
 
 
-            using (var sw = ImageHelper.RenderPreviewJpeg(path))
+            using (var sw = ImageHelper.RenderPreviewJpeg(physicalPath))
             {
                 var bytes = new byte[sw.Length];
                 sw.Read(bytes, 0, bytes.Length);
@@ -85,11 +85,11 @@ namespace IRaCIS.Core.Application.Services
             //}
 
             //else
-            filePath = FileStoreHelper.GetDicomInstanceFilePath(_hostEnvironment, dicomStudy.TrialId, dicomStudy.SiteId, dicomStudy.SubjectId, dicomStudy.SubjectVisitId, dicomStudy.Id, dicomInstance.Id); 
+            var (physicalPath, relativePath) = FileStoreHelper.GetDicomInstanceFilePath(_hostEnvironment, dicomStudy.TrialId, dicomStudy.SiteId, dicomStudy.SubjectId, dicomStudy.SubjectVisitId, dicomStudy.Id, dicomInstance.Id); 
 
 
 
-            using (var sw = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read))
+            using (var sw = new FileStream(physicalPath, FileMode.Open, FileAccess.Read, FileShare.Read))
             {
                 var bytes = new byte[sw.Length];
                 sw.Read(bytes, 0, bytes.Length);

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

@@ -64,7 +64,9 @@ namespace IRaCIS.Core.Application.Services
                 });
             }
 
-            var idList = await _instanceRepository.Where(s => s.StudyId == studyId).ToListAsync();//.GroupBy(u => u.SeriesId);
+            var idList = await _instanceRepository.Where(s => s.StudyId == studyId).OrderBy(t=>t.SeriesId).ThenBy(t => t.InstanceNumber)
+                        .ThenBy(s => s.InstanceTime).ThenBy(s => s.CreateTime)
+                .Select(t=>new {t.SeriesId, t.Id,t.Path}).ToListAsync();//.GroupBy(u => u.SeriesId);
 
             foreach (var item in seriesList)
             {
@@ -74,8 +76,12 @@ namespace IRaCIS.Core.Application.Services
                 }
                 else
                 {
-                    item.InstanceList = idList.Where(s => s.SeriesId == item.Id).OrderBy(t => t.InstanceNumber)
+                    //item.InstanceList = idList.Where(s => s.SeriesId == item.Id).OrderBy(t => t.InstanceNumber)
-                        .ThenBy(s => s.InstanceTime).ThenBy(s => s.CreateTime).Select(u => u.Id).ToList();
+                    //    .ThenBy(s => s.InstanceTime).ThenBy(s => s.CreateTime).Select(u => u.Id).ToList();
+
+                    item.InstanceList = idList.Where(s => s.SeriesId == item.Id).Select(u => u.Id).ToList();
+
+                    item.InstancePathList = idList.Where(s => s.SeriesId == item.Id).Select(u => u.Path).ToList();
                 }
             }
 
@@ -97,9 +103,9 @@ namespace IRaCIS.Core.Application.Services
 
             DicomStudy dicomStudy = await _studyRepository.FirstOrDefaultAsync(s => s.Id == dicomInstance.StudyId).IfNullThrowException();
 
-            path = FileStoreHelper.GetDicomInstanceFilePath(_hostEnvironment, dicomStudy.TrialId, dicomStudy.SiteId, dicomStudy.SubjectId, dicomStudy.SubjectVisitId, dicomStudy.Id, dicomInstance.Id);
+            var (physicalPath, relativePath)  = FileStoreHelper.GetDicomInstanceFilePath(_hostEnvironment, dicomStudy.TrialId, dicomStudy.SiteId, dicomStudy.SubjectId, dicomStudy.SubjectVisitId, dicomStudy.Id, dicomInstance.Id);
 
-            using (var sw = ImageHelper.RenderPreviewJpeg(path))
+            using (var sw = ImageHelper.RenderPreviewJpeg(physicalPath))
             {
                 var bytes = new byte[sw.Length];
                 sw.Read(bytes, 0, bytes.Length);

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

@@ -324,7 +324,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 DicomStudy dicomStudy = await _repository.FirstOrDefaultAsync<DicomStudy>(s => s.Id == dicomInstance.StudyId);
                 if (dicomStudy != null)
                 {
-                    path = FileStoreHelper.GetDicomInstanceFilePath(_hostEnvironment, dicomStudy.TrialId, dicomStudy.SiteId, dicomStudy.SubjectId, dicomStudy.SubjectVisitId, dicomStudy.Id, dicomInstance.Id);
+                  var(  physicalPath ,relativePath )= FileStoreHelper.GetDicomInstanceFilePath(_hostEnvironment, dicomStudy.TrialId, dicomStudy.SiteId, dicomStudy.SubjectId, dicomStudy.SubjectVisitId, dicomStudy.Id, dicomInstance.Id);
+
+                    path = physicalPath;
                 }
             }
 

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

@@ -780,12 +780,12 @@ namespace IRaCIS.Core.Application.Image.QA
                 instanceIdList.ForEach(t =>
                 {
                     var dicomStudy = new DicomStudy() { Id = t.StudyId, SubjectId = t.SubjectId, TrialId = trialId, SiteId = t.SiteId, SubjectVisitId = subjectVisitId };
-                    var path =
+                    var (physicalPath, relativePath) =
                     FileStoreHelper.GetDicomInstanceFilePath(_hostEnvironment, dicomStudy.TrialId, dicomStudy.SiteId, dicomStudy.SubjectId, dicomStudy.SubjectVisitId, dicomStudy.Id, t.InstanceId);
 
-                    if (System.IO.File.Exists(path))
+                    if (System.IO.File.Exists(physicalPath))
                     {
-                        File.Delete(path);
+                        File.Delete(physicalPath);
                     }
 
                 });
@@ -1365,13 +1365,13 @@ namespace IRaCIS.Core.Application.Image.QA
                         instanceIdList.ForEach(t =>
                         {
                             var dicomStudy = new DicomStudy() { Id = t.StudyId, SubjectId = t.SubjectId, TrialId = trialId, SiteId = t.SiteId, SubjectVisitId = subjectVisitId };
-                            var path =
+                            var (physicalPath, relativePath) =
 
                              FileStoreHelper.GetDicomInstanceFilePath(_hostEnvironment, dicomStudy.TrialId, dicomStudy.SiteId, dicomStudy.SubjectId, dicomStudy.SubjectVisitId, dicomStudy.Id, t.InstanceId);
 
-                            if (System.IO.File.Exists(path))
+                            if (System.IO.File.Exists(physicalPath))
                             {
-                                File.Delete(path);
+                                File.Delete(physicalPath);
                             }
 
                         });
@@ -1428,13 +1428,13 @@ namespace IRaCIS.Core.Application.Image.QA
                         instanceIdList.ForEach(t =>
                         {
                             var dicomStudy = new DicomStudy() { Id = t.StudyId, SubjectId = t.SubjectId, TrialId = trialId, SiteId = t.SiteId, SubjectVisitId = subjectVisitId };
-                            var path =
+                             var(physicalPath, relativePath) =
 
                              FileStoreHelper.GetDicomInstanceFilePath(_hostEnvironment, dicomStudy.TrialId, dicomStudy.SiteId, dicomStudy.SubjectId, dicomStudy.SubjectVisitId, dicomStudy.Id, t.InstanceId);
 
-                            if (System.IO.File.Exists(path))
+                            if (System.IO.File.Exists(physicalPath))
                             {
-                                File.Delete(path);
+                                File.Delete(physicalPath);
                             }
 
                         });

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

@@ -148,6 +148,15 @@ namespace IRaCIS.Core.Application.Service
                 .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.Subject.Code))
                 .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName));
 
+            CreateMap<VisitTask, RECIST1Point1EvaluationOfTumorEfficacyExport>()
+                 .ForMember(o => o.OverallTumorEvaluationResult, t => t.MapFrom(u => u.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == QuestionType.Tumor).FirstOrDefault().Answer ))
+                 .ForMember(o => o.TargetlesionEvaluationResult, t => t.MapFrom(u => u.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == QuestionType.TargetLesion).FirstOrDefault().Answer))
+                 .ForMember(o => o.NoneTargetlesionEvaluationResult, t => t.MapFrom(u => u.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == QuestionType.NoTargetLesion).FirstOrDefault().Answer))
+                 .ForMember(o => o.IsExistNewlesionEvaluationResult, t => t.MapFrom(u => u.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == QuestionType.NewLesions).FirstOrDefault().Answer))
+
+                .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.Subject.TrialSite.TrialSiteCode))
+                .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.Subject.Code))
+                .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName));
 
 
 

IRaCIS.Core.Application/TestService.cs

@@ -1,5 +1,6 @@
 using BeetleX.BNR;
 using IRaCIS.Core.Application.Service;
+using IRaCIS.Core.Domain.Share;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Caching.Distributed;
 using System.Text.RegularExpressions;
@@ -105,9 +106,16 @@ namespace IRaCIS.Application.Services
             return findStr;
         }
         [HttpPost]
-        public async Task<IActionResult> Get(TestModel testModel)
+        public async Task Get(TestModel testModel)
         {
 
+
+            //update DicomInstance set Path = '/IRaCISData/TrialData/' + cast(DicomInstance.TrialId as varchar) + '/' + DicomInstance.SiteId + '/' + DicomInstance.SubjectId + '/' + DicomInstance.SubjectVisitId + '/Dicom/' + DicomInstance.StudyId + '/' + DicomInstance.Id + '.dcm'
+
+
+            await _repository.BatchUpdateAsync<DicomInstance>(u=>u.Id!=Guid.Empty,t => new DicomInstance() { Path = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{t.TrialId}/{t.SiteId}/{t.SubjectId}/{t.SubjectVisitId}/{StaticData.Folder.DicomFolder}/{t.StudyId}/{t.Id}.dcm" });
+
+
             // Load a document.
             //using (var document = DocX.Load(Path.Combine(_hostEnvironment.ContentRootPath, "ReplaceText.docx")))
             //{
@@ -126,7 +134,7 @@ namespace IRaCIS.Application.Services
             //    }
 
             //}
-            return await NpoiWordHelper.TemplateExportWordAsync(Path.Combine(_hostEnvironment.ContentRootPath, "ReplaceText.docx"), new { test = "xiugai", ZZZZ = "ModiffyZZZZ" }, null, _hostEnvironment);
+            //return await NpoiWordHelper.TemplateExportWordAsync(Path.Combine(_hostEnvironment.ContentRootPath, "ReplaceText.docx"), new { test = "xiugai", ZZZZ = "ModiffyZZZZ" }, null, _hostEnvironment);
 
             //_cache.SetString("test" , "cacheStr");
 

IRaCIS.Core.Domain/Image/DicomInstance.cs

@@ -46,5 +46,8 @@ namespace IRaCIS.Core.Domain.Models
         public DateTime CreateTime { get; set; } = DateTime.Now;
         public Guid UpdateUserId { get; set; }
         public DateTime UpdateTime { get; set; } = DateTime.Now;
+
+
+        public string Path { get; set; }
     }
 }