修改融合
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
9ec53e39ec
commit
5aaedffe20
|
|
@ -1965,11 +1965,31 @@ namespace IRaCIS.Core.Application.Service
|
||||||
{
|
{
|
||||||
Answer = TargetState.Loss.GetEnumInt(),
|
Answer = TargetState.Loss.GetEnumInt(),
|
||||||
});
|
});
|
||||||
|
var isLymph = ReadingYesOrNo.Yes.GetEnumInt();
|
||||||
await _readingTableQuestionAnswerRepository.BatchUpdateNoTrackingAsync(x => inDto.MergeRowIdList.Contains(x.RowId) && (x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.MajorAxis || x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.ShortAxis), x => new ReadingTableQuestionAnswer()
|
//淋巴结的长短经 为0 非淋巴的 长径为空 短径为0
|
||||||
|
if (await _readingTableQuestionAnswerRepository.AnyAsync(x => inDto.MergeRowIdList.Contains(x.RowId) && x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.IsLymph && x.Answer == isLymph))
|
||||||
|
{
|
||||||
|
await _readingTableQuestionAnswerRepository.BatchUpdateNoTrackingAsync(x => inDto.MergeRowIdList.Contains(x.RowId) &&
|
||||||
|
(x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.MajorAxis || x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.ShortAxis), x => new ReadingTableQuestionAnswer()
|
||||||
{
|
{
|
||||||
Answer = "0",
|
Answer = "0",
|
||||||
});
|
});
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
await _readingTableQuestionAnswerRepository.BatchUpdateNoTrackingAsync(x => inDto.MergeRowIdList.Contains(x.RowId) &&
|
||||||
|
x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.ShortAxis, x => new ReadingTableQuestionAnswer()
|
||||||
|
{
|
||||||
|
Answer = "0",
|
||||||
|
});
|
||||||
|
|
||||||
|
await _readingTableQuestionAnswerRepository.BatchUpdateNoTrackingAsync(x => inDto.MergeRowIdList.Contains(x.RowId) &&
|
||||||
|
x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.MajorAxis, x => new ReadingTableQuestionAnswer()
|
||||||
|
{
|
||||||
|
Answer = string.Empty,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
await _readingTableAnswerRowInfoRepository.UpdatePartialFromQueryAsync(x => inDto.MergeRowIdList.Contains(x.Id), x => new ReadingTableAnswerRowInfo()
|
await _readingTableAnswerRowInfoRepository.UpdatePartialFromQueryAsync(x => inDto.MergeRowIdList.Contains(x.Id), x => new ReadingTableAnswerRowInfo()
|
||||||
|
|
|
||||||
|
|
@ -252,6 +252,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
||||||
|
|
||||||
foreach (var item in tableRowList)
|
foreach (var item in tableRowList)
|
||||||
{
|
{
|
||||||
|
if (item.SplitOrMergeType == SplitOrMergeType.Merged)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
var historyRow = historyTableRowList.Where(x =>
|
var historyRow = historyTableRowList.Where(x =>
|
||||||
x.QuestionId == item.QuestionId &&
|
x.QuestionId == item.QuestionId &&
|
||||||
x.RowIndex == item.RowIndex &&
|
x.RowIndex == item.RowIndex &&
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue