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

IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs

@@ -13,6 +13,8 @@ namespace IRaCIS.Core.Application.Contracts.Dicom.DTO
 
         public bool IsBeMark { get; set; } = false;
 
+        public bool IsBeSegment { get; set; } = false;
+
         public Guid Id { get; set; }
         public Guid StudyId { get; set; }
         public string StudyInstanceUid { get; set; } = String.Empty;

IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs

@@ -362,6 +362,24 @@ namespace IRaCIS.Core.Application.Contracts
 
         #endregion
 
+        #region 核验
+
+        /// <summary>
+        /// 总剂量
+        /// </summary>
+        public string RadionuclideTotalDose { get; set; }
+
+        /// <summary>
+        /// 半衰期
+        /// </summary>
+        public string RadionuclideHalfLife { get; set; }
+
+        /// <summary>
+        /// 注射时间
+        /// </summary>
+        public string RadiopharmaceuticalStartTime { get; set; }
+        #endregion
+
     }
 
     public class AddOrUpdateSeriesDto

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

@@ -45,6 +45,7 @@ namespace IRaCIS.Core.Application.Service
         IRepository<ReadingTableQuestionAnswer> _readingTableQuestionAnswerRepository,
         IRepository<ReadingOncologyTaskInfo> _readingOncologyTaskInfoRepository,
             IRepository<Segmentation> _segmentationRepository,
+                IRepository<SegmentBinding> _segmentBindingRepository,
         IVisitTaskHelpeService _visitTaskHelpeService,
         IVisitTaskService _visitTaskService,
         IReadingClinicalDataService _readingClinicalDataService,
@@ -3888,6 +3889,8 @@ namespace IRaCIS.Core.Application.Service
             await _readingTaskQuestionMarkRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId);
             await _readingNoneDicomMarkRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId);
             await _readingNoneDicomMarkBindingRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId);
+            await _segmentBindingRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId);
+
             await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => x.Id == inDto.VisitTaskId, x => new VisitTask()
             {
                 ReadingTaskState = ReadingTaskState.WaitReading

IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs

@@ -30,6 +30,7 @@ namespace IRaCIS.Core.Application.Services
         IRepository<DicomInstance> _dicomInstanceRepository,
         IRepository<TaskStudy> _taskStudyRepository,
              IRepository<TaskSeries> _taskSeriesRepository,
+               IRepository<Segmentation> _segmentationRepository,
                  IRepository<TaskInstance> _taskInstanceRepository,
         IServiceProvider _serviceProvider,
         IRepository<DicomSeries> _dicomSeriesRepository,
@@ -912,6 +913,19 @@ namespace IRaCIS.Core.Application.Services
 
             #endregion
 
+            #region 处理分割
+
+            var segmentatSeriesList =await _segmentationRepository.Where(x => x.VisitTaskId == indto.VisitTaskId && x.SEGUrl != string.Empty).Select(x => x.SeriesId).ToListAsync();
+            result.ForEach(x =>
+            {
+                x.SeriesList.ForEach(y =>
+                {
+                    y.IsBeSegment = segmentatSeriesList.Any(z => z == y.Id);
+                });
+
+            });
+            #endregion
+
 
             return result;