修改ivus影像下载功能

2024-07-15 15:46:31 +08:00 · 2024-07-15 15:46:31 +08:00 · ef451d82ec
parent 899ebf2a30
commit ef451d82ec
8 changed files with 176 additions and 90 deletions
--- a/IRaCIS.Core.API/Properties/launchSettings.json
+++ b/IRaCIS.Core.API/Properties/launchSettings.json
@ -54,11 +54,11 @@
      },
      "applicationUrl": "http://localhost:6100"
    },
-    "IRaCIS.US_IRC": {
+    "IRaCIS.US_Uat_IRC": {
      "commandName": "Project",
      "launchBrowser": true,
      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "US_IRC"
+        "ASPNETCORE_ENVIRONMENT": "US_Uat_IRC"
      },
      "applicationUrl": "http://localhost:6100"
    }
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
@ -23,7 +23,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 {
    public interface IDownloadAndUploadService
    {
-        Task PackageAndAnonymizImage(Guid trialId, Guid subjectVisitId, bool isAnonymize = true);
+        Task PackageAndAnonymizImage(Guid trialId, Guid subjectVisitId, bool isDicom, bool isAnonymize = true);
    }
    [ApiExplorerSettings(GroupName = "Trial")]
    public class DownloadAndUploadService : BaseService, IDownloadAndUploadService
@ -108,7 +108,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
            await SubejctRandomReadingTaskNameDeal(subjectId, trialReadingCriterionId);

            var query = _repository.Where<VisitTask>(t => t.SubjectId == subjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.SourceSubjectVisitId != null
-            && t.DoctorUserId == _userInfo.Id && t.TaskState==TaskState.Effect)
+            && t.DoctorUserId == _userInfo.Id && t.TaskState == TaskState.Effect)
                .Select(u => new SubjectImageUploadDTO()
                {
                    VisitTaskId = u.Id,
@ -129,7 +129,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                    PackState = u.SourceSubjectVisit.PackState,

                    OrginalStudyList = u.SourceSubjectVisit.StudyList
-                    .Where(t => u.TrialReadingCriterion.IsImageFilter ?("|"+u.TrialReadingCriterion.CriterionModalitys+"|").Contains("|"+t.ModalityForEdit+"|" ) : true)
+                    .Where(t => u.TrialReadingCriterion.IsImageFilter ? ("|" + u.TrialReadingCriterion.CriterionModalitys + "|").Contains("|" + t.ModalityForEdit + "|") : true)
                    .Select(t => new StudyBasicInfo()
                    {
                        Id = t.Id,
@ -484,24 +484,38 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
        /// </summary>
        /// <param name="trialId"></param>
        /// <param name="subjectVisitId"></param>
+        /// <param name="isDicom"></param>
        /// <param name="isAnonymize"></param>
        /// <returns></returns>

-        public async Task<IResponseOutput> RequestPackageAndAnonymizImage(Guid trialId, Guid subjectVisitId, bool isAnonymize = true)
+        public async Task<IResponseOutput> RequestPackageAndAnonymizImage(Guid trialId, Guid subjectVisitId, bool isDicom, bool isAnonymize = true)
        {
            var subjectVisit = await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == subjectVisitId);

-            if (subjectVisit.PackState == PackState.WaitPack)
-            {
-                HangfireJobHelper.NotImmediatelyOnceOnlyJob<IDownloadAndUploadService>(t => t.PackageAndAnonymizImage(trialId, subjectVisitId, isAnonymize), TimeSpan.FromSeconds(1));
+            var packState = isDicom ? subjectVisit.PackState : subjectVisit.NoDicomPackState;

+            if (packState == PackState.WaitPack)
+            {
+
+                if (isDicom)
+                {
                    subjectVisit.PackState = PackState.Packing;
+                    HangfireJobHelper.NotImmediatelyOnceOnlyJob<IDownloadAndUploadService>(t => t.PackageAndAnonymizImage(trialId, subjectVisitId,true, isAnonymize), TimeSpan.FromSeconds(1));
+
+                }
+                else
+                {
+                    subjectVisit.NoDicomPackState = PackState.Packing;
+
+                    HangfireJobHelper.NotImmediatelyOnceOnlyJob<IDownloadAndUploadService>(t => t.PackageAndAnonymizImage(trialId, subjectVisitId, false, isAnonymize), TimeSpan.FromSeconds(1));
+                }
+

                await _subjectVisitRepository.SaveChangesAsync();

            }

-            return ResponseOutput.Ok(subjectVisit.VisitImageZipPath);
+            return ResponseOutput.Ok(isDicom ? subjectVisit.VisitImageZipPath : subjectVisit.VisitNoDicomImageZipPath);

        }

@ -511,9 +525,10 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
        /// </summary>
        /// <param name="trialId"></param>
        /// <param name="subjectVisitId"></param>
+        /// <param name="isDicom"></param>
        /// <param name="isAnonymize"></param>
        /// <returns></returns>
-        public async Task PackageAndAnonymizImage(Guid trialId, Guid subjectVisitId, bool isAnonymize = true)
+        public async Task PackageAndAnonymizImage(Guid trialId, Guid subjectVisitId, bool isDicom, bool isAnonymize = true)
        {

            var subjectVisit = await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == subjectVisitId);
@ -557,6 +572,20 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                                        })
                                    })

