From adfd6b50c14febef4b7419090f9bd0369039cb17 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 14 Feb 2025 16:39:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E6=97=A5?=
=?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../IRaCIS.Core.Application.xml | 17 ++++++++++++++++-
.../Service/Management/DTO/UserLogViewModel.cs | 2 ++
.../Service/Management/UserService.cs | 10 +++++++++-
3 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 909f16392..795668442 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -8192,6 +8192,11 @@
任务展示访视 读片任务显示是否顺序
+
+
+ 是否存在未处理的反馈
+
+
是否是转变的任务(转为IRECIST)
@@ -12061,7 +12066,7 @@
-
+
IR影像阅片
@@ -13774,11 +13779,21 @@
是否是一致性分析产生
+
+
+ 是否存在未处理的反馈
+
+
是否是一致性分析产生
+
+
+ 是否存在未处理的反馈
+
+
未完成阅片量
diff --git a/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs b/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
index 39378df0e..d500d86fa 100644
--- a/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
@@ -62,6 +62,8 @@ namespace IRaCIS.Core.Application.ViewModel
public Guid? IdentityUserId { get; set; }
+ public Guid? TargetIdentityUserId { get; set; }
+
public bool? IsLoginUncommonly { get; set; }
}
diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs
index 4b67901d9..bb1171d36 100644
--- a/IRaCIS.Core.Application/Service/Management/UserService.cs
+++ b/IRaCIS.Core.Application/Service/Management/UserService.cs
@@ -182,6 +182,13 @@ namespace IRaCIS.Core.Application.Service
await VerifyUserEmailAsync(_userInfo.IdentityUserId, newEmail);
+ // 修改用户邮箱的时候 需要修改医生表的邮箱
+ var oldEmail = await _identityUserRepository.Where(t => t.Id == _userInfo.IdentityUserId).Select(t => t.EMail).FirstOrDefaultAsync();
+
+ await _doctorRepository.UpdatePartialFromQueryAsync(x => x.EMail == oldEmail, u => new Doctor()
+ {
+ EMail = newEmail
+ });
await _identityUserRepository.UpdatePartialFromQueryAsync(_userInfo.IdentityUserId, u => new IdentityUser()
{
@@ -936,7 +943,8 @@ namespace IRaCIS.Core.Application.Service
var userLogQueryable =
_userLogRepository.AsQueryable().IgnoreQueryFilters()
- .WhereIf(inQuery.IdentityUserId != null, t => t.ActionIdentityUserId == inQuery.IdentityUserId || t.TargetIdentityUserId == inQuery.IdentityUserId)
+ .WhereIf(inQuery.IdentityUserId != null, t => t.ActionIdentityUserId == inQuery.IdentityUserId)
+ .WhereIf(inQuery.TargetIdentityUserId != null, t => t.TargetIdentityUserId == inQuery.IdentityUserId)
.WhereIf(inQuery.TrialId != null, t => t.ActionIdentityUser.UserTrialList.Any(c => c.TrialId == inQuery.TrialId) || t.TargetIdentityUser.UserTrialList.Any(c => c.TrialId == inQuery.TrialId))
.WhereIf(trialCreateTime != null, t => t.CreateTime >= trialCreateTime)
.WhereIf(inQuery.OptType != null, t => t.OptType == inQuery.OptType)