Uat_Study
he 2022-10-18 11:21:36 +08:00
parent b2e7cc62fb
commit e76c318a79
3 changed files with 7 additions and 4 deletions

View File

@ -248,7 +248,7 @@ namespace IRaCIS.Core.Application.Service.RC
[HttpPost]
public async Task<PageOutput<ReadingQuestionCriterionTrialView>> GetReadingQuestionCriterionTrialList(ReadingQuestionCriterionTrialViewInDto inDto)
{
//await AddSystemDataToTrila(inDto.TrialId);
await AddSystemDataToTrila(inDto.TrialId);
var query = _readingQuestionCriterionTrialRepository.AsQueryable()
.Where(x => x.TrialId == inDto.TrialId)
.Where(x => (x.ReadingQuestionCriterionSystemId != null && x.IsEnable) || x.ReadingQuestionCriterionSystemId == null)
@ -356,6 +356,7 @@ namespace IRaCIS.Core.Application.Service.RC
x.TrialId = trialId;
x.ReadingQuestionCriterionSystemId = x.Id;
x.Id = NewId.NextGuid();
// 同步问题暂时注释
//List<ReadingQuestionTrial> readingQuestionTrialList = new List<ReadingQuestionTrial>();
//SetChildParentQuestion(criterion.Id, trialId, systemQuestionList, readingQuestionTrialList);

View File

@ -677,6 +677,8 @@ namespace IRaCIS.Core.Application.Contracts
public FormType? FormType { get; set; }
public bool IsSystemCriterion { get; set; }
/// <summary>
/// 项目标准Id
/// </summary>
@ -728,7 +730,7 @@ namespace IRaCIS.Core.Application.Contracts
public List<Guid> OncologyAssessIds { get; set; }
public bool IsSystemCriterion { get; set; }
/// <summary>
/// 评估原因

View File

@ -160,7 +160,7 @@ namespace IRaCIS.Core.Application
{
EvaluationReason = trialCriterion.EvaluationReason.IsNullOrEmpty()? ReadingCommon.EvaluationReason : trialCriterion.EvaluationReason,
OncologyAssessIds = await _readingCriterionDictionaryRepository.Where(x => x.CriterionId == inDto.TrialReadingCriterionId && x.ParentCode == "OncologyAssess").Select(x => x.DictionaryId).ToListAsync(),
IsSystemCriterion= trialCriterion.ReadingQuestionCriterionSystemId!=null,
IsSign = trialCriterion.ReadingInfoSignTime != null,
};
}
@ -285,7 +285,7 @@ namespace IRaCIS.Core.Application
&&x.ReadingCriterionPageId==null)
.ProjectTo<TrialReadQuestion>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync();
IsSystemCriterion = trialCriterion.ReadingQuestionCriterionSystemId != null;
return result;
}