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

修改排序

Uat_Study
he 2022-12-14 14:53:09 +08:00 committed by {872297557@qq.com}
parent e492c833ce
commit c4f67aebbc
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs
View File

@ -67,7 +67,8 @@ namespace IRaCIS.Core.Application.Service
.Where(x => x.SystemCriterionId == inQuery.SystemCriterionId) .Where(x => x.SystemCriterionId == inQuery.SystemCriterionId)
.WhereIf(inQuery.LesionType != null, x => organs.Contains(x.OrganType)) .WhereIf(inQuery.LesionType != null, x => organs.Contains(x.OrganType))
.WhereIf(inQuery.OrganType != null, x => x.OrganType == inQuery.OrganType) .WhereIf(inQuery.OrganType != null, x => x.OrganType == inQuery.OrganType)
.OrderBy(x=>x.ShowOrder) .OrderBy(x=>x.OrganType)
.ThenBy(x=>x.ShowOrder)
.ProjectTo<OrganInfoView>(_mapper.ConfigurationProvider); .ProjectTo<OrganInfoView>(_mapper.ConfigurationProvider);
return await organInfoQueryable.ToListAsync(); return await organInfoQueryable.ToListAsync();
} }
@ -96,7 +97,7 @@ namespace IRaCIS.Core.Application.Service
.WhereIf(inQuery.LesionType != null, x => organs.Contains(x.OrganType)) .WhereIf(inQuery.LesionType != null, x => organs.Contains(x.OrganType))
.WhereIf(inQuery.OrganType != null, x => x.OrganType == inQuery.OrganType) .WhereIf(inQuery.OrganType != null, x => x.OrganType == inQuery.OrganType)
.ProjectTo<OrganInfoView>(_mapper.ConfigurationProvider); .ProjectTo<OrganInfoView>(_mapper.ConfigurationProvider);
return await organInfoQueryable.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrWhiteSpace(inQuery.SortField) ? nameof(OrganInfoView.ShowOrder) : inQuery.SortField, inQuery.Asc); return await organInfoQueryable.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrWhiteSpace(inQuery.SortField) ? nameof(OrganInfoView.ShowOrder) : inQuery.SortField, inQuery.Asc,true,new string[] { nameof(OrganInfoView.OrganType) , nameof(OrganInfoView.ShowOrder) });
} }
/// <summary> /// <summary>
@ -168,7 +169,7 @@ namespace IRaCIS.Core.Application.Service
List<GetReadingOrganListOutDto> result = organList.GroupBy(x => new { x.LesionType }).Select(x => new GetReadingOrganListOutDto() List<GetReadingOrganListOutDto> result = organList.GroupBy(x => new { x.LesionType }).Select(x => new GetReadingOrganListOutDto()
{ {
LesionType = x.Key.LesionType, LesionType = x.Key.LesionType,
OrganList = x.ToList() OrganList = x.OrderBy(y=>y.ShowOrder).ToList()
}).ToList(); }).ToList();
return result; return result;
@ -233,7 +234,7 @@ namespace IRaCIS.Core.Application.Service
}; };
return await organInfoQueryable.OrderBy(x=>x.ShowOrder).ToListAsync(); return await organInfoQueryable.OrderBy(x=>x.OrganType).ThenBy(x=>x.ShowOrder).ToListAsync();
} }