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

Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

Uat_Study
he 2023-05-23 14:55:27 +08:00
parent 4859fd301a 957c85d641
commit bed0b41789
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -125,6 +125,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
//List<string> trialDics = new List<string>(); //List<string> trialDics = new List<string>();
//var dictionaryIds = new List<Guid>(); //var dictionaryIds = new List<Guid>();
//if (entity.TrialDicList == null || entity.TrialDicList.Count == 0) //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(); 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() await InsertInspection<ReadingQuestionCriterionTrial>(entity, type, x => new InspectionConvertDTO()
{ {
@ -279,7 +285,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
}, new }, new
{ {
EvaluationResultTypes = dicValueList.Count > 0 ? string.Join(",", dicValueList) : string.Empty EvaluationResultTypes = dicValueList.Count > 0 ? string.Join(",", dicValueList) : string.Empty,
AdditionalAssessmentTypeList= addtionalAssesementList
}); });
} }