From 1853fd85592f64659e9af55bfd89747fc6d40ee6 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 24 Jun 2022 17:39:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Allocation/DTO/VisitTaskViewModel.cs           | 6 ++----
 .../Service/Allocation/VisitTaskService.cs                 | 5 ++---
 .../Service/Reading/ReadingImageTaskService.cs             | 4 +++-
 IRaCIS.Core.Domain/Allocation/VisitTask.cs                 | 7 +++----
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
index 931bb3552..43f394159 100644
--- a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
@@ -80,13 +80,11 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public DateTime? SignTime { get; set; }
 
-        //是否回退过
-        public bool IsReturned { get; set; }
 
         public RequestReReadingResult RequestReReadingResultEnum { get; set; }
 
-        //是否 重阅
-        public bool IsReReading { get; set; }
+        ////是否 重阅
+        //public bool IsReReading { get; set; }
         public DateTime? SuggesteFinishedTime { get; set; }
 
     }
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 6eccad028..8d758e1a8 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -901,7 +901,7 @@ namespace IRaCIS.Core.Application.Service
                 {
                     throw new BusinessValidationFailedException("已申请，或者同意状态不允许再次申请重阅");
                 }
-
+                task.ReReadingApplyState = ReReadingApplyState.HaveApplyed;
 
                 //产生了裁判
                 if (task.JudgeVisitTaskId != null)
@@ -960,8 +960,7 @@ namespace IRaCIS.Core.Application.Service
             {
                 await _visitTaskRepository.UpdatePartialFromQueryAsync(t => t.Id == item.OriginalReReadingTaskId, u => new VisitTask()
                 {
-                    ReReadingApplyState = (agreeReReadingCommand.RequestReReadingResultEnum == RequestReReadingResult.Agree ? ReReadingApplyState.Agree : ReReadingApplyState.Reject),
-                    IsReReading=true
+                    ReReadingApplyState = (agreeReReadingCommand.RequestReReadingResultEnum == RequestReReadingResult.Agree ? ReReadingApplyState.Agree : ReReadingApplyState.Reject)
                 });
 
                 await _visitTaskReReadingRepository.UpdatePartialFromQueryAsync(t => t.Id == item.Id, u => new VisitTaskReReading()
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index 3a2074901..d3ced3580 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -591,8 +591,10 @@ namespace IRaCIS.Application.Services
         /// <returns></returns>
         private async Task TriggerJudgeQuestion(Guid visitTaskId)
         {
+
+            //x.ReReadingApplyState!=ReReadingApplyState.Agree  排除重阅的
             var visitTask = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstOrDefaultAsync();
-            var visitTaskids = await _visitTaskRepository.Where(x => x.ReadingTaskState == ReadingTaskState.HaveSigned &&x.ReadingCategory!= ReadingCategory.Judge&&!x.IsReReading && x.SourceSubjectVisitId == visitTask.SourceSubjectVisitId && x.SouceReadModuleId == visitTask.SouceReadModuleId).Select(x => x.Id).ToListAsync();
+            var visitTaskids = await _visitTaskRepository.Where(x => x.ReadingTaskState == ReadingTaskState.HaveSigned &&x.ReadingCategory!= ReadingCategory.Judge && x.ReReadingApplyState!=ReReadingApplyState.Agree && x.SourceSubjectVisitId == visitTask.SourceSubjectVisitId && x.SouceReadModuleId == visitTask.SouceReadModuleId).Select(x => x.Id).ToListAsync();
             if (visitTaskids.Count == 2)
             {
                 var query = from questionAnswet in _readingTaskQuestionAnswerRepository.Where(x => visitTaskids.Contains(x.VisitTaskId))
diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs
index a6a46fd7d..5b60ff5d4 100644
--- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs
+++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs
@@ -133,8 +133,8 @@ namespace IRaCIS.Core.Domain.Models
 
 
 
-        //是否 重阅
-        public bool IsReReading { get; set; }
+        ////是否 重阅
+        //public bool IsReReading { get; set; }
 
         /// <summary>
         /// DoctorUserId
@@ -147,8 +147,7 @@ namespace IRaCIS.Core.Domain.Models
         public TaskAllocationRule DoctorTaskAllocationRule { get; set; }
 
 
-        //是否回退过
-        public bool IsReturned { get; set; }
+
 
         //裁判任务的Id
         public Guid? JudgeVisitTaskId { get; set; }