From 9ccde7573110f5f9ab576f12444c7cdf26aedb00 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 7 Mar 2023 17:22:35 +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

---
 .../Service/Allocation/DTO/VisitTaskViewModel.cs   |  2 ++
 .../Service/QC/QCOperationService.cs               | 14 +++++++++++---
 IRaCIS.Core.Domain/Allocation/VisitTask.cs         |  7 ++++++-
 .../ReadingQuestionCriterionTrial.cs               |  2 +-
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
index f10194f6a..315580a1a 100644
--- a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
@@ -146,6 +146,8 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public string UserTypeShortName { get; set; }
 
+        public bool IsCanEditUrgentState { get; set; }
+
 
     }
 
diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
index a9636aed2..1766ade9f 100644
--- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
+++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
@@ -1247,11 +1247,14 @@ namespace IRaCIS.Core.Application.Image.QA
 
 
 
-                        await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => trialInOrderCriterionIdList.Contains(x.TrialReadingCriterionId)&& x.SubjectId == dbSubjectVisit.SubjectId && x.VisitTaskNum <= dbSubjectVisit.VisitNum && x.ReadingTaskState != ReadingTaskState.HaveSigned && x.TaskState == TaskState.Effect, x => new VisitTask()
+                        await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => trialInOrderCriterionIdList.Contains(x.TrialReadingCriterionId)&& x.SubjectId == dbSubjectVisit.SubjectId 
+                        &&x.VisitTaskNum < Math.Ceiling(dbSubjectVisit.VisitNum+0.01m)  // 当前的访视 全局 裁判 及之前 全都加急
+                        && x.ReadingTaskState != ReadingTaskState.HaveSigned && x.TaskState == TaskState.Effect, x => new VisitTask()
                         {
 
                             IsUrgent = true,
                             TaskUrgentType = TaskUrgentType.PDProgress,
+                            IsCanEditUrgentState=false,
                         });
                     }
                     else if (dbSubjectVisit.IsEnrollmentConfirm)
@@ -1261,16 +1264,21 @@ namespace IRaCIS.Core.Application.Image.QA
                             IsUrgent = true
                         });
 
-                        await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => trialInOrderCriterionIdList.Contains(x.TrialReadingCriterionId) && x.SourceSubjectVisitId == dbSubjectVisit.Id && x.ReadingTaskState != ReadingTaskState.HaveSigned && x.TaskState == TaskState.Effect, x => new VisitTask()
+                        await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => trialInOrderCriterionIdList.Contains(x.TrialReadingCriterionId) &&
+                           x.VisitTaskNum>= dbSubjectVisit.VisitNum && x.VisitTaskNum < Math.Ceiling(dbSubjectVisit.VisitNum + 0.01m)  //   当前的访视 全局 裁判  全都加急
+                        && x.ReadingTaskState != ReadingTaskState.HaveSigned && x.TaskState == TaskState.Effect, x => new VisitTask()
                         {
 
                             IsUrgent = true,
                             TaskUrgentType = TaskUrgentType.EnrollmentConfirm,
+                            IsCanEditUrgentState = false,
                         });
                     }
                     else
                     {
-                        await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => trialInOrderCriterionIdList.Contains(x.TrialReadingCriterionId) && x.SourceSubjectVisitId == dbSubjectVisit.Id && x.ReadingTaskState != ReadingTaskState.HaveSigned && x.TaskState == TaskState.Effect, x => new VisitTask()
+                        await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => trialInOrderCriterionIdList.Contains(x.TrialReadingCriterionId) &&
+                          x.VisitTaskNum >= dbSubjectVisit.VisitNum && x.VisitTaskNum < Math.Ceiling(dbSubjectVisit.VisitNum + 0.01m)  //   当前的访视 全局 裁判  全都加急
+                        && x.ReadingTaskState != ReadingTaskState.HaveSigned && x.TaskState == TaskState.Effect, x => new VisitTask()
                         {
 
                             IsUrgent = true,
diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs
index 5e6c6af15..6017ca94a 100644
--- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs
+++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs
@@ -66,6 +66,11 @@ namespace IRaCIS.Core.Domain.Models
         /// </summary>
         public string TaskUrgentRemake { get; set; } = string.Empty;
 
+        /// <summary>
+        /// 是否和编辑加急状态
+        /// </summary>
+        public bool IsCanEditUrgentState { get; set; } = true;
+
         /// <summary>
         /// 0 代表 单重阅片 产生的任务    否则就是双重  任务 1 任务  2 
         /// </summary>
@@ -168,7 +173,7 @@ namespace IRaCIS.Core.Domain.Models
         //随访任务号   取访视的号  计划外是 访视+0.1   裁判任务在访视任务上+0.002   全局任务在截止访视号上+0.03   肿瘤待定   
         public decimal VisitTaskNum { get; set; }
 
-
+       
 
         /// <summary>
         /// 首次阅片时间
diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs
index c91620f98..f867001cf 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs
@@ -146,7 +146,7 @@ namespace IRaCIS.Core.Domain.Models
 		/// <summary>
 		/// IR阅片页面是否可以查看既往任务结果
 		/// </summary>
-		public bool IsReadingShowPreviousResults { get; set; } = false;
+		public bool IsReadingShowPreviousResults { get; set; } = true;
 
 
 		/// <summary>