From 28c89ce51d6568bb7b010fd7ad118c1750f1fb7e Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 11 Jul 2023 12:42:43 +0800
Subject: [PATCH] S-41

---
 .../IRaCIS.Core.Application.xml                   | 15 +++++++++++++++
 .../ClinicalData/ReadingClinicalDataService.cs    |  5 ++++-
 .../Service/Reading/Dto/ReadingClinicalDataDto.cs |  7 ++++++-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 002ee0182..14728138f 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -3886,6 +3886,11 @@
             路径
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingOrTaskClinicalDataListInDto.GetClinicalType">
+            <summary>
+            1 PM上传的所有的  2CRC上传的所有已确认的    3 所有已经签名的
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingOrTaskClinicalDataListInDto.IsOnlyGetCRCReadModule">
             <summary>
             只获取CRC上传的阅片模块结构化录入
@@ -3901,6 +3906,16 @@
             获取访视列表
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingClinicalDataListIndto.ClinicalDataTrialSetId">
+            <summary>
+            临床数据类型Id
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingClinicalDataListIndto.GetClinicalType">
+            <summary>
+            1 PM上传的所有的  2CRC上传的所有已确认的    3 所有已经签名的
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingClinicalDataListIndto.IsVisit">
             <summary>
             是否是访视
diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
index 05dbab942..797dcbd51 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
@@ -638,6 +638,7 @@ namespace IRaCIS.Application.Services
 
             var resultQuery = _readingClinicalDataRepository.Where(x => x.SubjectId == inDto.SubjectId)
                  .WhereIf(inDto.ReadingClinicalDataId != null, x => x.Id == inDto.ReadingClinicalDataId)
+                     .WhereIf(inDto.ClinicalDataTrialSetId != null, x => x.ClinicalDataTrialSetId == inDto.ClinicalDataTrialSetId)
                  .WhereIf(inDto.SelectIsSign, x => x.IsSign == true)
                  .Where(x => x.ReadingId == inDto.ReadingId || (x.SubjectId == inDto.SubjectId && x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.Subject))
                  .Select(x => new GetReadingClinicalDataListOutDto()
@@ -680,7 +681,9 @@ namespace IRaCIS.Application.Services
 				.FirstOrDefaultAsync();
             if (readModule != null)
             {
-                var moduleCriterionFromList = await _readModuleCriterionFromRepository.Where(x => x.ReadModuleId == readModule.Id).Select(x => new{
+                var moduleCriterionFromList = await _readModuleCriterionFromRepository
+                    .WhereIf(inDto.ClinicalDataTrialSetId != null, x => x.ClinicalForm.ClinicalDataTrialSetId == inDto.ClinicalDataTrialSetId)
+                    .Where(x => x.ReadModuleId == readModule.Id).Select(x => new{
 					ClinicalFormId=  x.ClinicalFormId,
 					CheckDate= x.ClinicalForm.CheckDate,
 					ClinicalDataTrialSetId= x.ClinicalForm.ClinicalDataTrialSetId
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
index c20cff244..d4f8761d6 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
@@ -184,7 +184,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
 		public Guid? ReadingId { get; set; }
 
-		public Guid? VisitTaskId { get; set; }
+        /// <summary>
+        /// 临床数据类型Id
+        /// </summary>
+        public Guid? ClinicalDataTrialSetId { get; set; }
+
+        public Guid? VisitTaskId { get; set; }
 
         /// <summary>
         /// 1 PM上传的所有的  2CRC上传的所有已确认的    3 所有已经签名的