+                                }),
+
+                                NoneDicomStudyList = sv.NoneDicomStudyList.Select(nd => new
+                                {
+                                    nd.Modality,
+                                    nd.StudyCode,
+                                    nd.ImageDate,
+
+                                    FileList = nd.NoneDicomFileList.Select(file => new
+                                    {
+                                        file.FileName,
+                                        file.Path,
+                                        file.FileType
+                                    })
                                })
                            };

@ -568,22 +597,26 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                    string tempFolderPath = Path.Combine(Directory.GetCurrentDirectory(), $"DownloadTemp_{NewId.NextGuid()}");
                    Directory.CreateDirectory(tempFolderPath);

+                    //dicom  处理
+
+                    if (isDicom)
+                    {
                        // 遍历查询结果
                        foreach (var studyInfo in info.StudyList)
                        {
                            // 遍历 Series
                            foreach (var seriesInfo in studyInfo.SeriesList)
                            {
-                            string studyFolderPath = Path.Combine(tempFolderPath, $"{info.SubjectCode}_{info.VisitName}", $"{studyInfo.StudyCode}_{studyInfo.StudyTime?.ToString("yyyy-MM-dd")}_{seriesInfo.Modality}");
+                                string studyDicomFolderPath = Path.Combine(tempFolderPath, "Dicom", $"{info.SubjectCode}_{info.VisitName}", $"{studyInfo.StudyCode}_{studyInfo.StudyTime?.ToString("yyyy-MM-dd")}_{seriesInfo.Modality}");

                                // 创建 影像 文件夹
-                            Directory.CreateDirectory(studyFolderPath);
+                                Directory.CreateDirectory(studyDicomFolderPath);

                                // 遍历 InstancePathList
                                foreach (var instanceInfo in seriesInfo.InstancePathList)
                                {
                                    // 复制文件到相应的文件夹
-                                string destinationPath = Path.Combine(studyFolderPath, Path.GetFileName(instanceInfo.Path));
+                                    string destinationPath = Path.Combine(studyDicomFolderPath, Path.GetFileName(instanceInfo.Path));

                                    //下载到当前目录
                                    await _oSSService.DownLoadFromOSSAsync(instanceInfo.Path, destinationPath);
@ -652,23 +685,50 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                            }
                        }

-                    var zipPath = Path.Combine(Directory.GetCurrentDirectory(), $"{info.SubjectCode}_{info.VisitName}_ImageStudy.zip");
-
-                    ZipFile.CreateFromDirectory(tempFolderPath, zipPath);

+                        var zipDicomPath = Path.Combine(Directory.GetCurrentDirectory(), $"{info.SubjectCode}_{info.VisitName}_ImageStudy_Dicom.zip");
+                        ZipFile.CreateFromDirectory(Path.Combine(tempFolderPath, "Dicom"), zipDicomPath);
                        //上传到Oss
-                    var relativePath = await _oSSService.UploadToOSSAsync(zipPath, $"download_zip", false);
+                        var relativeDicomPath = await _oSSService.UploadToOSSAsync(zipDicomPath, $"download_zip", false);
+
+                        await _subjectVisitRepository.BatchUpdateNoTrackingAsync(t => t.Id == subjectVisitId, u => new SubjectVisit() { PackState = PackState.Packed, VisitImageZipPath = relativeDicomPath });


-                    //subjectVisit.PackState = PackState.Packed;
-                    //subjectVisit.VisitImageZipPath = relativePath;
-                    //await _subjectVisitRepository.SaveChangesAsync();
-                    await _subjectVisitRepository.BatchUpdateNoTrackingAsync(t => t.Id == subjectVisitId, u => new SubjectVisit() { PackState = PackState.Packed, VisitImageZipPath = relativePath });
+                        File.Delete(zipDicomPath);
+                    }
+                    else
+                    {
+                        //非dicom 处理

+                        foreach (var noneDicomStudy in info.NoneDicomStudyList)
+                        {
+                            string studyNoneDicomFolderPath = Path.Combine(tempFolderPath, "NoneDicom", $"{info.SubjectCode}_{info.VisitName}", $"{noneDicomStudy.StudyCode}_{noneDicomStudy.ImageDate.ToString("yyyy-MM-dd")}_{noneDicomStudy.Modality}");
+
+                            Directory.CreateDirectory(studyNoneDicomFolderPath);
+
+                            foreach (var file in noneDicomStudy.FileList)
+                            {
+                                string destinationPath = Path.Combine(studyNoneDicomFolderPath, Path.GetFileName(file.FileName));
+
+                                //下载到当前目录
+                                await _oSSService.DownLoadFromOSSAsync(file.Path, destinationPath);
+                            }
+                        }
+
+
+                        var zipNoneDicomPath = Path.Combine(Directory.GetCurrentDirectory(), $"{info.SubjectCode}_{info.VisitName}_ImageStudy_NoneDicom.zip");
+                        ZipFile.CreateFromDirectory(Path.Combine(tempFolderPath, "NoneDicom"), zipNoneDicomPath);
+                        var relativeNoneDicomPath = await _oSSService.UploadToOSSAsync(zipNoneDicomPath, $"download_zip", false);
+
+                        File.Delete(zipNoneDicomPath);
+
+                        await _subjectVisitRepository.BatchUpdateNoTrackingAsync(t => t.Id == subjectVisitId, u => new SubjectVisit() { PackState = PackState.Packed,  VisitNoDicomImageZipPath = relativeNoneDicomPath });
+
+
+                    }

                    //清理文件夹
                    Directory.Delete(tempFolderPath, true);
-                    File.Delete(zipPath);

                }
            }
