From f2cfb7b3703a2caea691333932d3d8b12c44f50b Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Tue, 19 Jul 2022 09:01:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Allocation/VisitTaskService.cs | 2 +- .../Service/Reading/ReadingImageTaskService.cs | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index f556afde8..1abefc34e 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -371,7 +371,7 @@ namespace IRaCIS.Core.Application.Service }); var totalCount = visitGroupQuery.Count(); - var currentPageData = await visitTaskQuery.OrderBy(x => x.SubjectCode).Skip((iRUnReadSubjectQuery.PageIndex - 1) * iRUnReadSubjectQuery.PageSize) + var currentPageData = await visitTaskQuery.OrderBy(x => x.SubjectId).Skip((iRUnReadSubjectQuery.PageIndex - 1) * iRUnReadSubjectQuery.PageSize) .Take(iRUnReadSubjectQuery.PageSize).ToListAsync(); var result = new PageOutput() diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index aaca5509c..bf7548adc 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -95,7 +95,7 @@ namespace IRaCIS.Application.Services SubjectId=x.SubjectId, ReadingCategory = x.ReadingCategory, VisistId = x.SourceSubjectVisitId != null ? x.SourceSubjectVisitId.Value : x.ReadModule.SubjectVisitId, - VisitNum = x.SourceSubjectVisitId != null ? x.SourceSubjectVisit.VisitNum : x.ReadModule.VisitNum, + VisitNum = x.VisitTaskNum, }).FirstOrDefaultAsync(); @@ -108,7 +108,7 @@ namespace IRaCIS.Application.Services { SubjectId = s.Id, UnReadTaskCount = s.SubjectVisitTaskList.Count(t => t.ReadingTaskState != ReadingTaskState.HaveSigned && t.DoctorUserId == _userInfo.Id && t.TaskState == TaskState.Effect), - }).ToListAsync(); + }).OrderBy(x=>x.SubjectId).ToListAsync(); subjectList = subjectList.Select((x, index) => new SubjectTask() { Index = index, @@ -126,7 +126,7 @@ namespace IRaCIS.Application.Services TaskBlindName=x.TaskBlindName, ReadingCategory = x.ReadingCategory, VisistId = x.SourceSubjectVisitId != null ? x.SourceSubjectVisitId.Value : x.ReadModule.SubjectVisitId, - VisitNum = x.SourceSubjectVisitId != null ? x.SourceSubjectVisit.VisitNum : x.ReadModule.VisitNum, + VisitNum = x.VisitTaskNum, }).OrderBy(x => x.VisitNum).ThenBy(x => x.ReadingCategory); task =await taskquery.FirstOrDefaultAsync(); @@ -146,8 +146,8 @@ namespace IRaCIS.Application.Services TaskBlindName = x.TaskBlindName, ReadingCategory = x.ReadingCategory, VisistId = x.SourceSubjectVisitId != null ? x.SourceSubjectVisitId.Value : x.ReadModule.SubjectVisitId, - VisitNum = x.SourceSubjectVisitId != null ? x.SourceSubjectVisit.VisitNum : x.ReadModule.VisitNum, - SubjectId=x.SubjectId, + VisitNum = x.VisitTaskNum, + SubjectId =x.SubjectId, SubjectCode=x.Subject.Code, }).FirstOrDefaultAsync(); if (task == null)