修改一版

IRaCIS.Core.API/Controllers/UploadDownLoadController.cs

@@ -468,10 +468,10 @@ namespace IRaCIS.Core.API.Controllers
         /// <returns></returns>
         [HttpPost("TaskMedicalReview/UploadMedicalReviewImage/{trialId:guid}/{taskMedicalReviewId:guid}")]
         [TypeFilter(typeof(TrialResourceFilter))]
-        public async Task<IResponseOutput> UploadMedicalReviewImage(Guid trialId, Guid taskMedicalReviewId)
+        public async Task<IResponseOutput<FileDto>> 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<TaskMedicalReview>(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);
         }
 
 

IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs

@@ -109,6 +109,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// 图片路径
 		/// </summary>
 		public string ImagePath { get; set; } = string.Empty;
+
+
+        /// <summary>
+		/// 文件名称
+		/// </summary>
+		public string FileName { get; set; } = string.Empty;
     }
 
     public class GetMedicalReviewDialogInDto
@@ -236,10 +242,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string Questioning { get; set; } = string.Empty;
 
-        /// <summary>
-        /// 图片路径
-        /// </summary>
-        public string ImagePath { get; set; } = string.Empty;
+        ///// <summary>
+        ///// 图片路径
+        ///// </summary>
+        //public string ImagePath { get; set; } = string.Empty;
+
+
+        ///// <summary>
+        ///// 文件名称
+        ///// </summary>
+        //public string FileName { get; set; } = string.Empty;
 
         /// <summary>
         /// 审核建议
@@ -268,6 +280,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string ImagePath { get; set; } = string.Empty;
 
+        /// <summary>
+		/// 文件名称
+		/// </summary>
+		public string FileName { get; set; } = string.Empty;
+
         /// <summary>
         /// 审核建议
         /// </summary>

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<TaskInfo> 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,
                 });
             }
 

IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs

@@ -134,6 +134,12 @@ namespace IRaCIS.Core.Domain.Models
 		public DateTime? SaveConclusionTime { get; set; }
 
 
+		/// <summary>
+		/// 文件名称
+		/// </summary>
+		public string FileName { get; set; } = string.Empty;
+
+
 	}
 
 }	 

IRaCIS.Core.Domain/Reading/ReadingMedicalReviewDialog.cs

@@ -90,6 +90,11 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public string ImagePath { get; set; } = string.Empty;
 
+		/// <summary>
+		/// 文件名称
+		/// </summary>
+		public string FileName { get; set; } = string.Empty;
+
 	}