Merge branch 'Test_IRC_Net10' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net10

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -17492,17 +17492,17 @@
         </member>
         <member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Question">
             <summary>
-            质疑
+            <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
             </summary>
         </member>
         <member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Consistency">
             <summary>
-            一致性核查
+            һ<EFBFBD><EFBFBD><EFBFBD>Ժ˲<EFBFBD>
             </summary>
         </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.CopyFrontAuditConfigItemDto">
             <summary>
-            复制
+            <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
             </summary>
         </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.SystemNoticeView">

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

@@ -452,6 +452,28 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public List<AdditionalQuestionAnswer> AnswerList { get; set; } = new List<AdditionalQuestionAnswer>();
     }
 
+    public class GetMarkListInDto
+    {
+        /// <summary>
+        /// 任务Id
+        /// </summary>
+        public Guid VisitTaskId { get; set; }
+    }
+
+    public class MarkListInfo
+    {
+        public string MeasureData { get; set; } = string.Empty;
+
+        public string PicturePath { get; set; } = string.Empty;
+
+        public Guid? InstanceId { get; set; }
+
+        public Guid? SeriesId { get; set; }
+        public Guid? StudyId { get; set; }
+
+        public string StudyInstanceUid { get; set; }
+    }
+
     public class GetCustomTagInDto
     {
         /// <summary>

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

@@ -440,6 +440,48 @@ namespace IRaCIS.Core.Application.Service
             return result;
         }
 
+
+        /// <summary>
+        /// 获取标记信息
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<List<MarkListInfo>> GetMarkList(GetMarkListInDto inDto)
+        {
+            var questionMarkList = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId&&x.InstanceId!=null)
+                .Select(x => new MarkListInfo() {
+
+                    MeasureData = x.MeasureData,
+                    PicturePath = x.PicturePath,
+                    InstanceId = x.InstanceId,
+                    SeriesId = x.SeriesId,
+                    StudyId = x.StudyId,
+                    StudyInstanceUid = x.Instance.StudyInstanceUid,
+
+                }).ToListAsync();
+
+
+            var rowMarkList=await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.InstanceId != null)
+                 .Select(x => new MarkListInfo()
+                 {
+
+                     MeasureData = x.MeasureData,
+                     PicturePath = x.PicturePath,
+                     InstanceId = x.InstanceId,
+                     SeriesId = x.SeriesId,
+                     StudyId = x.StudyId,
+                     StudyInstanceUid = x.Instance.StudyInstanceUid,
+
+                 }).ToListAsync();
+
+
+            return questionMarkList.Union(rowMarkList).ToList();
+
+
+
+        }
+
         /// <summary>
         /// 获取手册
         /// </summary>

IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs

@@ -10,6 +10,10 @@ public class ReadingTaskQuestionMark : BaseAddAuditEntity
     [ForeignKey("QuestionId")]
     public ReadingQuestionTrial? ReadingQuestionTrial { get; set; }
 
+    [JsonIgnore]
+    [ForeignKey("InstanceId")]
+    public DicomInstance Instance { get; set; }
+
     [JsonIgnore]
     [ForeignKey("VisitTaskId")]
     public VisitTask VisitTask { get; set; }