diff --git a/IRaCIS.Core.Application/Helper/OSSService.cs b/IRaCIS.Core.Application/Helper/OSSService.cs index cad0084a6..bb798975b 100644 --- a/IRaCIS.Core.Application/Helper/OSSService.cs +++ b/IRaCIS.Core.Application/Helper/OSSService.cs @@ -143,7 +143,7 @@ public enum ObjectStoreUse public interface IOSSService { public Task UploadToOSSAsync(Stream fileStream, string oosFolderPath, string fileRealName, bool isFileNameAddGuid = true); - public Task UploadToOSSAsync(string localFilePath, string oosFolderPath, bool isFileNameAddGuid = true); + public Task UploadToOSSAsync(string localFilePath, string oosFolderPath, bool isFileNameAddGuid = true, bool randomFileName = false); public Task DownLoadFromOSSAsync(string ossRelativePath, string localFilePath); @@ -322,9 +322,10 @@ public class OSSService : IOSSService /// /// /// + /// 随机文件名 /// /// - public async Task UploadToOSSAsync(string localFilePath, string oosFolderPath, bool isFileNameAddGuid = true) + public async Task UploadToOSSAsync(string localFilePath, string oosFolderPath, bool isFileNameAddGuid = true, bool randomFileName = false) { BackBatchGetToken(); @@ -332,6 +333,11 @@ public class OSSService : IOSSService var ossRelativePath = isFileNameAddGuid ? $"{oosFolderPath}/{Guid.NewGuid()}_{localFileName}" : $"{oosFolderPath}/{localFileName}"; + if (randomFileName) + { + var fileExtension = localFileName.Split(".").LastOrDefault(); + ossRelativePath = $"{oosFolderPath}/{Guid.NewGuid()}.{fileExtension}"; + } if (ObjectStoreServiceOptions.ObjectStoreUse == "AliyunOSS") { diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs index b18943cd5..3dad1d6cc 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs @@ -262,6 +262,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate result.VisitTaskNameList = data.VisitTaskList.Select(x => x.BlindName).ToList(); + + + if (inDto.QuestionId != null) { var question = data.TaskQuestions.SelectMany(x => x.Childrens) diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs index c349964c9..6fb0c48e0 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs @@ -340,7 +340,7 @@ namespace IRaCIS.Core.Application foreach (var item in systemCriterionKeyFile) { - var path= await oSSService.UploadToOSSAsync(item.FilePath, $"{trialCriterion.TrialId}/KeyFile", true); + var path= await oSSService.UploadToOSSAsync(item.FilePath, $"{trialCriterion.TrialId}/KeyFile", true,true); trialCriterionKeyFiles.Add(new TrialCriterionKeyFile {