diff --git a/IRaCIS.Core.API/_PipelineExtensions/IRacisHostFile/MultiDiskStaticFilesMiddleware.cs b/IRaCIS.Core.API/_PipelineExtensions/IRacisHostFile/MultiDiskStaticFilesMiddleware.cs index 053b8d48d..19df10ddf 100644 --- a/IRaCIS.Core.API/_PipelineExtensions/IRacisHostFile/MultiDiskStaticFilesMiddleware.cs +++ b/IRaCIS.Core.API/_PipelineExtensions/IRacisHostFile/MultiDiskStaticFilesMiddleware.cs @@ -54,7 +54,12 @@ namespace IRaCIS.Core.API //先从默认里面去找 if (isIRacisFile) { - var defaultFileProvider = new PhysicalFileProvider(FileStoreHelper.GetIRaCISRootPath(_hostingEnv)); + + + + #region 方式二 + + var defaultFileProvider = new PhysicalFileProvider(iRaCISDefaultDataFolder); var staticFileOptions = new StaticFileOptions { @@ -64,15 +69,30 @@ namespace IRaCIS.Core.API DefaultContentType = "application/octet-stream" }; - if (defaultFileProvider.GetFileInfo(context.Request.Path).Exists) - { + var a = defaultFileProvider.GetFileInfo(context.Request.Path).Exists; - var actrualPath = defaultFileProvider.GetFileInfo(context.Request.Path).PhysicalPath; + var staticFileMiddleware = new StaticFileMiddleware(_next, _hostingEnv, Options.Create(staticFileOptions), _loggerFactory); + await staticFileMiddleware.Invoke(context); - await context.Response.SendFileAsync(new PhysicalFileInfo(new FileInfo(actrualPath))); + #endregion + + + + #region 文档上传默认会加wwwroot 奇怪... + + //var defaultFileProvider = new PhysicalFileProvider(FileStoreHelper.GetIRaCISRootPath(_hostingEnv)); + + //if (defaultFileProvider.GetFileInfo(path.Trim('/')).Exists) + //{ + + // var actrualPath = defaultFileProvider.GetFileInfo(context.Request.Path).PhysicalPath; + + // await context.Response.SendFileAsync(new PhysicalFileInfo(new FileInfo(actrualPath))); + + // return; + //} + #endregion - return; - } } //没找到 diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index 557dc6e88..25ed7197a 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -1526,7 +1526,6 @@ namespace IRaCIS.Core.Application.Service.Allocation var criterionConfig = await _trialReadingCriterionRepository.Where(x => x.Id == origenalTask.TrialReadingCriterionId).Select(x => new { x.ReadingTool, x.CriterionType, x.IsAdditionalAssessment, x.IsReadingTaskViewInOrder }).FirstOrDefaultAsync(); - //更新申请信息 var visitTaskReReadingAppply = await _visitTaskReReadingRepository.FirstOrDefaultAsync(t => t.Id == item.Id); visitTaskReReadingAppply.RequestReReadingConfirmUserId = _userInfo.Id; @@ -1754,7 +1753,6 @@ namespace IRaCIS.Core.Application.Service.Allocation #endregion - //有序阅片 if (criterionConfig.IsReadingTaskViewInOrder) {