diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index c641d427b..a162f53f0 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -836,10 +836,10 @@ namespace IRaCIS.Application.Services isEn_Us=_userInfo.IsEn_Us }).OrderBy(x => x.ShowOrder).ToListAsync(); - + var taskInfo = new VisitTask(); if (inDto.TaskId != null) { - var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.TaskId).FirstNotNullAsync(); + taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.TaskId).FirstNotNullAsync(); qusetionList.ForEach(x => { @@ -857,7 +857,7 @@ namespace IRaCIS.Application.Services } //是否是预览 - if (inDto.IsGetPreview == false) + if (inDto.IsGetPreview == false) { // 是否获取所有问题 if (inDto.IsGetallQuestion) @@ -873,6 +873,13 @@ namespace IRaCIS.Application.Services { qusetionList = qusetionList.Where(x => x.IsShowInDicom && (x.Type == ReadingQestionType.Table || x.Type == ReadingQestionType.Group)).OrderBy(x => x.ShowOrder).ToList(); } + + + if (inDto.TaskId != null&& !taskInfo.IsConvertedTask) + { + qusetionList= qusetionList.Where(x=>x.QuestionType!=QuestionType.IsConverted).OrderBy(x => x.ShowOrder).ToList(); + } + var usedGuropIds = qusetionList.Where(x => x.Type == ReadingQestionType.Table).Select(x => x.GroupId).ToList(); qusetionList = qusetionList.Where(x => usedGuropIds.Contains(x.Id)|| usedGuropIds.Contains(x.GroupId)).ToList(); } @@ -906,7 +913,7 @@ namespace IRaCIS.Application.Services if(inDto.TaskId!=null) { - var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.TaskId).FirstNotNullAsync(); + taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.TaskId).FirstNotNullAsync(); // 取基线 var baseLineVisitId = await _subjectVisitRepository.Where(x => x.SubjectId == taskInfo.SubjectId && x.IsBaseLine).Select(x => x.Id).FirstNotNullAsync(); diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs index c3ec3beb9..132cb1dac 100644 --- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs +++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs @@ -1168,6 +1168,11 @@ namespace IRaCIS.Core.Domain.Share /// 是否脑转移 /// IsBrainMetastasis=43, + + /// + /// 是否转变之后表格问题 + /// + IsConverted = 44, } ///