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
hang 2025-11-12 15:14:29 +08:00
parent 4aa0161c41
commit 3ea2bdfc92
1 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs
View File

@ -414,6 +414,34 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
if (task.ReadingCategory == ReadingCategory.Judge) if (task.ReadingCategory == ReadingCategory.Judge)
{ {
if (task.ReadingTaskState == ReadingTaskState.HaveSigned && task.JudgeNote.IsNotNullOrEmpty())
{
decimal num = 0;
if (arbitrationRule == ArbitrationRule.Visit)
{
num = ReadingCommon.TaskNumDic[ReadingCategory.Judge];
}
if (arbitrationRule == ArbitrationRule.Reading)
{
num = ReadingCommon.TaskNumDic[ReadingCategory.Judge] + ReadingCommon.TaskNumDic[ReadingCategory.Global];
}
var judgeVisitName = tuList.Where(t => t.VisitNum == task.VisitNum - num).FirstOrDefault()?.VisitName ?? "";
var co = CreatNewCOExport(task, coList.Count + 1);
co.RemarksQuote = $"{judgeVisitName}_ADJUDICATION_COMMENTS";
co.Remarks = task.JudgeNote;
co.VisitNum = co.VisitNum - num;
co.CODTC = task.JudgeSignTime?.ToString("yyyy-MM-dd");
coList.Add(co);
}
continue; continue;
} }
@ -791,16 +819,16 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
} }
if (task.IsTrigerJudge == true && task.IsJudgeSelect == true && task.JudgeNote.IsNotNullOrEmpty()) //if (task.IsTrigerJudge == true && task.IsJudgeSelect == true && task.JudgeNote.IsNotNullOrEmpty())
{ //{
var co = CreatNewCOExport(task, coList.Count + 1); // var co = CreatNewCOExport(task, coList.Count + 1);
co.RemarksQuote = $"{co.VisitName}_ADJUDICATION_COMMENTS"; // co.RemarksQuote = $"{co.VisitName}_ADJUDICATION_COMMENTS";
co.Remarks = task.JudgeNote; // co.Remarks = task.JudgeNote;
co.CODTC = task.JudgeSignTime?.ToString("yyyy-MM-dd"); // co.CODTC = task.JudgeSignTime?.ToString("yyyy-MM-dd");
coList.Add(co); // coList.Add(co);
} //}
#endregion #endregion
} }
@ -1758,6 +1786,6 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
} }
} }
return resultExceptJudgeList; return resultExceptJudgeList.Union(judegeList).ToList();
} }
} }