From f5a50ebc7fdd0f7e9c74390d92b2a0a6941cff15 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 6 Jul 2022 15:58:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/IRaCIS.Core.Application.xml         | 5 +++--
 .../Service/Reading/ReadingImageTaskService.cs              | 6 +++---
 .../Service/Reading/ReadingMedicalReviewService.cs          | 4 +---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 30df90a3e..9b1403c4f 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -248,11 +248,12 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.VisitTaskService.GetReReadingInfluenceTaskList(System.Guid)">
+        <member name="M:IRaCIS.Core.Application.Service.VisitTaskService.GetReReadingOrBackInfluenceTaskList(System.Guid,System.Boolean)">
             <summary>
-            重阅影响提示列表  仅仅针对已完成的任务申请
+            影响提示列表  重阅仅仅针对已完成的任务申请   退回针对的是未完成的(退回仅仅针对是访视类型的)
             </summary>
             <param name="taskId"></param>
+            <param name="isReReading"></param>
             <returns></returns>
         </member>
         <member name="T:IRaCIS.Core.Application.Service.CommonDocumentService">
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index cae32cb05..14e59e2eb 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -503,7 +503,7 @@ namespace IRaCIS.Application.Services
         public async Task<IResponseOutput> SubmitVisitTaskQuestions(SubmitVisitTaskQuestionsInDto inDto)
         {
             await this.SaveVisitTaskQuestions(inDto);
-            await _visitTaskRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.VisitTaskId, x => new VisitTask()
+            await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => x.Id == inDto.VisitTaskId, x => new VisitTask()
             {
                 ReadingTaskState = ReadingTaskState.HaveSigned,
                 SignTime=DateTime.Now,
@@ -727,7 +727,7 @@ namespace IRaCIS.Application.Services
                 {
                     if (visitTask.IsAnalysisCreate)
                     {
-                        await _visitTaskRepository.UpdatePartialFromQueryAsync(visitTaskId, x => new VisitTask()
+                        await _visitTaskRepository.BatchUpdateNoTrackingAsync(x=>x.Id==visitTaskId, x => new VisitTask()
                         {
                             IsAnalysisDiffToOriginalData = true
                         });
@@ -748,7 +748,7 @@ namespace IRaCIS.Application.Services
 
                     if (visitTask.IsAnalysisCreate)
                     {
-                        await _visitTaskRepository.UpdatePartialFromQueryAsync(visitTaskId, x => new VisitTask()
+                        await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => x.Id == visitTaskId, x => new VisitTask()
                         {
                             IsAnalysisDiffToOriginalData = false
                         });
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
index 2dc810245..c2f0b1a07 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs
@@ -100,10 +100,8 @@ namespace IRaCIS.Core.Application.Service
                                SubjectId=x.SubjectId,
                            }).ToListAsync();
 
-
                 List<TaskInfo> otherTask = await _visitTaskRepository.Where(x => x.ArmEnum != Arm.JudgeArm && x.SubjectId == taskInfo.SubjectId
-                             && x.DoctorUserId != taskInfo.DoctorUserId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ReReadingApplyState != ReReadingApplyState.Agree
-                           )
+                             && x.DoctorUserId != taskInfo.DoctorUserId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ReReadingApplyState != ReReadingApplyState.Agree)
                        .Where(x => x.IsAnalysisCreate == taskInfo.IsAnalysisCreate)
                     .OrderBy(x => x.VisitTaskNum).Select(x => new TaskInfo()
                            {