IRaCIS.Core.Application/Service/Management/UserService.cs

@@ -1039,16 +1039,10 @@ namespace IRaCIS.Core.Application.Service
 
             var iPRegion = string.Join('|', ipinfo.Split('|').TakeLast(3));
 
-            string SplitAndConcatenate(string input)
-            {
-                string[] parts = input.Split('|');
-                return parts.Length >= 3 ? parts[0] + parts[1] : string.Join("", parts);
-            }
-
             if (loginUser.LastLoginIP != string.Empty)
             {
                 // 与上一次IP不一致
-                if (SplitAndConcatenate(loginUser.LastLoginIP) !=SplitAndConcatenate(iPRegion))
+                if (loginUser.LastLoginIP != iPRegion)
                 {
                     loginUser.LoginState = 2;
                 }

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs

@@ -99,6 +99,9 @@ namespace IRaCIS.Core.Application.Service
 
             var taskid = mark.VisitTaskId;
             await _readingTableQuestionAnswerRepository.BatchDeleteNoTrackingAsync(x => x.RowId == mark.RowId && x.TableQuestionId == mark.TableQuestionId);
+            await _readingTaskQuestionMarkRepository.DeleteFromQueryAsync(x => x.Id == inDto.Id);
+
+
             await _readingTaskQuestionMarkRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.Id, x => new ReadingTaskQuestionMark()
             {
                 InstanceId=null,