From ed5f8e8d9c6b8c24fd12c7d6aba97b268ca297e3 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 1 Sep 2025 14:55:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=BB=91=E5=AE=9A=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRC.Core.SCP/Service/PatientStudyService.cs | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/IRC.Core.SCP/Service/PatientStudyService.cs b/IRC.Core.SCP/Service/PatientStudyService.cs
index f41366145..a809fd90c 100644
--- a/IRC.Core.SCP/Service/PatientStudyService.cs
+++ b/IRC.Core.SCP/Service/PatientStudyService.cs
@@ -78,7 +78,26 @@ namespace IRaCIS.Core.SCP.Service
 
             //3、 未提交的最小的访视号  从这个访视开始绑定
 
-            var subjectMaxVisitNum = startBindVisitNum == null ? subjectAllVisitList.Where(t => t.SubmitState != SubmitStateEnum.Submitted).MinOrDefault(t => t.VisitNum) : startBindVisitNum.Value;
+            decimal subjectMaxVisitNum = 0;
+
+            if (startBindVisitNum == null)
+            {
+                if (subjectAllVisitList.Any(t => t.SubmitState != SubmitStateEnum.Submitted))
+                {
+                    subjectMaxVisitNum = subjectAllVisitList.Where(t => t.SubmitState != SubmitStateEnum.Submitted).MinOrDefault(t => t.VisitNum);
+                }
+                else
+                {
+                    //没有未提交的，那么开始绑定的就是已提交的加1
+                    subjectMaxVisitNum = subjectAllVisitList.Last().VisitNum + 1;
+                }
+            }
+            else
+            {
+                subjectMaxVisitNum = startBindVisitNum.Value;
+            }
+
+            //var subjectMaxVisitNum = startBindVisitNum == null ? subjectAllVisitList.Where(t => t.SubmitState != SubmitStateEnum.Submitted).MinOrDefault(t => t.VisitNum) : startBindVisitNum.Value;
 
 
             List<(int VisitCount, Guid SCPStudyId)> visits = new List<(int, Guid)>();