Uat_Study
parent
bebb76e51a
commit
f698d77719
|
@ -150,8 +150,9 @@ namespace IRaCIS.Application.Services
|
|||
//_userInfo.UserTypeId
|
||||
|
||||
return await _trialDocumentRepository.Where(x => x.TrialId == inDto.TrialId
|
||||
&&x.TrialDocConfirmedUserList.Any(y=>y.ConfirmUserId== _userInfo.Id)
|
||||
&& x.TrialDocConfirmedUserList.Any(y => y.ConfirmUserId == _userInfo.Id)
|
||||
&& x.NeedConfirmedUserTypeList.Any(y => y.NeedConfirmUserTypeId == _userInfo.UserTypeId))
|
||||
.Where(t => t.FileType.Code == "2" || t.FileType.Code == "6")
|
||||
.Select(x => new GetManualListOutDto()
|
||||
{
|
||||
Id=x.Id,
|
||||
|
@ -1141,11 +1142,14 @@ namespace IRaCIS.Application.Services
|
|||
QuestionMark.Part,
|
||||
};
|
||||
|
||||
orders.ForEach(x =>
|
||||
foreach (var x in orders)
|
||||
{
|
||||
Dictionary<string, string> answers = new Dictionary<string, string>();
|
||||
var rowInfo = tableAnsweRowInfos.Where(y => y.RowIndex == x && y.QuestionId == item.Id).FirstOrDefault();
|
||||
|
||||
var rowInfo = tableAnsweRowInfos.First(y => y.RowIndex == x && y.QuestionId == item.Id);
|
||||
if (rowInfo == null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
var rowAnswer = thisAnswer.Where(y => y.RowId == rowInfo.Id).OrderBy(y => y.ShowOrder).ToList();
|
||||
|
||||
|
@ -1244,7 +1248,7 @@ namespace IRaCIS.Application.Services
|
|||
|
||||
|
||||
item.TableQuestions.Answers.Add(answers);
|
||||
});
|
||||
};
|
||||
|
||||
if (item.Childrens != null && item.Childrens.Count != 0)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue