Merge branch 'Test_HIR_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_HIR_Net8

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
     {

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();
+        }
 
 
 
@@ -1155,7 +1165,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))

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]