From d26da8a4a823488c6df1851ab73957c28e8bb2ca Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 30 Nov 2023 14:19:20 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reading/ClinicalData/ReadingClinicalDataService.cs        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
index e63c0798e..0e3f39e4e 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
@@ -364,7 +364,7 @@ namespace IRaCIS.Application.Services
                 //影像学
                 if (readModule.ReadingSetType == ReadingSetType.ImageReading)
                 {
-                    needSignCount = trialClinicalDataSetList.Where(t => t.TrialClinicalDataSetCriteriaList.Any(c => c.TrialReadingCriterionId == trialReadingCritrialId) && t.ClinicalDataLevel == ClinicalLevel.ImageRead).Count();
+                    needSignCount = trialClinicalDataSetList.Where(t => t.TrialClinicalDataSetCriteriaList.Any(c => c.TrialReadingCriterionId == trialReadingCritrialId) && t.ClinicalDataLevel == ClinicalLevel.ImageRead && t.UploadRole == UploadRole.PM).Count();
 
                     // 不存在需要CRC上传的临床数据 或者 PM已确认
                     crcReadModuleSign =
@@ -379,7 +379,7 @@ namespace IRaCIS.Application.Services
                 //肿瘤学
                 else
                 {
-                    needSignCount = trialClinicalDataSetList.Where(t => t.TrialClinicalDataSetCriteriaList.Any(c => c.TrialReadingCriterionId == trialReadingCritrialId) && t.ClinicalDataLevel == ClinicalLevel.OncologyRead).Count();
+                    needSignCount = trialClinicalDataSetList.Where(t => t.TrialClinicalDataSetCriteriaList.Any(c => c.TrialReadingCriterionId == trialReadingCritrialId) && t.ClinicalDataLevel == ClinicalLevel.OncologyRead && t.UploadRole == UploadRole.PM).Count();
 
                     // 不存在需要CRC上传的临床数据 或者 PM已确认
                     crcReadModuleSign =

From 3dfae86b00e49ce0a963090f8603ed651d26a5a4 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 30 Nov 2023 14:20:15 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Reading/ClinicalData/ReadingClinicalDataService.cs   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
index 0e3f39e4e..bf330341f 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
@@ -374,7 +374,6 @@ namespace IRaCIS.Application.Services
                     && x.ClinicalUploadType == ClinicalUploadType.Structuring
                     && x.TrialClinicalDataSetCriteriaList.Any(c => c.TrialReadingCriterionId == trialReadingCritrialId)) || readModule.IsPMConfirm;
 
-
                 }
                 //肿瘤学
                 else

From 25844c58701937aa320f99c7b48df31f9687a6c8 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 30 Nov 2023 14:56:31 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Reading/ClinicalData/ReadingClinicalDataService.cs   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
index bf330341f..3e521cadb 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
@@ -760,6 +760,7 @@ namespace IRaCIS.Application.Services
                       IsCRCUpload = x.UploadRole == UploadRole.CRC,
                       IsNeedMerge = true,
                       ReadModuleId = readModule.Id,
+                      TrialClinicalDataSetCriteriaList=x.TrialClinicalDataSetCriteriaList,
                       //FileCount = x.FileCount,
 
                       //ReadingClinicalDataState = x.ReadingClinicalDataState,