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/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 HospitalGroupList { get; set; } @@ -91,16 +91,8 @@ namespace IRaCIS.Application.Contracts public bool IsMutiAccount => AccountList?.Count > 1; public List 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 UserRoleList { get; set; } + public List UserRoleList { get; set; } = new List(); public List HospitalGroupList { get; set; } = new List(); 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; } 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