From 38d9a21a5d327f9dac9c56598d8d3781c3ff2609 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 3 Dec 2025 11:33:11 +0800
Subject: [PATCH 1/4] =?UTF-8?q?lugano=20=E6=95=B4=E4=BD=93=E8=82=BF?=
 =?UTF-8?q?=E7=98=A4pd?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Common/Export/TumorExportService.cs        | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs b/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs
index 124df9c38..0e02f1918 100644
--- a/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs
+++ b/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs
@@ -763,7 +763,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
 
                 #endregion
 
-                #region rs 处理部分 只有非基线
+                #region rs 处理部分 只有非基线处理PD
 
                 //非基线
                 if (task.VisitNum > 0)
@@ -773,18 +773,24 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
 
                     List<RSValueEnum> rsValueList = new List<RSValueEnum>();
 
+                    var overallPD = "";
+
                     if (criterion.CriterionType == CriterionType.RECIST1Point1)
                     {
                         rsValueTypeIndex = Get_Resist_RS_VisitFixed_Index(task, questionAnswer);
 
                         rsValueList = RESIST_RSFixed.RSValueList;
 
+                        overallPD = "PD"; 
+
                     }
                     else if (criterion.CriterionType == CriterionType.Lugano2014)
                     {
                         rsValueTypeIndex = Get_Lugano_RS_VisitFixed_Index(task, questionAnswer);
 
                         rsValueList = Lugano_RSFixed.RSValueList;
+
+                        overallPD = "PMD/PD";
                     }
 
 
@@ -812,7 +818,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
 
                             rs.IsOveralResponse = true;
 
-                            rs.IsOverallResponsePD = rs.RespondEfficacyAssessment == "PD";
+                            rs.IsOverallResponsePD = rs.RespondEfficacyAssessment == overallPD;
 
                         }
 

From 7941328a29347a6267f27d296a20651cc2dbdcad Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 3 Dec 2025 13:29:27 +0800
Subject: [PATCH 2/4] CDISC followUp

---
 .../Service/Common/Export/TumorExportService.cs                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs b/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs
index 0e02f1918..21a563927 100644
--- a/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs
+++ b/IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs
@@ -261,7 +261,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
             SourceSubjectVisitId = t.SourceSubjectVisitId,
             VisitTaskNum = t.VisitTaskNum,
             VisitNum = t.VisitTaskNum,
-            VisitName = t.SourceSubjectVisit.VisitName,
+            VisitName = t.TaskBlindName, //t.SourceSubjectVisit.VisitName,
             EarliestScanDate = t.SourceSubjectVisit.EarliestScanDate,
             LatestScanDate = t.SourceSubjectVisit.LatestScanDate,
             VisitTaskId = t.Id,

From 296459d38a7ca24adb526748a5d5a8a196b4144a Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 3 Dec 2025 13:55:12 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=85=A8=E9=87=8F=E4=B8=80=E8=87=B4?=
 =?UTF-8?q?=E6=80=A7=E6=A0=B8=E6=9F=A5=E9=BB=98=E8=AE=A4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/Service/QC/QCListService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/QC/QCListService.cs b/IRaCIS.Core.Application/Service/QC/QCListService.cs
index e1ba9fcac..26ff00d8f 100644
--- a/IRaCIS.Core.Application/Service/QC/QCListService.cs
+++ b/IRaCIS.Core.Application/Service/QC/QCListService.cs
@@ -772,7 +772,7 @@ namespace IRaCIS.Core.Application.Image.QA
             var query = _inspectionFileRepository.Where(t => t.TrialId == inQuery.TrialId && (t.CheckState == EDCCheckState.Success || t.CheckState == EDCCheckState.Failed))
              .ProjectTo<GetUserUploadFileDto>(_mapper.ConfigurationProvider);
 
-            return await query.ToPagedListAsync(inQuery);
+            return await query.ToPagedListAsync(inQuery,nameof(GetUserUploadFileDto.CreateTime));
         }
 
 

From 647aee010aed6f33e8be830fac20748ec3ace278 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 3 Dec 2025 15:12:04 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=B5=8B=E5=80=BC=E6=8B=B7=E8=B4=9D?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index fc880f9fb..8fea1bdf1 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -2216,7 +2216,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
 
     private void CopyForms(VisitTask newTask, VisitTask origenalTask)
     {
-
+        newTask.IsCopyLesionAnswer = true;
         //自定义
         //var readingCustomTagList = _readingCustomTagRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList();