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

IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs

@@ -1227,7 +1227,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                 var visitIds = siteVisitForTumorList.Select(x => x.SubjectVisitId).ToList();
                 // Dicom 用NM  非dicom 用骨扫描 (BoneScan)
-                List<VisitStudyTime> visitStudies = await _dicomStudyRepository.Where(x => visitIds.Contains(x.SubjectVisitId)/* && x.ModalityForEdit == "BoneScan"*/).Select(x => new VisitStudyTime()
+                List<VisitStudyTime> visitStudies = await _dicomStudyRepository.Where(x => visitIds.Contains(x.SubjectVisitId) && x.Modalities.Contains("NM")).Select(x => new VisitStudyTime()
                 {
                     SubjectVisitId = x.SubjectVisitId,
                     StudyTime = x.StudyTime
@@ -1235,7 +1235,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 }).ToListAsync();
 
                 visitStudies.AddRange(
-                    await _noneDicomStudyRepository.Where(x => visitIds.Contains(x.SubjectVisitId) /*&& x.Modality == "BoneScan"*/).Select(x => new VisitStudyTime()
+                    await _noneDicomStudyRepository.Where(x => visitIds.Contains(x.SubjectVisitId) && x.Modality == "BoneScan").Select(x => new VisitStudyTime()
                     {
                         SubjectVisitId = x.SubjectVisitId,
                         StudyTime = x.ImageDate