--- a/IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs
+++ b/IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs
@ -72,7 +72,7 @@ namespace IRaCIS.Core.Application.Contracts
        public List<TrialSiteUserSurveyView> TrialSiteUserSurveyList { get; set; } = new List<TrialSiteUserSurveyView>();


-        public SiteSurveyFiledConfig SiteSurveyFiledConfig { get; set; }
+        public TrialExtraConfig SiteSurveyFiledConfig { get; set; }
    }

    public class TrialSiteUserSurveyAllDTO : TrialSiteUserSurveyView
--- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
+++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
@ -391,9 +391,9 @@ namespace IRaCIS.Core.Application.Contracts
            var result = await _trialSiteSurveyRepository.Where(t => t.Id == trialSiteSurveyId && t.TrialId == trialId).IgnoreQueryFilters()
                .ProjectTo<LoginReturnDTO>(_mapper.ConfigurationProvider, new {  isEn_Us = _userInfo.IsEn_Us }).FirstOrDefaultAsync().IfNullThrowException();

-            var siteSurveryConfig = _trialSiteSurveyRepository.Where(t => t.Id == trialSiteSurveyId).Select(t => t.Trial.SiteSurveyConfigJsonStr).FirstOrDefault()??string.Empty;
+            var siteSurveryConfig = _trialSiteSurveyRepository.Where(t => t.Id == trialSiteSurveyId).Select(t => t.Trial.TrialExtraConfigJsonStr).FirstOrDefault()??string.Empty;

