From 5656e66c28f72fa29a05eb08a1dc08350b20b3f7 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 29 Feb 2024 10:37:31 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=A2=9E=E5=8A=A0=E5=85=B6=E4=BB=96=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E7=BB=9F=E8=AE=A1-2]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TrialSiteUser/DTO/PersonalWorkstationViewModel.cs    | 6 ++++++
 .../Service/TrialSiteUser/PersonalWorkstation.cs         | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/PersonalWorkstationViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/PersonalWorkstationViewModel.cs
index f331a8291..2f3a3ca9e 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/PersonalWorkstationViewModel.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/PersonalWorkstationViewModel.cs
@@ -349,6 +349,12 @@ namespace IRaCIS.Core.Application.Contracts
         public List<string>? IR_PMEmailList { get; set; } 
 
         public int? IR_TotalReadCount { get; set; }
+
+        public int? IR_UnReadCount { get; set; }
+
+        public int? IR_UrgentCount { get; set; }
+
+
         #endregion
 
 
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
index 9f9154df3..13d490b7c 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
@@ -1521,7 +1521,16 @@ namespace IRaCIS.Core.Application
                  IR_TotalReadCount= isIR ? t.VisitTaskList.Where(t=>t.DoctorUserId==_userInfo.Id && t.TaskState==TaskState.Effect && t.ReadingTaskState==ReadingTaskState.HaveSigned).Count():0,
 
                  
+                 IR_UnReadCount= isIR ?t.VisitTaskList
+                   .Where(c => c.DoctorUserId == _userInfo.Id && c.ReadingTaskState != ReadingTaskState.HaveSigned && c.TaskState == TaskState.Effect)
+                   // 前序 不存在 未一致性核查未通过的
+                   .Where(t => !t.Subject.SubjectVisitList.Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum > sv.VisitNum))
+                   //前序 不存在  未生成任务的访视
+                   .Where(t => t.TrialReadingCriterion.IsAutoCreate == false ? !t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(d => d.TrialReadingCriterionId == t.TrialReadingCriterionId).Any(f => f.IsGeneratedTask == false && t.VisitTaskNum > f.SubjectVisit.VisitNum) : true)
+                   
+                   .Where(y => y.IsFrontTaskNeedSignButNotSign == false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true)).Count() :0,
 
+                 IR_UrgentCount= isIR ? t.VisitTaskList.Where(t=>t.SourceSubjectVisit.IsUrgent).Count() : 0,
 
              }) ;