+29
-5
@@ -2281,11 +2281,35 @@ namespace IRaCIS.Core.Application.Service
|
||||
}
|
||||
else
|
||||
{
|
||||
var newMark = _mapper.Map<QuestionMarkInfo, ReadingTaskQuestionMark>(item);
|
||||
newMark.Id = NewId.NextGuid();
|
||||
newMark.VisitTaskId = inDto.VisitTaskId;
|
||||
newMark.FristAddTaskId = inDto.VisitTaskId;
|
||||
await _readingTaskQuestionMarkRepository.AddAsync(newMark);
|
||||
// 这种情况可能是绑定历史的标记
|
||||
|
||||
if (item.MarkId != null && (await _readingTaskQuestionMarkRepository.AnyAsync(x => x.VisitTaskId == inDto.VisitTaskId&& x.QuestionId == null && x.MarkId == item.MarkId)))
|
||||
{
|
||||
|
||||
var oldMarkItem = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.MarkId == item.MarkId && x.QuestionId == null).FirstOrDefaultAsync();
|
||||
|
||||
await _readingTaskQuestionMarkRepository.UpdatePartialFromQueryAsync(x => x.Id == oldMarkItem.Id, x => new ReadingTaskQuestionMark()
|
||||
{
|
||||
QuestionId = item.QuestionId,
|
||||
TableQuestionId = item.TableQuestionId,
|
||||
RowId = item.RowId,
|
||||
MeasureData = item.MeasureData ?? string.Empty,
|
||||
OtherMeasureData = item.OtherMeasureData ?? string.Empty,
|
||||
PicturePath = item.PicturePath ?? string.Empty,
|
||||
OtherPicturePath = item.OtherPicturePath ?? string.Empty,
|
||||
MarkTool = item.MarkTool ?? string.Empty,
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
var newMark = _mapper.Map<QuestionMarkInfo, ReadingTaskQuestionMark>(item);
|
||||
newMark.Id = NewId.NextGuid();
|
||||
newMark.VisitTaskId = inDto.VisitTaskId;
|
||||
newMark.FristAddTaskId = inDto.VisitTaskId;
|
||||
await _readingTaskQuestionMarkRepository.AddAsync(newMark);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user