From 67a8f10b03848bb8964a70b8f4038348d6406038 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 6 Sep 2024 15:47:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=81=E5=88=A4=E4=BB=BB=E5=8A=A1=E4=B8=8D?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=20=E4=B8=8A=E4=BC=A0=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Allocation/DTO/VisitTaskViewModel.cs | 4 ++-- IRaCIS.Core.Application/TestService.cs | 1 - IRaCIS.Core.Test/IRaCIS.Core.Test.csproj | 11 ++++++++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs index d0ab9fc1a..d680022ac 100644 --- a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs @@ -298,6 +298,8 @@ namespace IRaCIS.Core.Application.ViewModel public bool IsUrgent => UnReadCanReadTaskList.Any(t => t.IsUrgent); + public bool IsSubjectJudge => UnReadCanReadTaskList.All(t => t.ReadingCategory == ReadingCategory.Judge); + public int UnReadTaskCount { get; set; } public int UnReadCanReadTaskCount { get; set; } @@ -340,10 +342,8 @@ namespace IRaCIS.Core.Application.ViewModel public int UrgentCount { get; set; } - // public int UrgentCount => UnReadCanReadTaskList.Count(t => t.IsUrgent); public List UnReadCanReadTaskList { get; set; } = new List(); - // public List UnReadCanReadTaskList => UnReadTaskList.Where(y => y.IsFrontTaskNeedSignButNotSign == false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true)).ToList(); public List UnReadTaskList { get; set; } = new List(); } diff --git a/IRaCIS.Core.Application/TestService.cs b/IRaCIS.Core.Application/TestService.cs index 19ecc3597..f6d75b024 100644 --- a/IRaCIS.Core.Application/TestService.cs +++ b/IRaCIS.Core.Application/TestService.cs @@ -112,7 +112,6 @@ namespace IRaCIS.Application.Services public string TestName { get; set; } - } diff --git a/IRaCIS.Core.Test/IRaCIS.Core.Test.csproj b/IRaCIS.Core.Test/IRaCIS.Core.Test.csproj index 46a07fc5e..39a20fd0c 100644 --- a/IRaCIS.Core.Test/IRaCIS.Core.Test.csproj +++ b/IRaCIS.Core.Test/IRaCIS.Core.Test.csproj @@ -14,6 +14,12 @@ bin + + + + + + @@ -72,7 +78,6 @@ - @@ -88,6 +93,10 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive +