From 8afeeefc5114fcc1ec80bf893326cbe40e8e863c Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 11 Dec 2023 15:45:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/TrialSiteUser/PersonalWorkstation.cs           | 2 +-
 .../ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs      | 7 ++++---
 IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs     | 3 +++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
index ac80c1f00..f264cf67f 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
@@ -504,7 +504,7 @@ namespace IRaCIS.Core.Application
                     ToBeDealedCount = t.ReadingClinicalDataList.Where(x => !x.IsSign && x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC && x.ClinicalDataTrialSet.ClinicalDataLevel != ClinicalLevel.SubjectVisit && x.ClinicalDataTrialSet.ClinicalDataLevel != ClinicalLevel.Subject).Count(),
                     ToBeVisitCount = t.ReadingClinicalDataList.Where(x => !x.IsSign && x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC && x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.SubjectVisit).Count(),
                     ToAllCount = t.ReadingClinicalDataList.Where(x => !x.IsSign && x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC).Count(),
-                    ReadModuleCount = t.ReadModuleList.Where(x => !x.IsPMConfirm).Count(),
+                    ReadModuleCount = t.ReadModuleList.Where(x => !x.IsCRCConfirm&&x.ReadModuleCriterionFromList.Count()>0).Count(),
                 }).Where(x => x.ReadModuleCount > 0);
 
             var defalutSortArray = new string[] { nameof(ImageClinicalDataToBeDoneDto.UrgentCount) + " desc", nameof(ImageClinicalDataToBeDoneDto.ToBeDealedCount) + " desc" };
diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs
index 27a661289..f1b3105ec 100644
--- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs
+++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs
@@ -15,11 +15,12 @@ namespace IRaCIS.Core.Domain.Models
 	 [Table("ReadModuleCriterionFrom")]	
 	 public class ReadModuleCriterionFrom : Entity, IAuditAdd
 	 {
-	
-		/// <summary>
+
+        /// <summary>
         /// 阅片期Id
         /// </summary>
-		public Guid ReadModuleId { get; set; }
+        [ForeignKey("ReadModuleId")]
+        public Guid ReadModuleId { get; set; }
 	
 		/// <summary>
         /// 受试者Id
diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs
index e45d82b4b..01f8c8d24 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs
@@ -141,6 +141,9 @@ namespace IRaCIS.Core.Domain.Models
         public Trial Trial { get; set; }
 
 
+        [JsonIgnore]
+        public List<ReadModuleCriterionFrom> ReadModuleCriterionFromList { get; set; } = new List<ReadModuleCriterionFrom>();
+
         /// <summary>
         /// 阅片配置的类型
         /// </summary>