修改一版

Uat_Study
he 2022-10-20 17:09:51 +08:00
parent c220338260
commit 6f0e61a5f6
3 changed files with 23 additions and 4 deletions

View File

@ -15,5 +15,7 @@ namespace IRaCIS.Core.Application.Contracts
Task SynchronizeCriterion(SynchronizeCriterionInDto inDto);
}
}

View File

@ -1,4 +1,5 @@
using IRaCIS.Core.Domain.Share;
using IRaCIS.Core.Application.Service.Reading.Dto;
using IRaCIS.Core.Domain.Share;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
@ -768,7 +769,7 @@ namespace IRaCIS.Core.Application.Contracts
public class GetGlobalReadingOutDto
{
public List<Guid> GlobalAssessTypeIds { get; set; }
public List<GetAssessTypeOutDto> GlobalAssessTypes { get; set; }
/// <summary>

View File

@ -206,7 +206,23 @@ namespace IRaCIS.Core.Application
IsGlobalReading = trialCriterion.IsGlobalReading,
IsSystemCriterion= trialCriterion.ReadingQuestionCriterionSystemId!=null,
IsSign=trialCriterion.ReadingInfoSignTime!=null,
GlobalAssessTypeIds = await _readingCriterionDictionaryRepository.Where(x => x.CriterionId == inDto.TrialReadingCriterionId && x.ParentCode == ReadingCommon.GlobalAssess).Select(x => x.DictionaryId).ToListAsync(),
GlobalAssessTypes = await _readingCriterionDictionaryRepository.Where(x => x.CriterionId == inDto.TrialReadingCriterionId
&& x.ParentCode == ReadingCommon.GlobalAssess
)
.Select(x => new GetAssessTypeOutDto()
{
Id = x.Id,
DictionaryId = x.DictionaryId,
ChildGroup = x.Dictionary.ChildGroup,
IsBaseLineUse = x.IsBaseLineUse,
IsFollowVisitUse = x.IsFollowVisitUse,
Code = x.Dictionary.Code,
Description = x.Dictionary.Description,
ShowOrder = x.Dictionary.ShowOrder,
ParentCode = x.Dictionary.Parent.Code,
Value = x.Dictionary.Value,
ValueCN = x.Dictionary.ValueCN
}).OrderBy(x => x.ParentCode).ThenBy(x => x.ShowOrder).ToListAsync()
};
return result;
}