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

修改一版

Uat_Study
he 2022-07-14 09:39:51 +08:00
parent 57bce07622
commit 8307e06841
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1516,6 +1516,16 @@
答案 答案
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialReadingQuestionOutDto.PageName">
<summary>
分页名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialReadingQuestionOutDto.ReadingCriterionPageId">
<summary>
标准分页Id
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.IRConfirmMedicalReviewInDto.DoctorUserIdeaEnum"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.IRConfirmMedicalReviewInDto.DoctorUserIdeaEnum">
<summary> <summary>
阅片人是否认同 阅片人是否认同

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

@ -337,6 +337,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public int ShowOrder { get; set; } public int ShowOrder { get; set; }
public int PageShowOrder { get; set; }
/// <summary> /// <summary>
/// 父问题ID /// 父问题ID
/// </summary> /// </summary>

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

@ -302,7 +302,7 @@ namespace IRaCIS.Application.Services
from leftquestionAnswer in questionAnswerTemp.DefaultIfEmpty() from leftquestionAnswer in questionAnswerTemp.DefaultIfEmpty()
select new GetTrialReadingQuestionOutDto() select new GetTrialReadingQuestionOutDto()
{ {
ReadingQuestionTrialId=data.Id, ReadingQuestionTrialId=data.Id,
ReadingQuestionCriterionTrialId=data.ReadingQuestionCriterionTrialId, ReadingQuestionCriterionTrialId=data.ReadingQuestionCriterionTrialId,
TrialId=data.TrialId, TrialId=data.TrialId,
Type=data.Type, Type=data.Type,
@ -316,6 +316,7 @@ namespace IRaCIS.Application.Services
Answer= leftquestionAnswer.Answer, Answer= leftquestionAnswer.Answer,
ReadingCriterionPageId=data.ReadingCriterionPageId, ReadingCriterionPageId=data.ReadingCriterionPageId,
PageName= data.ReadingCriterionPage.PageName, PageName= data.ReadingCriterionPage.PageName,
PageShowOrder = data.ReadingCriterionPage.ShowOrder,
}; };
@ -329,8 +330,22 @@ namespace IRaCIS.Application.Services
if (formType == FormType.MultiplePage) if (formType == FormType.MultiplePage)
{ {
qusetionList = qusetionList.Where(x => x.ReadingCriterionPageId != null).ToList(); qusetionList = qusetionList.Where(x => x.ReadingCriterionPageId != null).ToList();
var readingCriterionPageIds = qusetionList.OrderBy(x => x.PageShowOrder).Select(x => x.ReadingCriterionPageId).Distinct().ToList();
foreach (var item in readingCriterionPageIds)
{
var newPageQusetionList = qusetionList.Where(x => x.ReadingCriterionPageId == item).ToList();
var pageGroupList = newPageQusetionList.Where(x => x.Type == "group").ToList();
pageGroupList.ForEach(x =>
{
x.Childrens = newPageQusetionList.Where(y => y.GroupName == x.GroupName && y.ParentId == null && y.Type != "group").ToList();
x.Childrens.ForEach(z =>
{
this.FindChildQuestion(z, newPageQusetionList);
});
});
groupList.AddRange(pageGroupList);
}
//var readingCriterionPageIds= qusetionList.Select(x=>x.)
} }