From 2e8b2a24ae44be82619098c93890217fa35ca885 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 14 Feb 2025 16:51:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../IRaCIS.Core.Application.xml | 17 +----------------
.../Service/Management/UserService.cs | 2 +-
2 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 795668442..909f16392 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -8192,11 +8192,6 @@
任务展示访视 读片任务显示是否顺序
-
-
- 是否存在未处理的反馈
-
-
是否是转变的任务(转为IRECIST)
@@ -12066,7 +12061,7 @@
-
+
IR影像阅片
@@ -13779,21 +13774,11 @@
是否是一致性分析产生
-
-
- 是否存在未处理的反馈
-
-
是否是一致性分析产生
-
-
- 是否存在未处理的反馈
-
-
未完成阅片量
diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs
index bb1171d36..c5f69c344 100644
--- a/IRaCIS.Core.Application/Service/Management/UserService.cs
+++ b/IRaCIS.Core.Application/Service/Management/UserService.cs
@@ -37,7 +37,7 @@ namespace IRaCIS.Core.Application.Service
IOptionsMonitor _verifyConfig,
IOptionsMonitor systemEmailConfig,
IRepository _identityUserRepository,
-
+ IRepository _doctorRepository,
ISearcher _searcher, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IFusionCache _fusionCache) : BaseService, IUserService
{
From 3677a30bab048fb268f65164867737ec2b844604 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 14 Feb 2025 17:19:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?=
=?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Service/Management/DTO/UserLogViewModel.cs | 2 +-
IRaCIS.Core.Application/Service/Management/UserService.cs | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs b/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
index d500d86fa..0a019d707 100644
--- a/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
@@ -56,7 +56,7 @@ namespace IRaCIS.Core.Application.ViewModel
public DateTime? EndDate { get; set; }
- public UserTypeEnum? LoginUserTypeEnum { get; set; }
+ public string? LoginUserType { get; set; }
public Guid? UserTypeId { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs
index c5f69c344..b6f53770e 100644
--- a/IRaCIS.Core.Application/Service/Management/UserService.cs
+++ b/IRaCIS.Core.Application/Service/Management/UserService.cs
@@ -941,10 +941,12 @@ namespace IRaCIS.Core.Application.Service
{
DateTime? trialCreateTime = inQuery.TrialId != null ? _trialRepository.Where(t => t.Id == inQuery.TrialId).Select(t => t.CreateTime).FirstOrDefault() : null;
+
+
var userLogQueryable =
_userLogRepository.AsQueryable().IgnoreQueryFilters()
- .WhereIf(inQuery.IdentityUserId != null, t => t.ActionIdentityUserId == inQuery.IdentityUserId)
- .WhereIf(inQuery.TargetIdentityUserId != null, t => t.TargetIdentityUserId == inQuery.IdentityUserId)
+ .WhereIf(inQuery.IdentityUserId != null, t => t.ActionIdentityUserId == inQuery.IdentityUserId)
+ .WhereIf(inQuery.TargetIdentityUserId != null, t => t.TargetIdentityUserId == inQuery.TargetIdentityUserId)
.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)
@@ -954,7 +956,7 @@ namespace IRaCIS.Core.Application.Service
.WhereIf(!string.IsNullOrEmpty(inQuery.LoginUserName), t => t.ActionUserName.Contains(inQuery.LoginUserName!))
.WhereIf(!string.IsNullOrEmpty(inQuery.LoginFaildName), t => t.ActionUserName.Contains(inQuery.LoginFaildName!))
.WhereIf(!string.IsNullOrEmpty(inQuery.IP), t => t.IP.Contains(inQuery.IP!))
- .WhereIf(inQuery.LoginUserTypeEnum != null, t => t.CreateUserRole.UserTypeEnum == inQuery.LoginUserTypeEnum)
+ .WhereIf(!string.IsNullOrEmpty(inQuery.LoginUserType), t => t.ActionUserType == inQuery.LoginUserType)
.WhereIf(inQuery.UserTypeId != null, t => t.CreateUserRole.UserTypeId == inQuery.UserTypeId)
.ProjectTo(_mapper.ConfigurationProvider);