From 9c48ccd692180b4ea404e84037fc320dc1d6f7b7 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 5 Jul 2022 17:22:36 +0800
Subject: [PATCH] .

---
 .../Service/Allocation/VisitTaskService.cs         | 14 ++++++++++++--
 .../Service/Reading/Dto/ReadingMedicalReviewDto.cs |  3 +++
 .../Service/Reading/ReadingMedicalReviewService.cs |  1 +
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 1aaccc53..95bd9c97 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -31,13 +31,15 @@ namespace IRaCIS.Core.Application.Service
         private readonly IRepository<ReadModule> _readModuleRepository;
 
         private readonly IRepository<VisitTaskReReading> _visitTaskReReadingRepository;
-
+        private readonly IRepository<TaskMedicalReview> _taskMedicalReviewRepository;
         private readonly IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository;
 
 
         public VisitTaskService(IRepository<SubjectVisit> subjectVisitRepository, IRepository<VisitTask> visitTaskRepository, IRepository<Trial> trialRepository,
             IRepository<Subject> subjectRepository, IRepository<SubjectUser> subjectUserRepository, IRepository<TaskAllocationRule> taskAllocationRuleRepository,
-            IRepository<ReadModule> readModuleRepository, IRepository<VisitTaskReReading> visitTaskReReadingRepository, IRepository<ReadingTaskQuestionAnswer> readingTaskQuestionAnswerRepository
+            IRepository<ReadModule> readModuleRepository, IRepository<VisitTaskReReading> visitTaskReReadingRepository,
+             IRepository<TaskMedicalReview> taskMedicalReviewRepository,
+            IRepository<ReadingTaskQuestionAnswer> readingTaskQuestionAnswerRepository
             )
         {
             _taskAllocationRuleRepository = taskAllocationRuleRepository;
@@ -48,6 +50,7 @@ namespace IRaCIS.Core.Application.Service
             _subjectUserRepository = subjectUserRepository;
             _readModuleRepository = readModuleRepository;
             _visitTaskReReadingRepository = visitTaskReReadingRepository;
+            this._taskMedicalReviewRepository = taskMedicalReviewRepository;
             _readingTaskQuestionAnswerRepository = readingTaskQuestionAnswerRepository;
         }
 
@@ -1000,6 +1003,13 @@ namespace IRaCIS.Core.Application.Service
 
             //产生新的任务
 
+            #region 重阅修改医学审核状态
+            await _taskMedicalReviewRepository.BatchUpdateNoTrackingAsync(x => x.IsClosedDialog&&applyReReadingCommand.TaskIdList.Contains(x.VisitTaskId), x => new TaskMedicalReview()
+            {
+                IsClosedDialog = true
+            });
+            #endregion
+
             await _visitTaskRepository.SaveChangesAsync();
 
             return ResponseOutput.Ok();
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
index 2ae2aac7..6e6f39f1 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
@@ -86,6 +86,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public bool IsClosedDialog { get; set; }
 
+
+        public Guid VisitTaskId { get; set; }
+
     }
 
     public class FinishMedicalReviewInDto
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
index c8036e29..ad0a3180 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
@@ -424,6 +424,7 @@ namespace IRaCIS.Core.Application.Service
                 .Select(x => new GetIRMedicalFeedbackListOutDto
                 {
                     Id = x.Id,
+                    VisitTaskId=x.VisitTaskId,
                     IsUrgent = x.VisitTask.IsUrgent,
                     AuditState = x.AuditState,
                     SubjectCode = x.VisitTask.BlindSubjectCode == string.Empty ? x.VisitTask.Subject.Code : x.VisitTask.BlindSubjectCode,