Uat_Study
he 2023-03-22 10:52:11 +08:00
parent bfea26342e
commit 2c8b90aa1b
3 changed files with 26 additions and 2 deletions

View File

@ -141,7 +141,7 @@ namespace IRaCIS.Application.Contracts
public DicDataTypeEnum DataTypeEnum { get; set; }
public CrterionDictionaryGroup CrterionDictionaryGroup { get; set; } = IRaCIS.Core.Domain.Share.CrterionDictionaryGroup.Genera;
public CrterionDictionaryGroup CrterionDictionaryGroup { get; set; } = IRaCIS.Core.Domain.Share.CrterionDictionaryGroup.General;
public bool IsEnumInt => System.Text.RegularExpressions.Regex.IsMatch(Code, @"^[-+]?\d*$") && DataTypeEnum== DicDataTypeEnum.Enum;

View File

@ -165,6 +165,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public string GlobalChangeAnswer { get; set; } = string.Empty;
public List<CrterionDictionaryGroup> CrterionDictionaryGroup { get; set; }
}

View File

@ -200,7 +200,29 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
});
}
return await service.GetReadingReportEvaluation(inDto);
var result = await service.GetReadingReportEvaluation(inDto);
// 这里统一处理字典
var dictionaryGroup = result.VisitTaskList.ToDictionary(x => x.VisitTaskId, x => x.CrterionDictionaryGroup);
result.TaskQuestions.ForEach(y =>
{
y.Answer.ForEach(z =>
{
try
{
z.CrterionDictionaryGroup = dictionaryGroup[z.VisitTaskId];
}
catch (Exception)
{
}
});
});
}
else
{