Uat_Study
he 2022-06-10 12:02:22 +08:00
parent d1068711b4
commit aebaa4b661
2 changed files with 11 additions and 13 deletions

View File

@ -400,7 +400,7 @@ namespace IRaCIS.Core.API.Controllers
/// <returns></returns>
[HttpPost("ClinicalData/UploadClinicalData/{trialId:guid}/{subjectId:guid}/{readingId:guid}")]
[DisableRequestSizeLimit]
public async Task<List<FileDto>> UploadReadClinicalData(Guid trialId,Guid subjectId,Guid readingId)
public async Task<IResponseOutput<List<FileDto>>> UploadReadClinicalData(Guid trialId,Guid subjectId,Guid readingId)
{
var filerelativePath = string.Empty;
List<FileDto> fileDtos = new List<FileDto>();
@ -412,23 +412,22 @@ namespace IRaCIS.Core.API.Controllers
var (serverFilePath, relativePath, fileRealName) = FileStoreHelper.GetReadClinicalDataPath(_hostEnvironment, fileName, trialId, siteid, subjectId, readingId);
//插入临床pdf 路径
filerelativePath = relativePath;
fileDtos.Add(new FileDto()
{
FileName = fileName,
Path = serverFilePath
}); ;
});
return fileName;
});
return fileDtos;
// indto.AddFileList = fileDtos;
//await _iReadingClinicalDataService.AddOrUpdateReadingClinicalData(indto);
//return ResponseOutput.Ok(filerelativePath);
return ResponseOutput.Ok(fileDtos);
}
/// <summary>
/// 上传非Dicom 文件 支持压缩包 多文件上传
/// </summary>

View File

@ -52,7 +52,6 @@ namespace IRaCIS.Application.Services
var entity = _mapper.Map<ReadingClinicalData>(indto);
entity.ReadingClinicalDataPDFList = indto.AddFileList.Select(x => new ReadingClinicalDataPDF()
{
TrialId = entity.TrialId,
SubjectId= indto.SubjectId,
FileName=x.FileName,
@ -71,9 +70,7 @@ namespace IRaCIS.Application.Services
{
var entity = (await _readingClinicalDataRepository.Where(t => t.Id == indto.Id, true).FirstOrDefaultAsync()).IfNullThrowException();
_mapper.Map(indto, entity);
await _readingClinicalDataPDFRepository.DeleteFromQueryAsync(x => indto.DeleteFileIds.Contains(x.Id));
var addFileList = indto.AddFileList.Select(x => new ReadingClinicalDataPDF()
{
@ -94,6 +91,7 @@ namespace IRaCIS.Application.Services
}
/// <summary>
/// 删除
/// </summary>
@ -102,6 +100,7 @@ namespace IRaCIS.Application.Services
[HttpDelete("{id:guid}")]
public async Task<IResponseOutput> DeleteReadingClinicalData(Guid id)
{
await _readingClinicalDataRepository.DeleteFromQueryAsync(x => x.Id == id, true);
return ResponseOutput.Result(true);
}