From 0fcaa46aaeb1dafb32f1cd3a47f107976c72f81c Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 27 Oct 2022 15:18:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=98=85=E7=89=87=E6=A0=87?= =?UTF-8?q?=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Allocation/VisitTaskService.cs | 9 ++++++--- .../Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index 79e55c6b1..014da22d2 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -65,9 +65,8 @@ namespace IRaCIS.Core.Application.Service.Allocation public async Task> GetTrialCriterionList(Guid trialId,bool isHaveSigned=true) { var list = await _repository.Where(t => t.TrialId == trialId && t.IsConfirm) - .WhereIf(isHaveSigned=true,t=>t.ReadingInfoSignTime!=null) .OrderBy(t => t.ShowOrder) - .Select(t => new TrialReadingCriterionDto() { TrialReadingCriterionId = t.Id, TrialReadingCriterionName = t.CriterionName, CriterionType = t.CriterionType, ReadingType = t.ReadingType }) + .Select(t => new TrialReadingCriterionDto() { TrialReadingCriterionId = t.Id, TrialReadingCriterionName = t.CriterionName, CriterionType = t.CriterionType, ReadingType = t.ReadingType , ReadingInfoSignTime=t.ReadingInfoSignTime}) .ToListAsync(); if (list.Count == 0) @@ -75,7 +74,11 @@ namespace IRaCIS.Core.Application.Service.Allocation throw new BusinessValidationFailedException("该项目还未确认任何一个阅片标准"); } - return list; + + + + + return list.AsQueryable().WhereIf(isHaveSigned=true,t=>t.ReadingInfoSignTime!=null).ToList(); } diff --git a/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs b/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs index 589df8aa7..26fcf1a67 100644 --- a/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs +++ b/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs @@ -294,6 +294,8 @@ namespace IRaCIS.Application.Contracts public ReadingMethod ReadingType { get; set; } public CriterionType? CriterionType { get; set; } + + public DateTime? ReadingInfoSignTime { get; set; } } public class TrialCriterionReadingCategory