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 11:35:36 +08:00
parent 5fc53a1999
commit 12cb53b167
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
IRaCIS.Core.Application/Service/Common/Export/RESISTExportService.cs → IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs
View File

@ -383,7 +383,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
var dicNameList = taskList.SelectMany(t => t.QuestionAnswerList).Select(t => t.TranslateDicName) var dicNameList = taskList.SelectMany(t => t.QuestionAnswerList).Select(t => t.TranslateDicName)
.Union(taskList.SelectMany(t => t.LesionList).SelectMany(t => t.LessionAnswerList).Where(t => t.TranslateDicName.IsNotNullOrEmpty()).Select(c => c.TranslateDicName)) .Union(taskList.SelectMany(t => t.LesionList).SelectMany(t => t.LessionAnswerList).Where(t => t.TranslateDicName.IsNotNullOrEmpty()).Select(c => c.TranslateDicName))
.Union(new List<string>() { "ArmEnum", "ValueUnit", "GlobalAssessType" }) .Union(new List<string>() { "ArmEnum", "ValueUnit", "GlobalAssessType", "ImageQualityIssues" })
.Distinct().ToArray(); .Distinct().ToArray();
//翻译字典 //翻译字典
@ -424,6 +424,8 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
{ {
var visiTaskId = vTaskGroup.Key; var visiTaskId = vTaskGroup.Key;
var globalVisitName = tuList.Where(t => t.VisitNum == task.VisitNum - ReadingCommon.TaskNumDic[ReadingCategory.Global]).FirstOrDefault()?.VisitName ?? "";
var reason = vTaskGroup.FirstOrDefault()?.Answer ?? ""; var reason = vTaskGroup.FirstOrDefault()?.Answer ?? "";
var firstTuTask = tuList.FirstOrDefault(t => t.VisitTaskId == visiTaskId); var firstTuTask = tuList.FirstOrDefault(t => t.VisitTaskId == visiTaskId);
@ -433,7 +435,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
var co = CreatNewCOExport(task, coList.Count + 1); var co = CreatNewCOExport(task, coList.Count + 1);
co.RemarksQuote = $"{co.ArmEnumStr}_{co.TaskName}"; co.RemarksQuote = $"{co.ArmEnumStr}_{globalVisitName}_ GLOBAL_COMMENTS";
co.VisitNum = firstTuTask.VisitNum; co.VisitNum = firstTuTask.VisitNum;
@ -714,11 +716,25 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
#region co 处理部分 处理部分1 质量备注 #region co 处理部分 处理部分1 质量备注
if (questionAnswer.QuestionType == QuestionType.ImageQualityAssessment) if (questionAnswer.QuestionType == QuestionType.ImageQualityAssessment ||
questionAnswer.QuestionType == QuestionType.ImageQualityProblem ||
questionAnswer.QuestionType == QuestionType.ImageQualityProblemComment)
{ {
var co = CreatNewCOExport(task, coList.Count + 1); var co = CreatNewCOExport(task, coList.Count + 1);
co.RemarksQuote = $"{co.ArmEnumStr}_{co.TaskName}";
switch (questionAnswer.QuestionType)
{
case QuestionType.ImageQualityAssessment:
co.RemarksQuote = $"{co.ArmEnumStr}__QUALITY";
break;
case QuestionType.ImageQualityProblem:
co.RemarksQuote = $"{co.ArmEnumStr}_QUALITY_ISSUE";
break;
case QuestionType.ImageQualityProblemComment:
co.RemarksQuote = $"{co.ArmEnumStr}_QUALITY_COMMETS";
break;
}
if (questionAnswer.TranslateDicName.IsNotNullOrEmpty()) if (questionAnswer.TranslateDicName.IsNotNullOrEmpty())
{ {
@ -754,7 +770,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
co.RDOMAIN = "RS"; co.RDOMAIN = "RS";
co.IdentificationVariable = "RSSEQ"; co.IdentificationVariable = "RSSEQ";
co.Identification = rs_Tumor.RSSEQ.ToString(); co.Identification = rs_Tumor.RSSEQ.ToString();
co.RemarksQuote = $"{co.ArmEnumStr}_{co.VisitName}"; co.RemarksQuote = $"{co.ArmEnumStr}_VISIT_COMMENTS";
co.Remarks = task.VisitNote; co.Remarks = task.VisitNote;
coList.Add(co); coList.Add(co);
@ -766,7 +782,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
{ {
var co = CreatNewCOExport(task, coList.Count + 1); var co = CreatNewCOExport(task, coList.Count + 1);
co.RemarksQuote = $"{co.ArmEnumStr}_{co.VisitName}"; 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");

5
IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
View File

@ -2793,6 +2793,11 @@ public enum SUVChangeVSBaseline
/// </summary> /// </summary>
ImageQualityProblem = 67, ImageQualityProblem = 67,
/// <summary>
/// 影像质量问题备注
/// </summary>
ImageQualityProblemComment = 68,
/// <summary> /// <summary>
/// 斑块1-PAV /// 斑块1-PAV
/// </summary> /// </summary>