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

IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyFileViewModel.cs

@@ -20,6 +20,8 @@ namespace IRaCIS.Core.Application.Contracts
 
         public bool IsDeleted { get; set; }
 
+        public bool IsBeMark { get; set; }
+
         public DateTime? MarkTime { get; set; }
     }
 

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

@@ -485,13 +485,16 @@ namespace IRaCIS.Core.Application.Service
 
             List<NoneDicomStudyView> result = await noneDicomStudyQueryable.OrderBy(x => x.ImageDate).ThenBy(x => x.CreateTime).ToListAsync();
 
-
+            // 获取非DIOCM标记
             var nonoDicomStudyFileIds = await _readingNoneDicomMarkRepository.Where(x => x.VisitTaskId == inDto.VisistTaskId).ToListAsync();
+
+            var markFileId = nonoDicomStudyFileIds.Select(x => x.NoneDicomFileId).ToList();
             if (nonoDicomStudyFileIds.Count > 0 && taskinfo.ReadingTaskState == ReadingTaskState.HaveSigned)
             {
                 var studyId = nonoDicomStudyFileIds.Select(x => x.StudyId).FirstOrDefault();
 
                 var noneDicomids = nonoDicomStudyFileIds.Select(x => x.NoneDicomFileId).ToList();
+
                 var noneDicomStudyViewMark = new NoneDicomStudyView() { Id = Guid.NewGuid() };
                 noneDicomStudyViewMark.IsCriticalSequence = true;
                 noneDicomStudyViewMark.NoneDicomStudyFileList = await _noneDicomStudyFileRepository.Where(x => noneDicomids.Contains(x.Id)).ProjectTo<NoneDicomStudyFileView>(_mapper.ConfigurationProvider).ToListAsync();
@@ -506,6 +509,14 @@ namespace IRaCIS.Core.Application.Service
             }
 
 
+            foreach (var item in result)
+            {
+                foreach (var item1 in item.NoneDicomStudyFileList)
+                {
+                    item1.IsBeMark= markFileId.Contains(item1.Id);
+                }
+            }
+
 
             var trialInfo = await _trialRepository.Where(x => x.Id == inDto.TrialId).Select(x => new
             {