Compare commits

..

No commits in common. "8bbe424456481268ea679f41e710ccb16f1c6988" and "c49bd189b630bbde63d6b583ead5b10b20621937" have entirely different histories.

1 changed files with 12 additions and 22 deletions

View File

@ -3245,30 +3245,20 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var questionName = await _dbContext.ReadingQuestionTrial.Where(x => x.Id == entity.QuestionId).Select(x => _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName).FirstOrDefaultAsync(); var questionName = await _dbContext.ReadingQuestionTrial.Where(x => x.Id == entity.QuestionId).Select(x => _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName).FirstOrDefaultAsync();
var liverSegmentation = await _dbContext.ReadingTableQuestionAnswer.Where(x => x.RowId == entity.RowId && x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.liverSegmentation).Select(x => x.Answer).FirstOrDefaultAsync(); var liverSegmentation = await _dbContext.ReadingTableQuestionAnswer.Where(x => x.RowId == entity.RowId && x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.liverSegmentation).Select(x => x.Answer).FirstOrDefaultAsync();
var generalId=new Guid(); await InsertInspection<ReadingTaskQuestionMark>(entity, type, x => new InspectionConvertDTO()
if (entity.TableQuestionId == null && entity.QuestionId == null)
{ {
generalId = entity.Id; VisitTaskId = entity.VisitTaskId,
} GeneralId = IdentifierHelper.CreateGuid(entity.VisitTaskId.ToString(), entity.QuestionId.ToString(), entity.TableQuestionId.ToString()),
else ObjectRelationParentId = entity.VisitTaskId,
}, new
{ {
generalId = IdentifierHelper.CreateGuid(entity.VisitTaskId.ToString(), entity.QuestionId.ToString(), entity.TableQuestionId.ToString()); QuestionName = questionName,
} RowMark = rowMark,
TableQuestionName = tableQuestionName,
await InsertInspection<ReadingTaskQuestionMark>(entity, type, x => new InspectionConvertDTO() Answer = answer,
{ LiverSegmentation = liverSegmentation,
VisitTaskId = entity.VisitTaskId, }, _userInfo.AuditIdentification);
GeneralId = generalId,
ObjectRelationParentId = entity.VisitTaskId,
}, new
{
QuestionName = questionName,
RowMark = rowMark,
TableQuestionName = tableQuestionName,
Answer = answer,
LiverSegmentation = liverSegmentation,
}, _userInfo.AuditIdentification);
} }