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

---
 .../Service/Reading/Dto/ReadingImageTaskViewModel.cs         | 4 ++++
 .../Service/Reading/ReadingImageTaskService.cs               | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index 65733f370..3835792cd 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -15,6 +15,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public string TaskName { get; set; }
 
         public ReadingTaskState ReadingTaskState { get; set; }
+
+        public decimal VisitTaskNum { get; set; }
     }
 
     public class GetHistoryGlobalInfoInDto
@@ -292,6 +294,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public string TaskName { get; set; }
 
         public string TaskBlindName { get; set; }
+
+        public decimal VisitTaskNum { get; set; }
     }
 
     public class GetReadingPastResultListInDto
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index 2de19fa4c..42b3784a9 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -106,7 +106,8 @@ namespace IRaCIS.Application.Services
                     ReadingTaskState = x.ReadingTaskState,
                     TaskName = x.TaskName,
                     VisitTaskId = x.Id,
-                }).ToListAsync();
+                    VisitTaskNum=x.VisitTaskNum
+                }).OrderBy(x=>x.VisitTaskNum).ToListAsync();
 
             return result;
         }
@@ -873,7 +874,7 @@ namespace IRaCIS.Application.Services
             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&&x.TaskState==TaskState.Effect)
-                .Where(x=>x.IsAnalysisCreate== taskInfo.IsAnalysisCreate).ProjectTo<GetReadingPastResultListOutDto>(_mapper.ConfigurationProvider).ToListAsync();
+                .Where(x=>x.IsAnalysisCreate== taskInfo.IsAnalysisCreate).ProjectTo<GetReadingPastResultListOutDto>(_mapper.ConfigurationProvider).OrderBy(x=>x.VisitTaskNum).ToListAsync();
             return readingPastResultList;
         }
         #endregion