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

Merge branch 'Test_HIR_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_HIR_Net8
continuous-integration/drone/push Build was killed Details

Test_HIR_Net8
hang 2025-09-03 15:42:32 +08:00
parent d954d13f81 c9e12993a6
commit 0245aaf7ad
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -299,6 +299,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
tableRowAnswers.ForEach(x => tableRowAnswers.ForEach(x =>
{ {
x.ReportMark = x.RowMark;
x.VisitTaskId = visitTaskId; x.VisitTaskId = visitTaskId;
x.IsCurrentTaskAdd = false; x.IsCurrentTaskAdd = false;
x.FristAddTaskId = x.FristAddTaskId == beforeConvertedTaskId ? visitTaskId : x.FristAddTaskId; x.FristAddTaskId = x.FristAddTaskId == beforeConvertedTaskId ? visitTaskId : x.FristAddTaskId;
@ -377,14 +378,16 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
if (needRowIds.Contains(x.Id)) if (needRowIds.Contains(x.Id))
{ {
index++; index++;
x.RowIndex = index;
x.RowMark = otherLesionQuestion.OrderMark + x.RowIndex.GetLesionMark();
var fristAddTaskId = x.FristAddTaskId.Clone(); var fristAddTaskId = x.FristAddTaskId.Clone();
x.RowIndex = index;
x.FromMark = fristAddTaskId == beforeConvertedTaskId ? string.Empty : x.RowMark; x.FromMark = fristAddTaskId == beforeConvertedTaskId ? string.Empty : x.RowMark;
x.RowMark = otherLesionQuestion.OrderMark + x.RowIndex.GetLesionMark();
x.FristAddTaskId = fristAddTaskId == beforeConvertedTaskId ? visitTaskId : fristAddTaskId; x.FristAddTaskId = fristAddTaskId == beforeConvertedTaskId ? visitTaskId : fristAddTaskId;
x.QuestionId = otherLesionQuestion.Id; x.QuestionId = otherLesionQuestion.Id;
x.OrderMark = otherLesionQuestion.OrderMark; x.OrderMark = otherLesionQuestion.OrderMark;
x.ReportMark = x.RowMark;
} }