diff --git a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs index 65eb55ab..da4c832e 100644 --- a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs +++ b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs @@ -575,11 +575,11 @@ namespace IRaCIS.Core.API.Controllers var (serverFilePath, relativePath, fileRealName) = FileStoreHelper.GetMedicalReviewImage(_hostEnvironment, fileName, trialId, taskMedicalReviewId); - await _repository.UpdatePartialFromQueryAsync(x => x.Id == taskMedicalReviewId, x => new TaskMedicalReview() - { - ImagePath = relativePath, - FileName = fileName, - }); + //await _repository.UpdatePartialFromQueryAsync(x => x.Id == taskMedicalReviewId, x => new TaskMedicalReview() + //{ + // ImagePath = relativePath, + // FileName = fileName, + //}); path = relativePath; fileDto.Path = relativePath; diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs index 46531007..83aada72 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs @@ -251,19 +251,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public string CreateUserName { get; set; } - - /// - /// 图片路径 - /// - public string ImagePath { get; set; } = string.Empty; - - - /// - /// 文件名称 - /// - public string FileName { get; set; } = string.Empty; - + public List FileNameList { get; set; } + + + public List ImagePathList { get; set; } + + } public class GetMedicalReviewDialogInDto @@ -425,7 +419,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public Guid TaskMedicalReviewId { get; set; } - + + public List FileNameList { get; set; } + + public List ImagePathList { get; set; } + + /// /// 是否有问题 /// @@ -469,15 +468,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public string Questioning { get; set; } = string.Empty; - /// - /// 图片路径 - /// - public string ImagePath { get; set; } = string.Empty; - /// - /// 文件名称 - /// - public string FileName { get; set; } = string.Empty; + public List FileNameList { get; set; } + + + public List ImagePathList { get; set; } /// /// 审核建议 diff --git a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs index a7d32034..b9425e6d 100644 --- a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs +++ b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs @@ -331,10 +331,12 @@ namespace IRaCIS.Core.Application.Service IsHaveQuestion = inDto.IsHaveQuestion, Questioning = inDto.Questioning, IsSendMessage = inDto.IsSendDialog && inDto.IsHaveQuestion, + ImagePath = string.Join(',',inDto.ImagePathList), + FileName = string.Join(',', inDto.FileNameList), AuditAdviceEnum = inDto.AuditAdviceEnum, - SaveConclusionTime=DateTime.Now, + SaveConclusionTime = DateTime.Now, - }); + }); ; var medicalReview = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync(); if (inDto.IsSendDialog&& !medicalReview.IsSendMessage && inDto.IsHaveQuestion) diff --git a/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs b/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs index 2dc262d7..775f1980 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs @@ -8,6 +8,7 @@ using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Collections.Generic; +using System.Linq; namespace IRaCIS.Core.Domain.Models { @@ -169,6 +170,12 @@ namespace IRaCIS.Core.Domain.Models /// 无效的 为True无效 /// public bool IsInvalid { get; set; } + + [NotMapped] + public List FileNameList => this.FileName.Split(',').ToList(); + + [NotMapped] + public List ImagePathList => this.ImagePath.Split(',').ToList(); } } diff --git a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs index 08a9e20e..a6178bd6 100644 --- a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs +++ b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs @@ -7,6 +7,8 @@ using System; using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; + namespace IRaCIS.Core.Domain.Models { /// @@ -99,6 +101,13 @@ namespace IRaCIS.Core.Domain.Models public TaskMedicalReview TaskMedicalReview { get; set; } + [NotMapped] + public List FileNameList => this.FileName.Split(',').ToList(); + + [NotMapped] + public List ImagePathList => this.ImagePath.Split(',').ToList(); + + }