From 42c444c4b3bd9be8fb5463b98c3ca67d73893b00 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 28 Jul 2022 13:27:19 +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

---
 .../Reading/ReadingImageTaskService.cs        | 33 +++----------------
 1 file changed, 4 insertions(+), 29 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index b61c4a87c..2de19fa4c 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -98,6 +98,7 @@ namespace IRaCIS.Application.Services
         {
             var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
             List<GetHistoryGlobalInfoOutDto> result = await _visitTaskRepository.Where(x =>x.TaskState==TaskState.Effect&& x.SubjectId == taskInfo.SubjectId && x.ArmEnum == taskInfo.ArmEnum && x.ReadingCategory == ReadingCategory.Global && x.VisitTaskNum < taskInfo.VisitTaskNum)
+                .Where(x=>x.IsAnalysisCreate== taskInfo.IsAnalysisCreate)
                 .OrderBy(x => x.VisitTaskNum)
                 .Select(x => new GetHistoryGlobalInfoOutDto()
                 {
@@ -869,8 +870,10 @@ namespace IRaCIS.Application.Services
         [HttpPost]
         public async Task<List<GetReadingPastResultListOutDto>> GetReadingPastResultList(GetReadingPastResultListInDto inDto)
         {
+            var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
             var readingPastResultList = await _visitTaskRepository.Where(x => x.TrialId == inDto.TrialId && x.SubjectId == inDto.SubjectId && x.DoctorUserId == _userInfo.Id
-             && x.Id != inDto.VisitTaskId && x.ReadingTaskState == ReadingTaskState.HaveSigned).ProjectTo<GetReadingPastResultListOutDto>(_mapper.ConfigurationProvider).ToListAsync();
+             && x.Id != inDto.VisitTaskId && x.ReadingTaskState == ReadingTaskState.HaveSigned&&x.TaskState==TaskState.Effect)
+                .Where(x=>x.IsAnalysisCreate== taskInfo.IsAnalysisCreate).ProjectTo<GetReadingPastResultListOutDto>(_mapper.ConfigurationProvider).ToListAsync();
             return readingPastResultList;
         }
         #endregion
@@ -1122,34 +1125,6 @@ namespace IRaCIS.Application.Services
 
         }
 
-       
-
-        /// <summary>
-        /// 全局阅片裁判触发
-        /// </summary>
-        /// <param name="visitTaskId"></param>
-        /// <returns></returns>
-        private async Task GlobalTriggerJudgeQuestion(Guid visitTaskId)
-        {
-            List<Guid> visitTaskids = new List<Guid>();
-            var taskInfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstNotNullAsync();
-
-            // 判断是否是一致性分析产生的
-            if (taskInfo.IsAnalysisCreate)
-            {
-                if (taskInfo.ConsistentAnalysisOriginalTaskId != null)
-                {
-                    visitTaskids.Add(visitTaskId);
-                    visitTaskids.Add(taskInfo.ConsistentAnalysisOriginalTaskId.Value);
-                }
-            }
-            else
-            {
-                visitTaskids = await _visitTaskRepository.Where(x => x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ReadingCategory != ReadingCategory.Judge
-
-              && x.ReReadingApplyState != ReReadingApplyState.Agree && x.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId && x.SouceReadModuleId == taskInfo.SouceReadModuleId).Select(x => x.Id).ToListAsync();
-            }
-        }
 
         /// <summary>
         /// 触发裁判任务(新)