From c2cbbba637aa9fdecdddc410331bd930c89a508d Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 11 Jul 2023 16:30:50 +0800
Subject: [PATCH] S-43

---
 .../ClinicalData/ReadingClinicalDataService.cs        | 11 ++++++++---
 .../Service/Reading/Dto/ReadingClinicalDataDto.cs     | 11 +++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
index 797dcbd51..d6c950c55 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
@@ -701,6 +701,8 @@ namespace IRaCIS.Application.Services
                       ClinicalDataLevel = x.ClinicalDataLevel,
                       SubjectId = inDto.SubjectId,
                       ReadingId = default(Guid),
+                      IsCRCConfirm= readModule.IsCRCConfirm,
+                      IsPMConfirm= readModule.IsPMConfirm,
                       ClinicalDataSetName = x.ClinicalDataSetName.LanguageName(x.ClinicalDataSetEnName, _userInfo.IsEn_Us),
                       ClinicalDataSetEnName = x.ClinicalDataSetEnName,
                       ClinicalDataTrialSetId = x.Id,
@@ -761,7 +763,7 @@ namespace IRaCIS.Application.Services
                         result = result.Where(x => x.UploadRole == UploadRole.PM).ToList();
                         break;
                     case GetClinicalType.CRCConfirm:
-                        result = result.Where(x => x.UploadRole == UploadRole.CRC).ToList();
+                        result = result.Where(x => x.UploadRole == UploadRole.CRC&&x.IsCRCConfirm&&!x.IsPMConfirm).ToList();
                         break;
                     case GetClinicalType.HasSign:
                         result = result.Where(x => x.IsSign).ToList();
@@ -856,7 +858,10 @@ namespace IRaCIS.Application.Services
 					  ClinicalDataLevel = x.ClinicalDataLevel,
 					  SubjectId = inDto.SubjectId,
 					  ReadingId = default(Guid),
-					  ClinicalDataSetName = x.ClinicalDataSetName.LanguageName(x.ClinicalDataSetEnName, _userInfo.IsEn_Us),
+                      IsCRCConfirm= readModule.IsCRCConfirm,
+                      IsPMConfirm=readModule.IsPMConfirm,
+
+                      ClinicalDataSetName = x.ClinicalDataSetName.LanguageName(x.ClinicalDataSetEnName, _userInfo.IsEn_Us),
 					  ClinicalDataSetEnName = x.ClinicalDataSetEnName,
 					  ClinicalDataTrialSetId = x.Id,
 					  IsSign = readModule.IsPMConfirm,
@@ -907,7 +912,7 @@ namespace IRaCIS.Application.Services
                         result = result.Where(x => x.UploadRole == UploadRole.PM).ToList();
                         break;
                     case GetClinicalType.CRCConfirm:
-                        result = result.Where(x => x.UploadRole == UploadRole.CRC).ToList();
+                        result = result.Where(x => x.UploadRole == UploadRole.CRC&&x.IsCRCConfirm&&!x.IsPMConfirm).ToList();
                         break;
                     case GetClinicalType.HasSign:
                         result = result.Where(x => x.IsSign).ToList();
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
index d4f8761d6..85e149f43 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
@@ -335,11 +335,14 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public Guid ReadingId { get; set; }
 
+        public bool IsCRCConfirm { get; set; } = false;
 
-		/// <summary>
-		/// 项目配置临床类型Name
-		/// </summary>
-		public string ClinicalDataSetName { get; set; }
+        public bool IsPMConfirm { get; set; } = false;
+
+        /// <summary>
+        /// 项目配置临床类型Name
+        /// </summary>
+        public string ClinicalDataSetName { get; set; }
 
 		/// <summary>
 		/// 英文名称