diff --git a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs
index 56c3c4ed1..647ac3f01 100644
--- a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs
+++ b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs
@@ -468,10 +468,10 @@ namespace IRaCIS.Core.API.Controllers
///
[HttpPost("TaskMedicalReview/UploadMedicalReviewImage/{trialId:guid}/{taskMedicalReviewId:guid}")]
[TypeFilter(typeof(TrialResourceFilter))]
- public async Task UploadMedicalReviewImage(Guid trialId, Guid taskMedicalReviewId)
+ public async Task> UploadMedicalReviewImage(Guid trialId, Guid taskMedicalReviewId)
{
string path = string.Empty;
-
+ FileDto fileDto = new FileDto();
await FileUploadAsync(async (fileName) =>
{
@@ -480,16 +480,18 @@ namespace IRaCIS.Core.API.Controllers
await _repository.UpdatePartialFromQueryAsync(x => x.Id == taskMedicalReviewId, x => new TaskMedicalReview()
{
- ImagePath = relativePath
+ ImagePath = relativePath,
+ FileName=fileName,
});
path = relativePath;
-
- return serverFilePath;
+ fileDto.Path = relativePath;
+ fileDto.FileName = fileName;
+ return serverFilePath;
});
await _repository.SaveChangesAsync();
- return ResponseOutput.Ok(path);
+ return ResponseOutput.Ok(fileDto);
}
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
index 3b06bac44..68601d9d4 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
@@ -109,6 +109,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// 图片路径
///
public string ImagePath { get; set; } = string.Empty;
+
+
+ ///
+ /// 文件名称
+ ///
+ public string FileName { get; set; } = string.Empty;
}
public class GetMedicalReviewDialogInDto
@@ -236,10 +242,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
public string Questioning { get; set; } = string.Empty;
- ///
- /// 图片路径
- ///
- public string ImagePath { get; set; } = string.Empty;
+ /////
+ ///// 图片路径
+ /////
+ //public string ImagePath { get; set; } = string.Empty;
+
+
+ /////
+ ///// 文件名称
+ /////
+ //public string FileName { get; set; } = string.Empty;
///
/// 审核建议
@@ -268,6 +280,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
public string ImagePath { get; set; } = string.Empty;
+ ///
+ /// 文件名称
+ ///
+ public string FileName { get; set; } = string.Empty;
+
///
/// 审核建议
///
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
index ec45b2718..4ef0389f9 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
@@ -98,7 +98,7 @@ namespace IRaCIS.Core.Application.Service
}).ToListAsync();
- List< TaskInfo > otherTask = await _visitTaskRepository.Where(x => x.ArmEnum != Arm.JudgeArm && x.SubjectId == taskInfo.SubjectId
+ List otherTask = await _visitTaskRepository.Where(x => x.ArmEnum != Arm.JudgeArm && x.SubjectId == taskInfo.SubjectId
&& x.DoctorUserId != taskInfo.DoctorUserId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ReReadingApplyState != ReReadingApplyState.Agree
).OrderBy(x => x.VisitTaskNum).Select(x => new TaskInfo()
{
@@ -253,15 +253,16 @@ namespace IRaCIS.Core.Application.Service
{
IsHaveQuestion = inDto.IsHaveQuestion,
Questioning = inDto.Questioning,
- ImagePath = inDto.ImagePath,
+
AuditAdviceEnum = inDto.AuditAdviceEnum,
+
SaveConclusionTime=DateTime.Now,
});
if(inDto.IsSendDialog)
{
- var visitTaskId = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).Select(x => x.VisitTaskId).FirstOrDefaultAsync();
+ var medicalReview = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
await _readingMedicalReviewDialogRepository.AddAsync(new ReadingMedicalReviewDialog()
{
AuditAdviceEnum = inDto.AuditAdviceEnum,
@@ -269,9 +270,10 @@ namespace IRaCIS.Core.Application.Service
UserTypeShortName = _userInfo.UserTypeShortName,
IsHaveQuestion=inDto.IsHaveQuestion,
Questioning=inDto.Questioning,
- VisitTaskId= visitTaskId,
+ VisitTaskId= medicalReview.VisitTaskId,
+ FileName = medicalReview.FileName,
UserTypeEnumInt = _userInfo.UserTypeEnumInt,
- ImagePath= inDto.ImagePath,
+ ImagePath= medicalReview.ImagePath,
});
}
diff --git a/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs b/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs
index 4202a2ef9..57684260a 100644
--- a/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs
+++ b/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs
@@ -134,6 +134,12 @@ namespace IRaCIS.Core.Domain.Models
public DateTime? SaveConclusionTime { get; set; }
+ ///
+ /// 文件名称
+ ///
+ public string FileName { get; set; } = string.Empty;
+
+
}
}
diff --git a/IRaCIS.Core.Domain/Reading/ReadingMedicalReviewDialog.cs b/IRaCIS.Core.Domain/Reading/ReadingMedicalReviewDialog.cs
index 5710e783f..50eca53a1 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingMedicalReviewDialog.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingMedicalReviewDialog.cs
@@ -90,6 +90,11 @@ namespace IRaCIS.Core.Domain.Models
///
public string ImagePath { get; set; } = string.Empty;
+ ///
+ /// 文件名称
+ ///
+ public string FileName { get; set; } = string.Empty;
+
}