From bb35ae1b9a7972efb50321f828e97d38b03b86de Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 12 Nov 2025 13:38:08 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BE=93=E5=87=BA?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Common/Export/TumorExportService.cs      | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs b/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs
index d9c286224..dfd222892 100644
--- a/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs
+++ b/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs
@@ -726,7 +726,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
                     switch (questionAnswer.QuestionType)
                     {
                         case QuestionType.ImageQualityAssessment:
-                            co.RemarksQuote = $"{co.ArmEnumStr}__QUALITY";
+                            co.RemarksQuote = $"{co.ArmEnumStr}_QUALITY";
                             break;
                         case QuestionType.ImageQualityProblem:
                             co.RemarksQuote = $"{co.ArmEnumStr}_QUALITY_ISSUE";
@@ -796,9 +796,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();
 
+        //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表只取最新的一次全局
         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()))
         {

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 2/3] =?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<ReadingQuestionCriterionTrial
                     questionAnswer.QuestionType == QuestionType.ImageQualityProblem ||
                     questionAnswer.QuestionType == QuestionType.ImageQualityProblemComment)
                 {
-                    var co = CreatNewCOExport(task, coList.Count + 1);
 
 
+                    var remarkQuote = string.Empty;
+                    var remark = string.Empty;
+
                     switch (questionAnswer.QuestionType)
                     {
                         case QuestionType.ImageQualityAssessment:
-                            co.RemarksQuote = $"{co.ArmEnumStr}_QUALITY";
+                            remarkQuote = $"{task.ArmEnumStr}_QUALITY";
                             break;
                         case QuestionType.ImageQualityProblem:
-                            co.RemarksQuote = $"{co.ArmEnumStr}_QUALITY_ISSUE";
+                            remarkQuote = $"{task.ArmEnumStr}_QUALITY_ISSUE";
                             break;
                         case QuestionType.ImageQualityProblemComment:
-                            co.RemarksQuote = $"{co.ArmEnumStr}_QUALITY_COMMETS";
+                            remarkQuote = $"{task.ArmEnumStr}_QUALITY_COMMETS";
                             break;
                     }
 
                     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
                     {
-                        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(IRepository<ReadingQuestionCriterionTrial
 
 
 
-        foreach (var rsPd in rsList.Where(t=>t.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;
-            }         
+            }
         }
 
 

From 3ea2bdfc92bb275523baf688ce73986883b90be8 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 12 Nov 2025 15:14:29 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A3=81=E5=88=A4?=
 =?UTF-8?q?=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Common/Export/TumorExportService.cs       | 46 +++++++++++++++----
 1 file changed, 37 insertions(+), 9 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs b/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs
index 885041ad3..cf4f60a68 100644
--- a/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs
+++ b/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs
@@ -414,6 +414,34 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
 
             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;
             }
 
@@ -791,16 +819,16 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
 
             }
 
-            if (task.IsTrigerJudge == true && task.IsJudgeSelect == true && task.JudgeNote.IsNotNullOrEmpty())
-            {
-                var co = CreatNewCOExport(task, coList.Count + 1);
+            //if (task.IsTrigerJudge == true && task.IsJudgeSelect == true && task.JudgeNote.IsNotNullOrEmpty())
+            //{
+            //    var co = CreatNewCOExport(task, coList.Count + 1);
 
-                co.RemarksQuote = $"{co.VisitName}_ADJUDICATION_COMMENTS";
-                co.Remarks = task.JudgeNote;
-                co.CODTC = task.JudgeSignTime?.ToString("yyyy-MM-dd");
+            //    co.RemarksQuote = $"{co.VisitName}_ADJUDICATION_COMMENTS";
+            //    co.Remarks = task.JudgeNote;
+            //    co.CODTC = task.JudgeSignTime?.ToString("yyyy-MM-dd");
 
-                coList.Add(co);
-            }
+            //    coList.Add(co);
+            //}
 
             #endregion
         }
@@ -1758,6 +1786,6 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
             }
 
         }
-        return resultExceptJudgeList;
+        return resultExceptJudgeList.Union(judegeList).ToList();
     }
 }