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; - } + } }