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

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

@@ -781,8 +781,16 @@ namespace IRaCIS.Core.Application.Service
             var criterionIdInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == trialReadingCriterionId).FirstNotNullAsync();
 
 
-            //排除表格问题
+            var groupIds = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == trialReadingCriterionId&& x.Type == ReadingQestionType.Table && x.Type == ReadingQestionType.BasicTable).Select(x => x.GroupId).Distinct().ToListAsync();
+
+            var questionIds = await _readingQuestionTrialRepository
+                 .WhereIf(!criterionIdInfo.IseCRFShowInDicomReading, x => x.IsShowInDicom)
+                 .Where(x => groupIds.Contains(x.GroupId)).Select(x => x.Id).ToListAsync();
+
+
+            //排除表格问题 以及在表格问题分组的外层问题
             var questions = await _readingQuestionTrialRepository
+                .Where(x=> !questionIds.Contains(x.Id))
                 .WhereIf(questionClassify != null, x => x.QuestionClassify == questionClassify)
                 .WhereIf(criterionIdInfo.IseCRFShowInDicomReading, x => x.ReadingQuestionCriterionTrialId == trialReadingCriterionId && x.Type != ReadingQestionType.Table && x.Type != ReadingQestionType.BasicTable)
                 .WhereIf(!criterionIdInfo.IseCRFShowInDicomReading, x => x.IsShowInDicom && x.ReadingQuestionCriterionTrialId == trialReadingCriterionId && x.Type != ReadingQestionType.Table && x.Type != ReadingQestionType.BasicTable)

IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs

@@ -17,9 +17,14 @@ namespace IRaCIS.Core.Application.ViewModel
 
     }
 
-    public class GetSplitPPdOutDto
+    public class GetMeasuredValueTemplateInDto
     {
-        public Guid RowId { get; set; }
+        public Guid VisitTaskId { get; set; }
+    }
+
+    public class GetSplitPPdOutDto
+	{
+		public Guid RowId { get; set; }
 
         public string RowIndex { get; set; }
 

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

@@ -80,6 +80,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         }
         #endregion
 
+        //public async Task<FileResult> GetMeasuredValueTemplate(GetMeasuredValueTemplateInDto inDto)
+        //{
+            
+        //}
+
         #region 获取阅片报告
         /// <summary>
         /// 获取阅片报告