From 59ecaaa5a72e620ff23e653561b6498a7cce1ec4 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Fri, 29 Aug 2025 10:49:16 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=B3=E9=94=AE?=
 =?UTF-8?q?=E5=B8=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Visit/SubjectVisitService.cs      | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
index 67a57d78e..7c423347e 100644
--- a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
@@ -664,19 +664,23 @@ namespace IRaCIS.Core.Application.Services
                     {
                         studyList.Insert(0, keySeries);
                     }
-
-                 
-
-
-
-                    studyList.ForEach(x =>
+                    else 
                     {
-                        x.SeriesList.ForEach(y =>
-                        {
-                            y.IsBeMark = rowInfoList.Any(z => z.SeriesId == y.Id);
-                        });
+                        studyList.Insert(0, new VisitStudyDTO() { });
+                    }
 
-                    });
+
+
+
+
+                        studyList.ForEach(x =>
+                        {
+                            x.SeriesList.ForEach(y =>
+                            {
+                                y.IsBeMark = rowInfoList.Any(z => z.SeriesId == y.Id);
+                            });
+
+                        });
                 }
 
 

From 6ed0ea76da84e007cddbce4a9498893477b88313 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Fri, 29 Aug 2025 10:50:09 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
index 7c423347e..7bc6db093 100644
--- a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
@@ -666,7 +666,7 @@ namespace IRaCIS.Core.Application.Services
                     }
                     else 
                     {
-                        studyList.Insert(0, new VisitStudyDTO() { });
+                        studyList.Insert(0, new VisitStudyDTO() { StudyId= default(Guid) });
                     }
 
 

From baffb0bb35b0a5c0be71456d98377a51ed5ad888 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Fri, 29 Aug 2025 10:51:28 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Visit/SubjectVisitService.cs                 | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
index 7bc6db093..4ed21a612 100644
--- a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
@@ -437,7 +437,7 @@ namespace IRaCIS.Core.Application.Services
         /// <param name="indto"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<VisitStudyDTO?> GetKeySeries(GetReadingVisitStudyListIndto indto)
+        public async Task<VisitStudyDTO> GetKeySeries(GetReadingVisitStudyListIndto indto)
         {
             var rowInfoList = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == indto.VisitTaskId && x.StudyId != null).OrderBy(x => x.ReadingQuestionTrial.ShowOrder).ThenBy(x => x.RowIndex).Select(x => new StudyInstanceInfo()
             {
@@ -542,7 +542,7 @@ namespace IRaCIS.Core.Application.Services
                 }
             }
 
-            return null;
+            return new VisitStudyDTO() { StudyId= default(Guid) };
         }
 
         /// <summary>
@@ -664,10 +664,7 @@ namespace IRaCIS.Core.Application.Services
                     {
                         studyList.Insert(0, keySeries);
                     }
-                    else 
-                    {
-                        studyList.Insert(0, new VisitStudyDTO() { StudyId= default(Guid) });
-                    }
+                  
 
 
 

From 5975004858ebc409168dc51e14cb3cfee9fd4d2d Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Fri, 29 Aug 2025 11:36:07 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/IRaCIS.Core.Application.xml          | 2 +-
 IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 94b5168e3..a6f8a7ba2 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -13604,7 +13604,7 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.HospitalGroupService.GetGAUserList">
+        <member name="M:IRaCIS.Core.Application.Service.HospitalGroupService.GetGAUserList(System.Guid)">
             <summary>
             GA用户列表
             </summary>
diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
index 4ed21a612..f8d80e7d0 100644
--- a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
@@ -664,7 +664,8 @@ namespace IRaCIS.Core.Application.Services
                     {
                         studyList.Insert(0, keySeries);
                     }
-                  
+                   
+
 
 
 
@@ -746,7 +747,7 @@ namespace IRaCIS.Core.Application.Services
 
 
 
-            var result = studyList.Where(x => x.SeriesCount > 0).ToList();
+            var result = studyList.Where(x => x.SeriesCount > 0||x.StudyId== default(Guid)).ToList();
 
             return result;