XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Uat_Study
he 2022-08-26 14:54:00 +08:00
parent 507c38e719
commit 6a1052a1fe
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -4174,6 +4174,11 @@
病灶类型 病灶类型
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.ViewModel.OrganInfoQuery.LesionType">
<summary>
病灶类型
</summary>
</member>
<member name="T:IRaCIS.Core.Application.ViewModel.OrganInfoAddOrEdit"> <member name="T:IRaCIS.Core.Application.ViewModel.OrganInfoAddOrEdit">
<summary> OrganInfoAddOrEdit 列表查询参数模型</summary> <summary> OrganInfoAddOrEdit 列表查询参数模型</summary>
</member> </member>

2
IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
View File

@ -1010,6 +1010,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public QuestionMark? QuestionMark { get; set; } public QuestionMark? QuestionMark { get; set; }
public List<Guid> RelationIds { get; set; }
//public List<TableQuestionDataInfo> TableQuestions { get; set; } //public List<TableQuestionDataInfo> TableQuestions { get; set; }

23
IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
View File

@ -1044,29 +1044,30 @@ namespace IRaCIS.Application.Services
public void FindSystemChildQuestion(GetSystemReadingQuestionOutDto item, List<GetSystemReadingQuestionOutDto> questionlists,List<TableQuestionDataInfo> tableQuestions) public void FindSystemChildQuestion(GetSystemReadingQuestionOutDto item, List<GetSystemReadingQuestionOutDto> questionlists,List<TableQuestionDataInfo> 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 = 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 item.Childrens.AddRange(tableQuestions.Where(x => x.ReadingQuestionId == item.Id).Select(x => new GetSystemReadingQuestionOutDto
{ {
Childrens = new List<GetSystemReadingQuestionOutDto>(), Childrens = new List<GetSystemReadingQuestionOutDto>(),
ShowOrder = x.ShowOrder, ShowOrder = x.ShowOrder,
GroupName = string.Empty, GroupName = string.Empty,
Id = x.Id, Id = x.Id,
Type=x.Type, Type = x.Type,
TableQuestionType= x.TableQuestionType, TableQuestionType = x.TableQuestionType,
DependParentId=x.DependParentId, DependParentId = x.DependParentId,
IsDepend=x.IsDepend, IsDepend = x.IsDepend,
QuestionMark=x.QuestionMark, QuestionMark = x.QuestionMark,
TypeValue =x.TypeValue, TypeValue = x.TypeValue,
RelevanceId=x.RelevanceId, RelevanceId = x.RelevanceId,
RelevanceValue=x.RelevanceValue, RelevanceValue = x.RelevanceValue,
ImageCount = 0, ImageCount = 0,
ParentId = item.Id, ParentId = item.Id,
DataTableColumn= x.DataTableColumn, DataTableColumn = x.DataTableColumn,
LesionType = item.LesionType, LesionType = item.LesionType,
QuestionName = x.QuestionName, QuestionName = x.QuestionName,
RelationIds = tableQuestions.Where(z => (z.DependParentId ?? default(Guid)) == x.Id).Select(z => z.Id).ToList(),
Remark = x.Remark, Remark = x.Remark,
})); }));
if (item.Childrens != null && item.Childrens.Count != 0) if (item.Childrens != null && item.Childrens.Count != 0)
{ {