diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.csproj b/IRaCIS.Core.API/IRaCIS.Core.API.csproj
index 126bb15d9..31b011e55 100644
--- a/IRaCIS.Core.API/IRaCIS.Core.API.csproj
+++ b/IRaCIS.Core.API/IRaCIS.Core.API.csproj
@@ -154,6 +154,12 @@
+
+
+ Always
+
+
+
diff --git a/IRaCIS.Core.API/Resources/GeoLite2-City.mmdb b/IRaCIS.Core.API/Resources/GeoLite2-City.mmdb
new file mode 100644
index 000000000..50635e325
Binary files /dev/null and b/IRaCIS.Core.API/Resources/GeoLite2-City.mmdb differ
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 62a7f219c..2483c1e26 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -1510,6 +1510,20 @@
+
+
+ 获取项目影像统计,有影像的subject 数量 访视数量
+
+
+
+
+
+
+ 批量勾选访视 进行下载
+
+
+
+
受试者级别所有的影像
diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs
index f37e84d50..e21617596 100644
--- a/IRaCIS.Core.Application/Service/Management/UserService.cs
+++ b/IRaCIS.Core.Application/Service/Management/UserService.cs
@@ -668,7 +668,7 @@ namespace IRaCIS.Core.Application.Service
user.IdentityUserHospitalGroupList.AddRange(addIdList.Select(t => new HospitalGroupIdentityUser() { HospitalGroupId = t, IsManager = false, IdentityUserId = user.Id }));
- var success = await _userRoleRepository.SaveChangesAsync();
+ var success = await _identityUserRepository.SaveChangesAsync();
await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = _userInfo.IdentityUserId, ActionUserName = _userInfo.UserName, TargetIdentityUserId = model.Id, OptType = UserOptType.UpdateUser }, true);
diff --git a/IRaCIS.Core.Domain/Management/User.cs b/IRaCIS.Core.Domain/Management/User.cs
index 2919aec15..3e93ea95e 100644
--- a/IRaCIS.Core.Domain/Management/User.cs
+++ b/IRaCIS.Core.Domain/Management/User.cs
@@ -9,7 +9,7 @@ public class UserRole : BaseFullAuditEntityNoNavigat
{
#region
- //[ForeignKey("IdentityUserId")]
+ [ForeignKey("IdentityUserId")]
[JsonIgnore]
public IdentityUser IdentityUser { get; set; }
diff --git a/IRaCIS.Core.Infra.EFCore/EntityConfigration/SubjectConfigration.cs b/IRaCIS.Core.Infra.EFCore/EntityConfigration/SubjectConfigration.cs
index 2f4d53669..0105504dd 100644
--- a/IRaCIS.Core.Infra.EFCore/EntityConfigration/SubjectConfigration.cs
+++ b/IRaCIS.Core.Infra.EFCore/EntityConfigration/SubjectConfigration.cs
@@ -72,18 +72,17 @@ namespace IRaCIS.Core.Infra.EFCore.EntityConfigration
}
}
- //public class IdentityUserConfigration : IEntityTypeConfiguration
- //{
- // //当一个实体,针对同一个类,有两个一对一导航属性,但是是不同的外键,一个外键是一对一,一个是一对多,那么需要显示配置一对多的关系
- // public void Configure(EntityTypeBuilder builder)
- // {
- // builder.HasMany(s => s.UserRoleList)
- // .WithOne(t=>t.IdentityUser)
- // .HasForeignKey(s => s.IdentityUserId);
+ public class IdentityUserConfigration : IEntityTypeConfiguration
+ {
+ //当一个实体,针对同一个类,有两个一对一导航属性,但是是不同的外键,一个外键是一对一,一个是一对多,那么需要显示配置一对多的关系
+ public void Configure(EntityTypeBuilder builder)
+ {
+ builder.HasMany(s => s.UserRoleList)
+ .WithOne(t => t.IdentityUser)
+ .HasForeignKey(s => s.IdentityUserId);
-
- // }
- //}
+ }
+ }
public class TrialIdentityUserConfigration : IEntityTypeConfiguration