diff --git a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs
index 214b11b92..7781b1c01 100644
--- a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs
+++ b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs
@@ -400,7 +400,7 @@ namespace IRaCIS.Core.API.Controllers
///
[HttpPost("ClinicalData/UploadClinicalData/{trialId:guid}/{subjectId:guid}/{readingId:guid}")]
[DisableRequestSizeLimit]
- public async Task> UploadReadClinicalData(Guid trialId,Guid subjectId,Guid readingId)
+ public async Task>> UploadReadClinicalData(Guid trialId,Guid subjectId,Guid readingId)
{
var filerelativePath = string.Empty;
List fileDtos = new List();
@@ -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);
+
}
+
+
+
///
/// 上传非Dicom 文件 支持压缩包 多文件上传
///
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs
index 762ed177f..eed704896 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs
@@ -52,7 +52,6 @@ namespace IRaCIS.Application.Services
var entity = _mapper.Map(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
}
+
///
/// 删除
///
@@ -102,6 +100,7 @@ namespace IRaCIS.Application.Services
[HttpDelete("{id:guid}")]
public async Task DeleteReadingClinicalData(Guid id)
{
+
await _readingClinicalDataRepository.DeleteFromQueryAsync(x => x.Id == id, true);
return ResponseOutput.Result(true);
}