From d769d43d230cffb6550e1582f3eabfe9a179c2ce Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 29 Aug 2025 15:59:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E5=92=8C=E6=B7=BB=E5=8A=A0=E5=88=B0=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IRaCIS.Core.Application.xml               | 12 ++++++++++
 .../Service/Management/UserService.cs         | 22 ++++++++++++++++++-
 .../TrialSiteUser/TrialMaintenanceService.cs  |  2 +-
 .../Service/Visit/HospitalGroupService.cs     |  3 ++-
 4 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index a6f8a7ba2..566eec40d 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -17471,6 +17471,18 @@
             <param name="_identityUserRepository"></param>
             <param name="_userRoleRepository"></param>
         </member>
+        <member name="T:IRaCIS.Core.Application.Triggers.AfterSaveTrigger.UserLogAfterTrigger">
+            <summary>
+            账户日志 记录账户每次操作的信息
+            </summary>
+            <param name="_identityUserRepository"></param>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Triggers.AfterSaveTrigger.UserLogAfterTrigger.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.IdentityUser})">
+            <summary>
+            账户日志 记录账户每次操作的信息
+            </summary>
+            <param name="_identityUserRepository"></param>
+        </member>
         <member name="T:IRaCIS.Core.Application.Triggers.TrialCriterionSignTrigger">
             <summary>
               因为可能先一致性核查通过，生成其他标准的任务了，新签名的标准也需要产生任务
diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs
index 565bf5052..57ed4c7a8 100644
--- a/IRaCIS.Core.Application/Service/Management/UserService.cs
+++ b/IRaCIS.Core.Application/Service/Management/UserService.cs
@@ -1,4 +1,5 @@
-using IP2Region.Net.Abstractions;
+using DocumentFormat.OpenXml.Bibliography;
+using IP2Region.Net.Abstractions;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.Auth;
 using IRaCIS.Core.Application.Contracts;
@@ -27,6 +28,7 @@ namespace IRaCIS.Core.Application.Service
     [ApiExplorerSettings(GroupName = "HIR")]
     public class UserService(IRepository<UserRole> _userRoleRepository,
         IMailVerificationService _mailVerificationService,
+        IRepository<TrialIdentityUser> _trialIdentityUserRepository,
         IRepository<VerificationCode> _verificationCodeRepository,
          IRepository<HIRHospital> _hirHospitalRepository,
         IRepository<TrialUserRole> _userTrialRepository,
@@ -577,6 +579,24 @@ namespace IRaCIS.Core.Application.Service
                 await _identityUserRepository.AddAsync(saveItem);
 
                 var success = await _identityUserRepository.SaveChangesAsync();
+
+                if (userAddModel.UserName.IsNotNullOrEmpty())
+                {
+                    //自动添加到项目用户里面
+
+                    var trialId = (Guid)userAddModel.TrialId;
+
+                    var currentUser = new TrialIdentityUser()
+                    {
+                        TrialId = trialId,
+                        IdentityUserId = saveItem.Id,
+                        JoinTime = DateTime.Now,
+                        TrialUserRoleList = saveItem.UserRoleList.Select(t => new TrialUserRole() { UserId = t.Id, TrialId = trialId }).ToList()
+                    };
+
+
+                    await _trialIdentityUserRepository.AddAsync(currentUser);
+                }
             }
 
             if (hospitalInfo.IsCanConnectInternet)
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
index 96808117a..013482a8a 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
@@ -126,7 +126,7 @@ namespace IRaCIS.Core.Application.Service
 
                  //.Where(t => userTypeEnums.Contains(t.UserTypeEnum))
                  .Where(t => t.IdentityUser.Status == UserStateEnum.Enable && t.IsUserRoleDisabled == false)
-                 .Where(t => t.IdentityUser.IdentityUserHospitalGroupList.Any(t => t.HospitalGroupId == hospitalGroupId))
+                 .Where(t => t.IdentityUser.IdentityUserHospitalGroupList.Any(t => t.HospitalGroupId == hospitalGroupId && t.IsDisabled == false))
                  .WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserRealName), t => (t.IdentityUser.FullName).Contains(inQuery.UserRealName))
                  .WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserName), t => t.IdentityUser.UserName.Contains(inQuery.UserName))
                  .WhereIf(!string.IsNullOrWhiteSpace(inQuery.OrganizationName), t => t.IdentityUser.OrganizationName.Contains(inQuery.OrganizationName))
diff --git a/IRaCIS.Core.Application/Service/Visit/HospitalGroupService.cs b/IRaCIS.Core.Application/Service/Visit/HospitalGroupService.cs
index 94aa77e37..636522376 100644
--- a/IRaCIS.Core.Application/Service/Visit/HospitalGroupService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/HospitalGroupService.cs
@@ -26,7 +26,8 @@ public class HospitalGroupService(IRepository<HospitalGroup> _hospitalGroupRepos
 
     public async Task<List<HospitalGroupAdminUserInfo>> GetGAUserList(Guid hospitalGroupId)
     {
-        var list = await _identityUserRepository.Where(t => t.UserRoleList.Any(t => t.UserTypeEnum == UserTypeEnum.GA && t.IsUserRoleDisabled == false) && t.IdentityUserHospitalGroupList.Any(t => t.HospitalGroupId == hospitalGroupId))
+        var list = await _identityUserRepository.Where(t => t.UserRoleList.Any(t => t.UserTypeEnum == UserTypeEnum.GA && t.IsUserRoleDisabled == false)
+        && t.IdentityUserHospitalGroupList.Any(t => t.HospitalGroupId == hospitalGroupId && t.IsDisabled == false))
             .ProjectTo<HospitalGroupAdminUserInfo>(_mapper.ConfigurationProvider).ToListAsync();
 
         return list;