Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api
commit
bed0b41789
|
@ -125,6 +125,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
|||
|
||||
|
||||
|
||||
|
||||
//List<string> trialDics = new List<string>();
|
||||
//var dictionaryIds = new List<Guid>();
|
||||
//if (entity.TrialDicList == null || entity.TrialDicList.Count == 0)
|
||||
|
@ -266,6 +267,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
|||
dicValueList = await _dbContext.Dictionary.Where(t => dicIdList.Contains(t.Id)).Select(t => t.Value).ToListAsync();
|
||||
}
|
||||
|
||||
// 附加评估
|
||||
|
||||
var addtionalAssesementList = await _dbContext.TrialCriterionAdditionalAssessmentType.Where(t => t.TrialReadingCriterionId == entity.Id && t.IsSelected != null)
|
||||
.Select(t => new { t.AdditionalAssessmentType, t.IsSelected }).ToListAsync();
|
||||
|
||||
|
||||
await InsertInspection<ReadingQuestionCriterionTrial>(entity, type, x => new InspectionConvertDTO()
|
||||
{
|
||||
|
@ -279,7 +285,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
|||
|
||||
}, new
|
||||
{
|
||||
EvaluationResultTypes = dicValueList.Count > 0 ? string.Join(",", dicValueList) : string.Empty
|
||||
EvaluationResultTypes = dicValueList.Count > 0 ? string.Join(",", dicValueList) : string.Empty,
|
||||
AdditionalAssessmentTypeList= addtionalAssesementList
|
||||
});
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue