Merge branch 'Test_HIR_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_HIR_Net8

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

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>();
 

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; }

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