From 217df5dc2fd1c0148cba1e53f28b19e4784f0126 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 2 Sep 2025 14:07:09 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Visit/DTO/ClinicalStudySubjects.cs                 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Visit/DTO/ClinicalStudySubjects.cs b/IRaCIS.Core.Application/Service/Visit/DTO/ClinicalStudySubjects.cs
index 65333b6cd..093bcf400 100644
--- a/IRaCIS.Core.Application/Service/Visit/DTO/ClinicalStudySubjects.cs
+++ b/IRaCIS.Core.Application/Service/Visit/DTO/ClinicalStudySubjects.cs
@@ -49,7 +49,8 @@ namespace IRaCIS.Application.Contracts
 
         [NotDefault]
         public Guid TrialId { get; set; }
-        [NotDefault]
+
+
         public Guid TrialSiteId { get; set; }
 
         public SubjectStatus Status { get; set; }

From ff0662867ef8c6298f97ce078a52419a5cae390f Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 2 Sep 2025 16:04:58 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC,=E8=BF=94=E5=9B=9E=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Management/DTO/UserModel.cs            | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs b/IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs
index 414c9fa15..9246de335 100644
--- a/IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs
+++ b/IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs
@@ -81,7 +81,7 @@ namespace IRaCIS.Application.Contracts
         public bool IsUserRoleDisabled { get; set; }
     }
 
-    public class UserBasicInfo
+    public class UserBasicInfo: UserInfo
     {
         public List<HospitalGroupInfo> HospitalGroupList { get; set; }
 
@@ -91,16 +91,8 @@ namespace IRaCIS.Application.Contracts
         public bool IsMutiAccount => AccountList?.Count > 1;
         public List<UserAccountInfo> AccountList { get; set; }
 
-
-        public string UserName { get; set; } = string.Empty;
         public string FullName { get; set; } = string.Empty;
-        public int? Sex { get; set; } // 1-男  2-女
-        public string UserCode { get; set; }
-        public string EMail { get; set; }
-
-        public int Status { get; set; }
-        public bool IsTestUser { get; set; }
-        public bool IsZhiZhun { get; set; }
+      
         public bool IsFirstAdd { get; set; }
 
         public bool NeedChangePassWord { get; set; } = false;
@@ -256,7 +248,7 @@ namespace IRaCIS.Application.Contracts
 
         public Guid? Id { get; set; }
 
-        public List<UserAddUserType> UserRoleList { get; set; }
+        public List<UserAddUserType> UserRoleList { get; set; } = new List<UserAddUserType>();
 
         public List<UserHospitalGroupInfo> HospitalGroupList { get; set; } = new List<UserHospitalGroupInfo>();
 

From 2f69df7a83aa10dc12ea5e820e6d398c5ede7fd0 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 2 Sep 2025 16:50:50 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRC.Core.SCP/Service/PatientStudyService.cs             | 2 +-
 IRaCIS.Core.Application/IRaCIS.Core.Application.xml     | 7 +++++++
 IRaCIS.Core.Application/Service/Visit/PatientService.cs | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/IRC.Core.SCP/Service/PatientStudyService.cs b/IRC.Core.SCP/Service/PatientStudyService.cs
index a809fd90c..8b817ae22 100644
--- a/IRC.Core.SCP/Service/PatientStudyService.cs
+++ b/IRC.Core.SCP/Service/PatientStudyService.cs
@@ -89,7 +89,7 @@ namespace IRaCIS.Core.SCP.Service
                 else
                 {
                     //没有未提交的，那么开始绑定的就是已提交的加1
-                    subjectMaxVisitNum = subjectAllVisitList.Last().VisitNum + 1;
+                    subjectMaxVisitNum = subjectAllVisitList.Any() ? subjectAllVisitList.Last().VisitNum + 1 : 0;
                 }
             }
             else
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 13c97baf1..7ff383dc8 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -4234,6 +4234,13 @@
             <param name="digitPlaces"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.MRECISTHCCCalculateService.DownLoadTumorEvaluationStream(IRaCIS.Core.Application.Service.Reading.Dto.DownLoadReadReportInDto)">
+            <summary>
+            获取肿瘤评估报告
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.MRECISTHCCCalculateService.DownLoadReadReportStream(IRaCIS.Core.Application.Service.Reading.Dto.DownLoadReadReportInDto)">
             <summary>
             下载阅片报告
diff --git a/IRaCIS.Core.Application/Service/Visit/PatientService.cs b/IRaCIS.Core.Application/Service/Visit/PatientService.cs
index 430ed0e2e..22feb2f36 100644
--- a/IRaCIS.Core.Application/Service/Visit/PatientService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/PatientService.cs
@@ -1276,7 +1276,7 @@ namespace IRaCIS.Application.Services
                 else
                 {
                     //没有未提交的，那么开始绑定的就是已提交的加1
-                    subjectMaxVisitNum = subjectAllVisitList.Last().VisitNum + 1;
+                    subjectMaxVisitNum = subjectAllVisitList.Any() ? subjectAllVisitList.Last().VisitNum + 1 : 0;
                 }
             }
             else