From e6c577e68b0d3287a621a0b65aa1cca294f1d863 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Thu, 11 Jul 2024 17:28:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=85=E7=89=87=E6=97=B6=E9=97=B4=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=88=B0=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.API/appsettings.Test_IRC.json             |  6 +++++-
 .../ReadingImageTask/ReadingImageTaskService.cs       |  8 ++++++--
 IRaCIS.Core.Domain/_Config/_AppSettings.cs            | 11 +++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.API/appsettings.Test_IRC.json b/IRaCIS.Core.API/appsettings.Test_IRC.json
index 6ea44f9ae..e3d28221d 100644
--- a/IRaCIS.Core.API/appsettings.Test_IRC.json
+++ b/IRaCIS.Core.API/appsettings.Test_IRC.json
@@ -62,7 +62,11 @@
 
     "AutoLoginOutMinutes": 1,
 
-    "OpenLoginMFA": false
+    "OpenLoginMFA": false,
+
+    "ContinuousReadingTimeMin": 120,
+
+    "ReadingRestTimeMin": 10
   },
 
   "SystemEmailSendConfig": {
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 660370dd1..3821474a5 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -21,6 +21,7 @@ using IRaCIS.Core.Application.Service.ReadingCalculate.Interface;
 using AutoMapper.QueryableExtensions;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Domain.Models;
+using Microsoft.Extensions.Options;
 
 namespace IRaCIS.Application.Services
 {
@@ -42,6 +43,7 @@ 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;
@@ -84,6 +86,7 @@ namespace IRaCIS.Application.Services
                   IReadingCalculateService readingCalculateService,
                   IRepository<SubjectVisit> subjectVisitRepository,
                   IRepository<Subject> subjectRepository,
+                    IOptionsMonitor<ServiceVerifyConfigOption> verifyConfig,
                   IRepository<ReadingGlobalTaskInfo> readingGlobalTaskInfoRepository,
                   IRepository<ReadingCriterionPage> readingCriterionPageRepository,
                   IRepository<ReadingTaskRelation> readingTaskRelationRepository,
@@ -125,6 +128,7 @@ 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;
@@ -2981,8 +2985,8 @@ namespace IRaCIS.Application.Services
             var startReadingTimeKey = _userInfo.Id.ToString() + "StartReadingTime";
             var startRestTimeKey = _userInfo.Id.ToString() + "StartRestTime";
 
-            int readingMinute = 120; // 为60整数
-            int restMinute = 10; //
+            int readingMinute = _verifyConfig.CurrentValue.ContinuousReadingTimeMin; // 为60整数
+            int restMinute = _verifyConfig.CurrentValue.ReadingRestTimeMin; //
             var startReadingTime = _provider.Get<string>(startReadingTimeKey).Value;
             var startRestTime = _provider.Get<string>(startRestTimeKey).Value;
             if (startReadingTime == null && startRestTime == null)
diff --git a/IRaCIS.Core.Domain/_Config/_AppSettings.cs b/IRaCIS.Core.Domain/_Config/_AppSettings.cs
index 1361360fb..80aed90e8 100644
--- a/IRaCIS.Core.Domain/_Config/_AppSettings.cs
+++ b/IRaCIS.Core.Domain/_Config/_AppSettings.cs
@@ -24,6 +24,17 @@ 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