From 4ad3d30b1d2bb7482c0326c0b755dd3c3076e0f5 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Tue, 26 Aug 2025 14:14:42 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E6=AC=A1?=
 =?UTF-8?q?=E5=BC=82=E5=9C=B0=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/Service/Management/UserService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs
index f37e84d50..7c8cfb0a1 100644
--- a/IRaCIS.Core.Application/Service/Management/UserService.cs
+++ b/IRaCIS.Core.Application/Service/Management/UserService.cs
@@ -1155,7 +1155,7 @@ namespace IRaCIS.Core.Application.Service
                 var lastLoginIPRegion = await _userLogRepository.Where(t => t.ActionUserName == actionUserName && userOptTypes.Contains(t.OptType))
                     .OrderByDescending(t => t.CreateTime).Select(t => t.IPRegion).FirstOrDefaultAsync();
 
-                if (lastLoginIPRegion != string.Empty)
+                if (lastLoginIPRegion != string.Empty&& lastLoginIPRegion!=null)
                 {
                     // 与上一次区域不一致
                     //if (SplitAndConcatenate(existUserLoginInfo.LastLoginIP) != SplitAndConcatenate(iPRegion))

From 9782c5ee04ad988948a9cef5c6bd7c5fbfcacb34 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Tue, 26 Aug 2025 14:23:20 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=AE=BF=E8=A7=86?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Visit/VisitPlanService.cs         | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs b/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs
index c7afc5d1f..accf313e2 100644
--- a/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs
@@ -82,6 +82,27 @@ namespace IRaCIS.Core.Application.Service
             return list;
         }
 
+        /// <summary>
+        /// 获取访视下拉
+        /// </summary>
+        /// <param name="trialId"></param>
+        /// <returns></returns>
+        [HttpGet("{trialId:guid}")]
+        public async Task<IEnumerable<VisitStageSelectDTO>> GetTrialVisitSelect(Guid trialId)
+        {
+            var query = _subjectVisitRepository.Where(u => u.TrialId == trialId)
+                .GroupBy(x => new { x.VisitNum, x.VisitName,x.IsBaseLine })
+                .Select(x => new VisitStageSelectDTO() {
+
+                    IsBaseLine = x.Key.IsBaseLine,
+                    VisitName = x.Key.VisitName,
+                    VisitNum = x.Key.VisitNum,
+                })
+                 .OrderBy(t => t.VisitNum);
+            var list = await query.ToListAsync();
+            return list;
+        }
+
 
         /// <summary> 添加或更新访视计划某项</summary>
         [UnitOfWork]

From 046ad55b57605db2b20e0d06f8ade981209bb738 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Tue, 26 Aug 2025 15:28:39 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Management/DTO/UserLogViewModel.cs       |  8 ++++++++
 .../Service/Management/UserService.cs                | 12 +++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs b/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
index 9357f9f8c..7f6742ce3 100644
--- a/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
@@ -75,6 +75,14 @@ namespace IRaCIS.Core.Application.ViewModel
     }
 
 
+    public class SetIsIgnoreUncommonlyInDto
+    {
+        public Guid Id { get; set; }
+
+        public bool IsIgnoreUncommonly { get; set; }
+    }
+
+
     ///<summary>UserLogQuery  列表查询参数模型</summary>
     public class UserLogQuery : PageInput
     {
diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs
index f6bce8623..bc1aeca08 100644
--- a/IRaCIS.Core.Application/Service/Management/UserService.cs
+++ b/IRaCIS.Core.Application/Service/Management/UserService.cs
@@ -919,7 +919,17 @@ namespace IRaCIS.Core.Application.Service
         }
 
 
-
+        /// <summary>
+        /// 设置是否忽略异地登录
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IResponseOutput> SetIsIgnoreUncommonly(SetIsIgnoreUncommonlyInDto inDto)
+        {
+            await _userLogRepository.UpdatePartialFromQueryAsync(inDto.Id, x => new UserLog() { IsIgnoreUncommonly = inDto.IsIgnoreUncommonly }, true);
+            return ResponseOutput.Ok();
+        }