From 80c026d5b238fbf2b6f2b549b50d937e198e7aa6 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 16 Jun 2025 15:58:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9CDISC=20=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Common/ExcelExportService.cs      | 51 ++++++++++++-------
 1 file changed, 34 insertions(+), 17 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
index 80431f3b8..0d724290e 100644
--- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
+++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
@@ -2958,6 +2958,23 @@ namespace IRaCIS.Core.Application.Service.Common
                             }
 
                         }
+
+                        dynamicColumnConfig = new DynamicColumnConfig()
+                        {
+                            AutoColumnTitleRowIndex = 1,
+                            AutoColumnStartIndex = 6,
+                            TempalteLastColumnIndex = 10,
+                            DynamicItemDicName = "TranslateDicName",
+                            DynamicItemValueName = "QuestionValue",
+                            DynamicItemTitleName = "QuestionName",
+                            DynamicItemTitleId = "QuestionId",
+                            DynamicListName = "QuestionAnswerList",
+                            RemoveColunmIndexList = removeColumnIndexList,
+                            ColumnIdNameList = configCoumNameList,
+                            IsCDISCExport = true,
+                            //CDISCList = cdiscCodeList,
+                            TranslateDicNameList = translateDicNameList
+                        };
                     }
                     else
                     {
@@ -3027,27 +3044,27 @@ namespace IRaCIS.Core.Application.Service.Common
 
                         }
 
-
+                        dynamicColumnConfig = new DynamicColumnConfig()
+                        {
+                            AutoColumnTitleRowIndex = 1,
+                            AutoColumnStartIndex = 6,
+                            TempalteLastColumnIndex = 15,
+                            DynamicItemDicName = "TranslateDicName",
+                            DynamicItemValueName = "QuestionValue",
+                            DynamicItemTitleName = "QuestionName",
+                            DynamicItemTitleId = "QuestionId",
+                            DynamicListName = "QuestionAnswerList",
+                            RemoveColunmIndexList = removeColumnIndexList,
+                            ColumnIdNameList = configCoumNameList,
+                            IsCDISCExport = true,
+                            //CDISCList = cdiscCodeList,
+                            TranslateDicNameList = translateDicNameList
+                        };
                     }
 
 
 
-                    dynamicColumnConfig = new DynamicColumnConfig()
-                    {
-                        AutoColumnTitleRowIndex = 1,
-                        AutoColumnStartIndex = 6,
-                        TempalteLastColumnIndex = 15,
-                        DynamicItemDicName = "TranslateDicName",
-                        DynamicItemValueName = "QuestionValue",
-                        DynamicItemTitleName = "QuestionName",
-                        DynamicItemTitleId = "QuestionId",
-                        DynamicListName = "QuestionAnswerList",
-                        RemoveColunmIndexList = removeColumnIndexList,
-                        ColumnIdNameList = configCoumNameList,
-                        IsCDISCExport = true,
-                        //CDISCList = cdiscCodeList,
-                        TranslateDicNameList = translateDicNameList
-                    };
+
 
                 }
                 else

From 01621511f1fb9425aa5f742055113db265f0b713 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 16 Jun 2025 16:03:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=9A=8F=E6=9C=BA=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F-5?=
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 e2538ee6e..0dab0ba1e 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -763,7 +763,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
            .WhereIf(inQuery.BeginSignTime != null, t => t.SignTime > inQuery.BeginSignTime)
            .WhereIf(inQuery.EndSignTime != null, t => t.SignTime < inQuery.EndSignTime)
             .WhereIf(inQuery.RandomOrder != null, t => t.RandomOrder == inQuery.RandomOrder)
-             .WhereIf(inQuery.IsRandomOrderList == true, t => t.ReadingTaskState==ReadingTaskState.WaitReading && t.TaskAllocationState==TaskAllocationState.Allocated)
+             .WhereIf(inQuery.IsRandomOrderList == true, t => (t.ReadingTaskState == ReadingTaskState.WaitReading || t.ReadingTaskState==ReadingTaskState.Reading) && t.TaskAllocationState==TaskAllocationState.Allocated)
            .ProjectTo<ReadingTaskView>(_mapper.ConfigurationProvider);
 
         var defalutSortArray = new string[] { nameof(ReadingTaskView.IsUrgent) + " desc", nameof(ReadingTaskView.SubjectCode), nameof(ReadingTaskView.VisitTaskNum) };