新增接口 GetNoneDicomMarkList

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;
+
+
+        /// <summary>
+        /// 标记的唯一标识符
+        /// </summary>
+        public Guid? MarkId { get; set; }
+    }
+
     public class GetCustomTagInDto
     {
         /// <summary>

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs

@@ -482,10 +482,39 @@ namespace IRaCIS.Core.Application.Service
 
             return questionMarkList.Union(rowMarkList).ToList();
 
+        }
 
+        /// <summary>
+        /// 获取非DICOM标记信息
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<List<NoneDicomMarkInfo>> 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;
 
         }
 
+
+
+
+
+
         /// <summary>
         /// 获取手册
         /// </summary>

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; }