XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Test_HIR_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_HIR_Net8
continuous-integration/drone/push Build is passing Details

Test_HIR_Net8
he 2025-09-02 17:09:18 +08:00
parent 32e659c26b 2f69df7a83
commit f5f4639cc8
4 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRC.Core.SCP/Service/PatientStudyService.cs
View File

@ -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

12
IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs
View File

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

3
IRaCIS.Core.Application/Service/Visit/DTO/ClinicalStudySubjects.cs
View File

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

2
IRaCIS.Core.Application/Service/Visit/PatientService.cs
View File

@ -1276,7 +1276,7 @@ namespace IRaCIS.Application.Services
else
{
//没有未提交的，那么开始绑定的就是已提交的加1
subjectMaxVisitNum = subjectAllVisitList.Last().VisitNum + 1;
subjectMaxVisitNum = subjectAllVisitList.Any() ? subjectAllVisitList.Last().VisitNum + 1 : 0;
}
}
else