修改稽查
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
91e7d04e4d
commit
064101b155
|
|
@ -1978,7 +1978,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
SplitOrMergeType = SplitOrMergeType.Merge,
|
SplitOrMergeType = SplitOrMergeType.Merge,
|
||||||
});
|
});
|
||||||
|
|
||||||
await _readingTableAnswerRowInfoRepository.UpdatePartialFromQueryAsync(inDto.MergeMainRowId, x => new ReadingTableAnswerRowInfo()
|
await _readingTableAnswerRowInfoRepository.BatchUpdateNoTrackingAsync(x=>x.Id== inDto.MergeMainRowId, x => new ReadingTableAnswerRowInfo()
|
||||||
{
|
{
|
||||||
SplitOrMergeType = SplitOrMergeType.MergeMain,
|
SplitOrMergeType = SplitOrMergeType.MergeMain,
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -3896,12 +3896,19 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
|
|
||||||
//if (_userInfo.RequestUrl == " ReadingImageTask/splitLesion")
|
//if (_userInfo.RequestUrl == " ReadingImageTask/splitLesion")
|
||||||
var originalRowMark = string.Empty;
|
var originalRowMark = string.Empty;
|
||||||
|
var mergeRowMark = string.Empty;
|
||||||
if (entity.SplitRowId != null)
|
if (entity.SplitRowId != null)
|
||||||
{
|
{
|
||||||
|
|
||||||
originalRowMark = await _dbContext.ReadingTableAnswerRowInfo.Where(t => t.Id == entity.SplitRowId).Select(t => t.RowMark).FirstOrDefaultAsync();
|
originalRowMark = await _dbContext.ReadingTableAnswerRowInfo.Where(t => t.Id == entity.SplitRowId).Select(t => t.RowMark).FirstOrDefaultAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (entity.MergeRowId != null)
|
||||||
|
{
|
||||||
|
|
||||||
|
mergeRowMark = await _dbContext.ReadingTableAnswerRowInfo.Where(t => t.Id == entity.MergeRowId).Select(t => t.RowMark).FirstOrDefaultAsync();
|
||||||
|
}
|
||||||
|
|
||||||
//处理标识 因为触发器在稽查后才进行操作
|
//处理标识 因为触发器在稽查后才进行操作
|
||||||
|
|
||||||
entity.OrderMark = await _dbContext.ReadingQuestionTrial.Where(x => x.Id == entity.QuestionId).Select(x => x.OrderMark).FirstOrDefaultAsync();
|
entity.OrderMark = await _dbContext.ReadingQuestionTrial.Where(x => x.Id == entity.QuestionId).Select(x => x.OrderMark).FirstOrDefaultAsync();
|
||||||
|
|
@ -3939,6 +3946,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
}, new
|
}, new
|
||||||
{
|
{
|
||||||
OriginalRowMark = originalRowMark,
|
OriginalRowMark = originalRowMark,
|
||||||
|
MergeRowMark= mergeRowMark,
|
||||||
//TableName = tableName,
|
//TableName = tableName,
|
||||||
QuestionAnswerList =
|
QuestionAnswerList =
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue