From c718ec84463dfbebfd831610bfc6ee16cd44c560 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Thu, 28 Mar 2024 10:45:43 +0800
Subject: [PATCH] =?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/Dto/GetReadModuleDto.cs            | 10 ++++++----
 .../Service/Reading/ReadingPeriod/ReadModuleService.cs |  5 ++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs
index 6a12c5c6f..109bf7b25 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs
@@ -14,10 +14,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public Guid? SubjectId { get; set; }
 
-        /// <summary>
-        /// 项目中心Code
-        /// </summary>
-        public string? TrialSiteCode { get; set; }
+		public CompleteClinicalDataEnum? CompleteClinicalData { get; set; }
+
+		/// <summary>
+		/// 项目中心Code
+		/// </summary>
+		public string? TrialSiteCode { get; set; }
 
         /// <summary>
         /// 受试者Code
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs
index 6174c5b50..fc2537fb3 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs
@@ -157,7 +157,10 @@ namespace IRaCIS.Application.Services
              .WhereIf(dto.TrialSiteCode != null && dto.TrialSiteCode != string.Empty, x => x.TrialSiteCode.Contains(dto.TrialSiteCode))
              .WhereIf(dto.SubjectCode != null && dto.SubjectCode != string.Empty, x => x.SubjectCode.Contains(dto.SubjectCode))
              .WhereIf(dto.ModuleType != null, x => x.ModuleType == dto.ModuleType)
-             .WhereIf(dto.ReadingStatus != null, x => x.ReadingStatus == dto.ReadingStatus)
+             .WhereIf(dto.CompleteClinicalData==CompleteClinicalDataEnum.NA,x=>x.NeedSignClinicalDataCount==0)
+			  .WhereIf(dto.CompleteClinicalData == CompleteClinicalDataEnum.NotComplete, x => x.NeedSignClinicalDataCount != x.SignClinicalDataCount)
+			   .WhereIf(dto.CompleteClinicalData == CompleteClinicalDataEnum.Complete, x => x.NeedSignClinicalDataCount != 0 && x.NeedSignClinicalDataCount == x.SignClinicalDataCount)
+			 .WhereIf(dto.ReadingStatus != null, x => x.ReadingStatus == dto.ReadingStatus)
              .WhereIf(dto.Name != null, x => x.Name.Contains(dto.Name!)).OrderBy(x => x.SiteCode);
 
             var subjectIds = await subjectQuery.OrderBy(dto.SortField).Select(x => x.SubjectId).Distinct().Skip((dto.PageIndex - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();