diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 7d689472c..258c2943b 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -792,8 +792,16 @@ namespace IRaCIS.Application.Services 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) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs index bd60587f5..44268647b 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs @@ -22,7 +22,12 @@ namespace IRaCIS.Core.Application.ViewModel } - public class GetSplitPPdOutDto + public class GetMeasuredValueTemplateInDto + { + public Guid VisitTaskId { get; set; } + } + + public class GetSplitPPdOutDto { public Guid RowId { get; set; } diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs index 427663129..e5b0828cc 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs @@ -88,6 +88,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate } #endregion + //public async Task GetMeasuredValueTemplate(GetMeasuredValueTemplateInDto inDto) + //{ + + //} + #region 获取阅片报告 /// /// 获取阅片报告 @@ -108,11 +113,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate }); - - - - - + result.ReadingTaskState = visitTaskInfo.ReadingTaskState; var taskInfoList = await _generalCalculateService.GetReadingReportTaskList(indto.VisitTaskId);