IRaCIS.Core.Application/Helper/DicomDIRHelper.cs

@@ -49,8 +49,9 @@ namespace IRaCIS.Core.Application.Helper
     public static class DicomDIRHelper
     {
 
-        public static async Task GenerateStudyDIRAndUploadAsync(List<StudyDIRInfo> list, Dictionary<string, string> dic, string ossFolder, IOSSService _oSSService)
+        public static async Task<Dictionary<string, string>> GenerateStudyDIRAndUploadAsync(List<StudyDIRInfo> list, string ossFolder, IOSSService _oSSService)
         {
+            var dic = new Dictionary<string, string>();
             var mappings = new List<string>();
             int index = 1;
 
@@ -144,6 +145,9 @@ namespace IRaCIS.Core.Application.Helper
                 #endregion
             }
 
+
+
+            return dic;
         }
 
 

IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs

@@ -36,14 +36,6 @@ namespace IRaCIS.Core.Application.Service
             return await commonDocumentQueryable.ToPagedListAsync(queryCommonDocument);
         }
 
-        [HttpGet]
-        public async Task<CommonDocument> GetCommonDocument(string code)
-        {
-            var find = await _commonDocumentRepository.Where(t => t.Code == code).FirstOrDefaultAsync();
-
-            return find;
-        }
-        
 
         public async Task<IResponseOutput> AddOrUpdateCommonDocument(CommonDocumentAddOrEdit addOrEditCommonDocument)
         {

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

@@ -832,8 +832,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 {
                     var ossFolder = $"{pathInfo.TrialId}/Image/{pathInfo.SubjectId}/{pathInfo.VisitId}/{item.Key.StudyInstanceUid}";
 
-                    var isSucess = await SafeBussinessHelper.RunAsync(async () => await DicomDIRHelper.GenerateStudyDIRAndUploadAsync(item.ToList(), dirDic, ossFolder, _oSSService));
+                    var (isSucess, dic) = await SafeBussinessHelper.RunAsync(async () => await DicomDIRHelper.GenerateStudyDIRAndUploadAsync(item.ToList(), ossFolder, _oSSService));
 
+                    dirDic = dic;
 
                     if (isSucess)
                     {
@@ -1140,8 +1141,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                     var ossFolder = $"{pathInfo.TrialId}/Image/{pathInfo.SubjectId}/{visitId}/{item.Key.StudyInstanceUid}";
 
-                    var isSucess = await SafeBussinessHelper.RunAsync(async () => await DicomDIRHelper.GenerateStudyDIRAndUploadAsync(item.ToList(), dirDic, ossFolder, _oSSService));
+                    var (isSucess, dic) = await SafeBussinessHelper.RunAsync(async () => await DicomDIRHelper.GenerateStudyDIRAndUploadAsync(item.ToList(), ossFolder, _oSSService));
 
+                    dirDic = dic;
 
                     if (isSucess)
                     {
@@ -1179,7 +1181,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
                                     InstanceList = z.DicomInstanceList.Where(t => t.IsReading).Select(k => new DownloadDicomInstanceDto()
                                     {
-                                        IsEncapsulated = k.IsEncapsulated,
+                                        IsEncapsulated=k.IsEncapsulated,
                                         InstanceId = k.Id,
                                         FileName = string.Empty,
                                         Path = k.Path,