diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index f6997c25a..fe970ad63 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -4174,6 +4174,11 @@ 病灶类型 + + + 病灶类型 + + OrganInfoAddOrEdit 列表查询参数模型 diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 56f8763e5..df3e920a8 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -1010,6 +1010,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public QuestionMark? QuestionMark { get; set; } + public List RelationIds { get; set; } + //public List TableQuestions { get; set; } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index 26b03751e..10eb4682c 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -1044,29 +1044,30 @@ namespace IRaCIS.Application.Services public void FindSystemChildQuestion(GetSystemReadingQuestionOutDto item, List questionlists,List tableQuestions) { item.Childrens = questionlists.Where(x => x.ParentId == item.Id || (item.Type == "group" && x.Type != "group" && x.ParentId == null && x.GroupName == item.GroupName)).ToList(); - + item.Childrens.AddRange(tableQuestions.Where(x => x.ReadingQuestionId == item.Id).Select(x => new GetSystemReadingQuestionOutDto { Childrens = new List(), ShowOrder = x.ShowOrder, GroupName = string.Empty, Id = x.Id, - Type=x.Type, - TableQuestionType= x.TableQuestionType, - DependParentId=x.DependParentId, - IsDepend=x.IsDepend, - QuestionMark=x.QuestionMark, - TypeValue =x.TypeValue, - RelevanceId=x.RelevanceId, - RelevanceValue=x.RelevanceValue, + Type = x.Type, + TableQuestionType = x.TableQuestionType, + DependParentId = x.DependParentId, + IsDepend = x.IsDepend, + QuestionMark = x.QuestionMark, + TypeValue = x.TypeValue, + RelevanceId = x.RelevanceId, + RelevanceValue = x.RelevanceValue, ImageCount = 0, ParentId = item.Id, - DataTableColumn= x.DataTableColumn, + DataTableColumn = x.DataTableColumn, LesionType = item.LesionType, QuestionName = x.QuestionName, + RelationIds = tableQuestions.Where(z => (z.DependParentId ?? default(Guid)) == x.Id).Select(z => z.Id).ToList(), Remark = x.Remark, - })); + })); if (item.Childrens != null && item.Childrens.Count != 0) {