From 4aa0161c4117035a37455d1538590d4884955a9a Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 12 Nov 2025 14:29:14 +0800 Subject: [PATCH] =?UTF-8?q?co=E8=A1=A8=20=E5=AF=BC=E5=87=BA=E8=B4=A8?= =?UTF-8?q?=E9=87=8F=E8=AF=84=E4=BC=B0=EF=BC=8C=E5=A4=87=E6=B3=A8=E6=98=AF?= =?UTF-8?q?=E7=A9=BA=E9=82=A3=E4=B9=88=E5=B0=B1=E5=BF=BD=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/Export/TumorExportService.cs | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs b/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs index dfd222892..885041ad3 100644 --- a/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs @@ -720,34 +720,47 @@ public class Tumor_CDISC_ExportService(IRepository 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 { - 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); + } + + + + } @@ -800,12 +813,12 @@ public class Tumor_CDISC_ExportService(IRepositoryt.IsOverallResponsePD==true)) + foreach (var rsPd in rsList.Where(t => t.IsOverallResponsePD == true)) { foreach (var item in rsList.Where(t => t.VisitTaskId == rsPd.VisitTaskId)) { item.IsOverallResponsePD = true; - } + } }