IRaCIS.Core.API/appsettings.Event_IRC.json

@@ -42,11 +42,7 @@
     "LoginMaxFailCount": 5,
 
     "LoginFailLockMinutes": 30,
-    "AutoLoginOutMinutes": 60,
-
-    "ContinuousReadingTimeMin": 120,
-
-    "ReadingRestTimeMin": 10
+    "AutoLoginOutMinutes": 60
   },
   "SystemEmailSendConfig": {
     "Port": 465,

IRaCIS.Core.API/appsettings.Prod_IRC.json

@@ -44,11 +44,7 @@
 
     "AutoLoginOutMinutes": 360,
 
-    "OpenLoginMFA": false,
-
-    "ContinuousReadingTimeMin": 120,
-
-    "ReadingRestTimeMin": 10
+    "OpenLoginMFA": false
 
   },
 

IRaCIS.Core.API/appsettings.Test_IRC.json

@@ -60,11 +60,7 @@
 
     "AutoLoginOutMinutes": 1,
 
-    "OpenLoginMFA": false,
-
-    "ContinuousReadingTimeMin": 120,
-
-    "ReadingRestTimeMin": 10
+    "OpenLoginMFA": false
   },
 
   "SystemEmailSendConfig": {

IRaCIS.Core.API/appsettings.US_Prod_IRC.json

@@ -58,11 +58,7 @@
     "LoginMaxFailCount": 5,
 
     "LoginFailLockMinutes": 30,
-    "AutoLoginOutMinutes": 60,
-
-    "ContinuousReadingTimeMin": 120,
-
-    "ReadingRestTimeMin": 10
+    "AutoLoginOutMinutes": 60
   },
 
   "SystemEmailSendConfig": {

IRaCIS.Core.API/appsettings.US_Test_IRC.json

@@ -64,11 +64,7 @@
     "LoginMaxFailCount": 5,
 
     "LoginFailLockMinutes": 30,
-    "AutoLoginOutMinutes": 60,
-
-    "ContinuousReadingTimeMin": 120,
-
-    "ReadingRestTimeMin": 10
+    "AutoLoginOutMinutes": 60
   },
 
   "SystemEmailSendConfig": {

IRaCIS.Core.API/appsettings.US_Uat_IRC.json

@@ -68,11 +68,7 @@
     "LoginMaxFailCount": 5,
 
     "LoginFailLockMinutes": 30,
-    "AutoLoginOutMinutes": 60,
-
-    "ContinuousReadingTimeMin": 120,
-
-    "ReadingRestTimeMin": 10
+    "AutoLoginOutMinutes": 60
   },
 
   "SystemEmailSendConfig": {

IRaCIS.Core.API/appsettings.Uat_IRC.json

@@ -51,11 +51,7 @@
 
     "LoginFailLockMinutes": 30,
     "AutoLoginOutMinutes": 60,
-    "OpenLoginMFA": false,
-
-    "ContinuousReadingTimeMin": 120,
-
-    "ReadingRestTimeMin": 10
+    "OpenLoginMFA": false
 
   },
   "SystemEmailSendConfig": {

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

@@ -21,7 +21,6 @@ using IRaCIS.Core.Application.Service.ReadingCalculate.Interface;
 using AutoMapper.QueryableExtensions;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Domain.Models;
-using Microsoft.Extensions.Options;
 using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
 
 namespace IRaCIS.Application.Services
@@ -44,7 +43,6 @@ namespace IRaCIS.Application.Services
         private readonly IReadingCalculateService _readingCalculateService;
         private readonly IRepository<SubjectVisit> _subjectVisitRepository;
         private readonly IRepository<Subject> _subjectRepository;
-        private readonly IOptionsMonitor<ServiceVerifyConfigOption> _verifyConfig;
         private readonly IRepository<ReadingGlobalTaskInfo> _readingGlobalTaskInfoRepository;
         private readonly IRepository<ReadingCriterionPage> _readingCriterionPageRepository;
         private readonly IRepository<ReadingTaskRelation> _readingTaskRelationRepository;
@@ -87,7 +85,6 @@ namespace IRaCIS.Application.Services
                   IReadingCalculateService readingCalculateService,
                   IRepository<SubjectVisit> subjectVisitRepository,
                   IRepository<Subject> subjectRepository,
-                    IOptionsMonitor<ServiceVerifyConfigOption> verifyConfig,
                   IRepository<ReadingGlobalTaskInfo> readingGlobalTaskInfoRepository,
                   IRepository<ReadingCriterionPage> readingCriterionPageRepository,
                   IRepository<ReadingTaskRelation> readingTaskRelationRepository,
@@ -129,7 +126,6 @@ namespace IRaCIS.Application.Services
             this._readingCalculateService = readingCalculateService;
             this._subjectVisitRepository = subjectVisitRepository;
             this._subjectRepository = subjectRepository;
-            this._verifyConfig = verifyConfig;
             this._readingGlobalTaskInfoRepository = readingGlobalTaskInfoRepository;
             this._readingCriterionPageRepository = readingCriterionPageRepository;
             this._readingTaskRelationRepository = readingTaskRelationRepository;
@@ -3003,8 +2999,8 @@ namespace IRaCIS.Application.Services
             var startReadingTimeKey = _userInfo.Id.ToString() + "StartReadingTime";
             var startRestTimeKey = _userInfo.Id.ToString() + "StartRestTime";
 
-            int readingMinute = _verifyConfig.CurrentValue.ContinuousReadingTimeMin; // 为60整数
-            int restMinute = _verifyConfig.CurrentValue.ReadingRestTimeMin; //
+            int readingMinute = 120; // 为60整数
+            int restMinute = 10; //
             var startReadingTime = _provider.Get<string>(startReadingTimeKey).Value;
             var startRestTime = _provider.Get<string>(startRestTimeKey).Value;
             if (startReadingTime == null && startRestTime == null)
@@ -3017,7 +3013,7 @@ namespace IRaCIS.Application.Services
                 int timespanMin = (DateTime.Now - cacheStartRestTime).Minutes;
                 if (timespanMin <= restMinute)
                 {
-                    throw new BusinessValidationFailedException(_localizer["ReadingImage_NeedRest", 2, 10]);
+                    throw new BusinessValidationFailedException(_localizer["ReadingImage_NeedRest", readingMinute / 60m, restMinute]);
                 }
                 else
                 {

IRaCIS.Core.Domain/_Config/_AppSettings.cs

@@ -24,17 +24,6 @@ namespace IRaCIS.Core.Domain.Share
         public int AutoLoginOutMinutes { get; set; }
 
         public bool OpenLoginMFA { get; set; }
-
-        /// <summary>
-        /// 连续阅片时间 (min)
-        /// </summary>
-        public int ContinuousReadingTimeMin { get; set; }
-
-        /// <summary>
-        /// 休息时间 (min)
-        /// </summary>
-        public int ReadingRestTimeMin { get; set; }
-
     }
 
     public class SystemEmailSendConfig