-            result.SiteSurveyFiledConfig = JsonConvert.DeserializeObject<SiteSurveyFiledConfig>(siteSurveryConfig) ?? new SiteSurveyFiledConfig();
+            result.SiteSurveyFiledConfig = JsonConvert.DeserializeObject<TrialExtraConfig>(siteSurveryConfig) ?? new TrialExtraConfig();
            return result;
        }

--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
@ -21,6 +21,7 @@ using DocumentFormat.OpenXml.Office.CustomUI;
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Application.Contracts;
 using SixLabors.ImageSharp.Formats.Tiff.Compression.Decompressors;
+using Newtonsoft.Json;

 namespace IRaCIS.Core.Application
 {
@ -604,7 +605,7 @@ namespace IRaCIS.Core.Application

            await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.TrialReadingCriterionId, x => new ReadingQuestionCriterionTrial()
            {
-                IsImageFilter=inDto.IsImageFilter,
+                IsImageFilter = inDto.IsImageFilter,
                ImageDownloadEnum = inDto.ImageDownloadEnum,
                ImageUploadEnum = inDto.ImageUploadEnum,
                CriterionModalitys = inDto.CriterionModalitys,
@ -1354,5 +1355,12 @@ namespace IRaCIS.Core.Application
            return ResponseOutput.Ok(cro.Id.ToString(), ApiResponseCodeEnum.NeedTips);

        }
+
+        public async Task<TrialExtraConfig> GetTrialExtralConfig(Guid trialId)
+        {
+            var extralConfig = _trialRepository.Where(t => t.Id == trialId).Select(t => t.TrialExtraConfigJsonStr).FirstOrDefault() ?? string.Empty;
+
+            return JsonConvert.DeserializeObject<TrialExtraConfig>(extralConfig) ?? new TrialExtraConfig();
+        }
    }
 }
--- a/IRaCIS.Core.Domain.Share/Trial/TrialExpedited.cs
+++ b/IRaCIS.Core.Domain.Share/Trial/TrialExpedited.cs
@ -41,11 +41,26 @@ namespace IRaCIS.Core.Domain.Share

    }

-    public class SiteSurveyFiledConfig
+    public class TrialExtraConfig
    {
-        public List<string> NotShowFieldList { get; set; }=new List<string>();
+        #region MyRegion
+
+        //QC质控
+        public bool IsSupportQCDownloadImage { get; set; } = false;
+
+        #endregion
+
+
+
+        #region 中心调研
+
+        public List<string> NotShowFieldList { get; set; } = new List<string>();
+
+        public List<SiteSurveyModifyFiled> ModifyFiledList { get; set; } = new List<SiteSurveyModifyFiled>();
+
+        #endregion
+

-        public List<SiteSurveyModifyFiled> ModifyFiledList { get; set; }=new List<SiteSurveyModifyFiled>();

    }

--- a/IRaCIS.Core.Domain/Trial/Trial.cs
+++ b/IRaCIS.Core.Domain/Trial/Trial.cs
@ -182,9 +182,8 @@ namespace IRaCIS.Core.Domain.Models



-        //public List<SiteSurveyFiledConfig>

-        public string SiteSurveyConfigJsonStr { get; set; } = string.Empty;
+        public string TrialExtraConfigJsonStr { get; set; } = string.Empty;

        public bool VisitPlanConfirmed { get; set; }

--- a/IRaCIS.Core.Domain/Visit/SubjectVisit.cs
+++ b/IRaCIS.Core.Domain/Visit/SubjectVisit.cs
@ -248,6 +248,10 @@ namespace IRaCIS.Core.Domain.Models
        public string VisitImageZipPath { get; set; } = string.Empty;

        public PackState PackState { get; set; }
+
+        public PackState NoDicomPackState { get; set; }
+
+        public string VisitNoDicomImageZipPath { get; set;} = string.Empty;
    }
    /// <summary>
    /// 影像下载打包状态