diff --git a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs index 7fe4bd220..34193ceeb 100644 --- a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs +++ b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs @@ -483,12 +483,13 @@ namespace IRaCIS.Core.API.Controllers /// /// 上传非Dicom 文件 支持压缩包 多文件上传 /// + /// /// + /// /// - //[DisableRequestSizeLimit] [HttpPost("NoneDicomStudy/UploadNoneDicomFile")] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - //[Authorize(Policy = IRaCISPolicy.CRC)] + public async Task UploadNoneDicomFile(UploadNoneDicomFileCommand incommand, [FromServices] IRepository _noneDicomStudyRepository, [FromServices] IRepository _studyMonitorRepository) { @@ -539,10 +540,12 @@ namespace IRaCIS.Core.API.Controllers /// 一致性核查 excel上传 支持三种格式 /// /// + /// /// + /// [HttpPost("QCOperation/UploadVisitCheckExcel/{trialId:guid}")] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - //[Authorize(Policy = IRaCISPolicy.PM_APM)] + public async Task UploadVisitCheckExcel(Guid trialId, [FromServices] IOSSService oSSService) { @@ -998,14 +1001,14 @@ namespace IRaCIS.Core.API.Controllers await _inspectionFileRepository.AddAsync(new InspectionFile() { FileName = realFileName, RelativePath = ossRelativePath, TrialId = trialId }); - + return ossRelativePath; }); //去掉空白行 - var excelList = MiniExcel.Query(templateFileStream,excelType:ExcelType.XLSX).ToList() + var excelList = MiniExcel.Query(templateFileStream, excelType: ExcelType.XLSX).ToList() .Where(t => !(string.IsNullOrWhiteSpace(t.TrialSiteCode) && string.IsNullOrWhiteSpace(t.FirstName) && string.IsNullOrWhiteSpace(t.LastName) && string.IsNullOrWhiteSpace(t.Email) && string.IsNullOrWhiteSpace(t.Phone) && string.IsNullOrWhiteSpace(t.UserTypeStr) && string.IsNullOrWhiteSpace(t.OrganizationName))).ToList(); diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml index 82de82eb7..5b5c02b0c 100644 --- a/IRaCIS.Core.API/IRaCIS.Core.API.xml +++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml @@ -272,7 +272,9 @@ 上传非Dicom 文件 支持压缩包 多文件上传 + + @@ -280,7 +282,9 @@ 一致性核查 excel上传 支持三种格式 + + 医生文件上传下载 diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig2.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig2.cs index 912f5b093..50ef935d3 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig2.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig2.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Application.Service { public PersonalWorkstation() { - var userTypeEnumInt = 0; + //var userTypeEnumInt = 0; var userTypeId = Guid.Empty; diff --git a/IRaCIS.Core.Application/TestService.cs b/IRaCIS.Core.Application/TestService.cs index 051c8868a..8ef812d03 100644 --- a/IRaCIS.Core.Application/TestService.cs +++ b/IRaCIS.Core.Application/TestService.cs @@ -75,8 +75,8 @@ namespace IRaCIS.Application.Services - - return ResponseOutput.Ok(options); + //ResponseOutput.Ok(options) + return await Task.FromResult(ResponseOutput.Ok(options)) ; } [AllowAnonymous]