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

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

Test_IRC_Net8
he 2025-11-12 15:21:34 +08:00
parent 1d7b28e7f9 3ea2bdfc92
commit f6bcefd1e8
1 changed files with 68 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
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;
} }
@ -720,34 +748,47 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
questionAnswer.QuestionType == QuestionType.ImageQualityProblem || questionAnswer.QuestionType == QuestionType.ImageQualityProblem ||
questionAnswer.QuestionType == QuestionType.ImageQualityProblemComment) questionAnswer.QuestionType == QuestionType.ImageQualityProblemComment)
{ {
var co = CreatNewCOExport(task, coList.Count + 1);
var remarkQuote = string.Empty;
var remark = string.Empty;
switch (questionAnswer.QuestionType) switch (questionAnswer.QuestionType)
{ {
case QuestionType.ImageQualityAssessment: case QuestionType.ImageQualityAssessment:
co.RemarksQuote = $"{co.ArmEnumStr}__QUALITY"; remarkQuote = $"{task.ArmEnumStr}_QUALITY";
break; break;
case QuestionType.ImageQualityProblem: case QuestionType.ImageQualityProblem:
co.RemarksQuote = $"{co.ArmEnumStr}_QUALITY_ISSUE"; remarkQuote = $"{task.ArmEnumStr}_QUALITY_ISSUE";
break; break;
case QuestionType.ImageQualityProblemComment: case QuestionType.ImageQualityProblemComment:
co.RemarksQuote = $"{co.ArmEnumStr}_QUALITY_COMMETS"; remarkQuote = $"{task.ArmEnumStr}_QUALITY_COMMETS";
break; break;
} }
if (questionAnswer.TranslateDicName.IsNotNullOrEmpty()) if (questionAnswer.TranslateDicName.IsNotNullOrEmpty())
{ {
co.Remarks = translateDataList[questionAnswer.TranslateDicName].Where(t => t.Code.ToLower() == questionAnswer.QuestionValue?.ToLower()).Select(t => isEn_Us ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty; remark = translateDataList[questionAnswer.TranslateDicName].Where(t => t.Code.ToLower() == questionAnswer.QuestionValue?.ToLower()).Select(t => isEn_Us ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
} }
else else
{ {
co.Remarks = questionAnswer.QuestionValue; remark = questionAnswer.QuestionValue;
} }
co.CODTC = task.SignTime?.ToString("yyyy-MM-dd");
coList.Add(co); if (remark.IsNotNullOrEmpty())
{
var co = CreatNewCOExport(task, coList.Count + 1);
co.RemarksQuote = remarkQuote;
co.Remarks = remark;
co.CODTC = task.SignTime?.ToString("yyyy-MM-dd");
coList.Add(co);
}
} }
@ -778,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
} }
@ -796,9 +837,19 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
//var globalList = taskList.Where(t => t.ReadingCategory == ReadingCategory.Global).GroupBy(t => new { t.SubjectCode, t.ArmEnum }).Select(g => g.OrderByDescending(t => t.VisitNum).FirstOrDefault()).ToList(); //var globalList = taskList.Where(t => t.ReadingCategory == ReadingCategory.Global).GroupBy(t => new { t.SubjectCode, t.ArmEnum }).Select(g => g.OrderByDescending(t => t.VisitNum).FirstOrDefault()).ToList();
//RS表 整体肿瘤评估了，其他病灶评估输出的也是最早的日期
foreach (var rsPd in rsList.Where(t => t.IsOverallResponsePD == true))
{
foreach (var item in rsList.Where(t => t.VisitTaskId == rsPd.VisitTaskId))
{
item.IsOverallResponsePD = true;
}
}
//全局会对每个访视的结果进行更改 rs表只取最新的一次全局 //全局会对每个访视的结果进行更改 rs表只取最新的一次全局
foreach (var task in taskList.Where(t => t.ReadingCategory == ReadingCategory.Global).GroupBy(t => new { t.SubjectCode, t.ArmEnum }).Select(g => g.OrderByDescending(t => t.VisitNum).FirstOrDefault())) foreach (var task in taskList.Where(t => t.ReadingCategory == ReadingCategory.Global).GroupBy(t => new { t.SubjectCode, t.ArmEnum }).Select(g => g.OrderByDescending(t => t.VisitNum).FirstOrDefault()))
{ {
@ -1735,6 +1786,6 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
} }
} }
return resultExceptJudgeList; return resultExceptJudgeList.Union(judegeList).ToList();
} }
} }