From 3d02f19e8f8936c8473c157325028c2c8d354e60 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 27 Jun 2022 15:18:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=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      | 11 +++++------
 .../Service/Allocation/VisitTaskService.cs            |  4 ++--
 .../Service/Reading/ReadingImageTaskService.cs        |  3 +++
 IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs   |  2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
index 512209c1e..76e4805f5 100644
--- a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
@@ -74,17 +74,13 @@ namespace IRaCIS.Core.Application.ViewModel
 
     public class ReadingTaskView : VisitTaskView
     {
-        public ReReadingApplyState ReReadingApplyState { get; set; }
+     
         public ReadingTaskState ReadingTaskState { get; set; }
 
 
         public DateTime? SignTime { get; set; }
 
-
-        public RequestReReadingResult RequestReReadingResultEnum { get; set; }
-
-        ////是否 重阅
-        //public bool IsReReading { get; set; }
+        public ReReadingApplyState ReReadingApplyState { get; set; }
         public DateTime? SuggesteFinishedTime { get; set; }
 
     }
@@ -127,6 +123,9 @@ namespace IRaCIS.Core.Application.ViewModel
     {
         public ReadingTaskState ReadingTaskState { get; set; }
 
+        public ReReadingApplyState ReReadingApplyState { get; set; }
+        public DateTime? SuggesteFinishedTime { get; set; }
+
         //签名时间
         public DateTime? SignTime { get; set; }
     }
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 8d758e1a8..2dfc2947a 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -899,7 +899,7 @@ namespace IRaCIS.Core.Application.Service
             {
                 if (task.ReReadingApplyState == ReReadingApplyState.HaveApplyed || task.ReReadingApplyState == ReReadingApplyState.Agree)
                 {
-                    throw new BusinessValidationFailedException("已申请，或者同意状态不允许再次申请重阅");
+                    throw new BusinessValidationFailedException("重阅已申请，或者重阅已同意状态下不允许申请重阅");
                 }
                 task.ReReadingApplyState = ReReadingApplyState.HaveApplyed;
 
@@ -920,7 +920,7 @@ namespace IRaCIS.Core.Application.Service
                 }
             }
 
-            //产生的新任务，状态保持很申请的一直
+            //产生的新任务，状态保持跟申请的一直
             var reReadingTaskList = taskList.Clone();
 
             await _visitTaskCommonService.AddTaskAsync(new GenerateTaskCommand()
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index 2c64f0488..b9928fea9 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -597,6 +597,7 @@ namespace IRaCIS.Application.Services
             //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.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))
@@ -610,6 +611,7 @@ namespace IRaCIS.Application.Services
                                 QuestionId = question.Id,
                                 VisitTaskId = questionAnswet.VisitTaskId,
                             };
+
                 var questionAnswerlist = await query.ToListAsync();
                 List<GroupTaskAnswerDto> groupTasks = questionAnswerlist.GroupBy(x => new { x.QuestionId, x.AnswerGroup,x.JudgeType,x.AnswerCombination }).Select(x => new GroupTaskAnswerDto
                 {
@@ -619,6 +621,7 @@ namespace IRaCIS.Application.Services
                     JudgeType=x.Key.JudgeType,
                     TaskAnswerList = x.ToList(),
                 }).ToList();
+
                 var noteEqual = false;
                 foreach (var item in groupTasks)
                 {
diff --git a/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs b/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs
index efb1322bb..ff1d390ff 100644
--- a/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs
+++ b/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs
@@ -12,7 +12,7 @@ using System.Collections.Generic;
 namespace IRaCIS.Core.Domain.Models
 {
     ///<summary>
-    ///VisitTask
+    ///重阅申请流程记录表
     ///</summary>
     [Table("VisitTaskReReading")]
     public class VisitTaskReReading : Entity, IAuditUpdate, IAuditAdd