XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改融合
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
he 2025-12-25 13:21:03 +08:00
parent 9ec53e39ec
commit 5aaedffe20
2 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
View File

@ -1965,18 +1965,38 @@ 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))
{ {
Answer = "0", await _readingTableQuestionAnswerRepository.BatchUpdateNoTrackingAsync(x => inDto.MergeRowIdList.Contains(x.RowId) &&
}); (x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.MajorAxis || x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.ShortAxis), x => new ReadingTableQuestionAnswer()
{
Answer = "0",
await _readingTableAnswerRowInfoRepository.UpdatePartialFromQueryAsync(x => inDto.MergeRowIdList.Contains(x.Id), x => new ReadingTableAnswerRowInfo() });
}
else
{ {
MergeRowId = inDto.MergeMainRowId, await _readingTableQuestionAnswerRepository.BatchUpdateNoTrackingAsync(x => inDto.MergeRowIdList.Contains(x.RowId) &&
SplitOrMergeType = SplitOrMergeType.Merge, 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()
{
MergeRowId = inDto.MergeMainRowId,
SplitOrMergeType = SplitOrMergeType.Merge,
});
await _readingTableAnswerRowInfoRepository.BatchUpdateNoTrackingAsync(x=>x.Id== inDto.MergeMainRowId, x => new ReadingTableAnswerRowInfo() await _readingTableAnswerRowInfoRepository.BatchUpdateNoTrackingAsync(x=>x.Id== inDto.MergeMainRowId, x => new ReadingTableAnswerRowInfo()
{ {

4
IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
View File

@ -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 &&