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] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A3=81=E5=88=A4=E5=A4=87?=
 =?UTF-8?q?=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();
     }
 }