diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 77a42d26d..5d724ee0d 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -481,6 +481,30 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto } + public class NoneDicomMarkInfo + { + + public Guid? StudyId { get; set; } + + public Guid? NoneDicomFileId { get; set; } + + public string Path { get; set; } + public string PicturePath { get; set; } = string.Empty; + public string MeasureData { get; set; } = string.Empty; + + public string MarkTool { get; set; } + + public string MarkName { get; set; } + + public string FileName { get; set; } = string.Empty; + + + /// + /// 标记的唯一标识符 + /// + public Guid? MarkId { get; set; } + } + public class GetCustomTagInDto { /// diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 2cbb69524..447335c20 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -482,10 +482,39 @@ namespace IRaCIS.Core.Application.Service return questionMarkList.Union(rowMarkList).ToList(); + } + /// + /// 获取非DICOM标记信息 + /// + /// + /// + [HttpPost] + public async Task> GetNoneDicomMarkList(GetMarkListInDto inDto) + { + var markList = await _readingNoneDicomMarkRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId).Include(x => x.NoneDicomStudyFile) + .Select(x => new NoneDicomMarkInfo() + { + StudyId = x.StudyId, + NoneDicomFileId = x.NoneDicomFileId, + Path = x.Path, + PicturePath = x.PicturePath, + MeasureData = x.MeasureData, + MarkTool = x.MarkTool, + MarkName = x.OrderMarkName, + FileName = x.NoneDicomStudyFile==null? string.Empty: x.NoneDicomStudyFile.FileName, + MarkId = x.MarkId, + }).ToListAsync(); + + return markList; } + + + + + /// /// 获取手册 /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingNoneDicomMark.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingNoneDicomMark.cs index b8ece835c..329ceb939 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingNoneDicomMark.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingNoneDicomMark.cs @@ -8,6 +8,10 @@ public class ReadingNoneDicomMark : BaseAddAuditEntity [JsonIgnore] [ForeignKey("StudyId")] public NoneDicomStudy NoneDicomStudy { get; set; } + + [JsonIgnore] + [ForeignKey("NoneDicomFileId")] + public NoneDicomStudyFile NoneDicomStudyFile { get; set; } #endregion public Guid VisitTaskId { get; set; }