From a7e7f19c6cf18752404bd88a983064f8266b0e68 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 4 Apr 2023 13:54:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs | 2 +- IRaCIS.Core.Application/Service/Common/SystemMonitor.cs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index f8e491d9b..121d87cd9 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -1514,7 +1514,7 @@ namespace IRaCIS.Core.Application.Service.Allocation var origenalTask = (await _visitTaskRepository.Where(t => item.OriginalReReadingTaskId == t.Id).FirstOrDefaultAsync()).IfNullThrowException(); - if (origenalTask.TaskState != TaskState.Effect) + if ( (origenalTask.TaskState != TaskState.Effect|| origenalTask.TaskState != TaskState.Freeze)) { //---当前申请重阅任务的状态,已被其他任务重阅已影响,不允许对该状态下的任务进行重阅同意与否操作 return ResponseOutput.NotOk(_localizer["VisitTask_ReapplyStatusConflict"]); diff --git a/IRaCIS.Core.Application/Service/Common/SystemMonitor.cs b/IRaCIS.Core.Application/Service/Common/SystemMonitor.cs index e7e94df4d..cbe58cf9a 100644 --- a/IRaCIS.Core.Application/Service/Common/SystemMonitor.cs +++ b/IRaCIS.Core.Application/Service/Common/SystemMonitor.cs @@ -245,6 +245,7 @@ namespace IRaCIS.Core.Application.Service.Common { PreserveReferencesHandling = PreserveReferencesHandling.All, Formatting = Formatting.Indented, + }; dynamic data = JsonConvert.DeserializeObject(json, settings);