diff --git a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs index 8d080bce5..8fff9be23 100644 --- a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs +++ b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs @@ -479,6 +479,8 @@ namespace IRaCIS.Core.API.Controllers public string FilePath { get; set; } public string FileName { get; set; } public int FileFize { get; set; } + + public string FileType { get; set; } } } @@ -511,7 +513,7 @@ namespace IRaCIS.Core.API.Controllers foreach (var item in incommand.UploadedFileList) { - await _repository.AddAsync(new NoneDicomStudyFile() { FileName = item.FileName, Path = item.FilePath, NoneDicomStudyId = noneDicomStudyId }); + await _repository.AddAsync(new NoneDicomStudyFile() { FileName = item.FileName, Path = item.FilePath, NoneDicomStudyId = noneDicomStudyId,FileType=item.FileType }); } var uploadFinishedTime = DateTime.Now; diff --git a/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyFileViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyFileViewModel.cs index 5ac67cd5b..bc308fe1e 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyFileViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyFileViewModel.cs @@ -20,7 +20,9 @@ namespace IRaCIS.Core.Application.Contracts public string FullFilePath => Path; - public string PreviewPath => "/Common/LocalFilePreview?relativePath=" + Path; + public string FileType { get; set; } + + //public string PreviewPath => "/Common/LocalFilePreview?relativePath=" + Path; } diff --git a/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs index 87d404622..5441d1515 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs @@ -17,7 +17,7 @@ namespace IRaCIS.Core.Application.Contracts public List NoneDicomStudyFileList { get; set; } = new List(); - public List NoneDicomStudyFilePreviewList => NoneDicomStudyFileList.Select(t=> t.PreviewPath).ToList(); + //public List NoneDicomStudyFilePreviewList => NoneDicomStudyFileList.Select(t=> t.PreviewPath).ToList(); } diff --git a/IRaCIS.Core.Domain/QC/NoneDicom/NoneDicomStudyFile.cs b/IRaCIS.Core.Domain/QC/NoneDicom/NoneDicomStudyFile.cs index 5b5a3189e..3ccc47775 100644 --- a/IRaCIS.Core.Domain/QC/NoneDicom/NoneDicomStudyFile.cs +++ b/IRaCIS.Core.Domain/QC/NoneDicom/NoneDicomStudyFile.cs @@ -8,36 +8,36 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; namespace IRaCIS.Core.Domain.Models { - /// - ///NoneDicomStudyFile - /// - [Table("NoneDicomStudyFile")] - public class NoneDicomStudyFile : Entity, IAuditAdd - { - [ForeignKey("NoneDicomStudyId")] - [JsonIgnore] - public NoneDicomStudy NoneDicomStudy { get; set; } + /// + ///NoneDicomStudyFile + /// + [Table("NoneDicomStudyFile")] + public class NoneDicomStudyFile : Entity, IAuditAdd + { + [ForeignKey("NoneDicomStudyId")] + [JsonIgnore] + public NoneDicomStudy NoneDicomStudy { get; set; } - [Required] - public Guid NoneDicomStudyId { get; set; } + [Required] + public Guid NoneDicomStudyId { get; set; } - [Required] - public string Path { get; set; } - + [Required] + public string Path { get; set; } - [Required] - public string FileName { get; set; } - - [Required] - public DateTime CreateTime { get; set; } - + [Required] + public string FileName { get; set; } - [Required] - public Guid CreateUserId { get; set; } - - - - } -} + [Required] + public DateTime CreateTime { get; set; } + + + [Required] + public Guid CreateUserId { get; set; } + + public string FileType { get; set; } + + } + +}