From 664870c72538d701b8bd1441829424bcf9941f6c Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 10 Oct 2022 09:18:27 +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=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/IRaCIS.Core.Application.xml | 1 + .../Service/Allocation/VisitTaskService.cs | 9 ++++++++- .../Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index fb8381e88..c075e736f 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -225,6 +225,7 @@ 阅片人维度 Subject统计表 + diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index 0af7b2c54..0779be905 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -64,7 +64,14 @@ namespace IRaCIS.Core.Application.Service.Allocation public async Task> GetTrialCriterionList(Guid trialId) { - return await _repository.Where(t => t.TrialId == trialId && t.IsConfirm).Select(t => new TrialReadingCriterionDto() { TrialReadingCriterionId = t.Id, TrialReadingCriterionName = t.CriterionName }).ToListAsync(); + var list= await _repository.Where(t => t.TrialId == trialId && t.IsConfirm).Select(t => new TrialReadingCriterionDto() { TrialReadingCriterionId = t.Id, TrialReadingCriterionName = t.CriterionName }).ToListAsync(); + + if (list.Count == 0) + { + throw new BusinessValidationFailedException("该项目还未确认任何一个阅片标准"); + + } + return list; } diff --git a/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs b/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs index 8d744f907..146c09d93 100644 --- a/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs +++ b/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs @@ -276,6 +276,8 @@ namespace IRaCIS.Application.Contracts { public Guid TrialReadingCriterionId { get; set; } public string TrialReadingCriterionName { get; set; } + + public ReadingMethod ReadingType { get; set; } } public class TrialCriterionReadingCategory