From ac1c0e6baaedcbe8915089173a5265d76c58d04a Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 20 Jul 2023 10:07:14 +0800
Subject: [PATCH] S-86

---
 .../Service/Reading/ClinicalData/ClinicalAnswerService.cs   | 2 ++
 .../Service/Reading/Dto/ClinicalAnswerDto.cs                | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs
index 8bf97a91b..746b34b3c 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs
@@ -226,6 +226,7 @@ namespace IRaCIS.Core.Application.Service
             var clinicalData= _readingClinicalDataRepository.Where(x=>x.TrialId == inDto.TrialId&&x.ClinicalDataTrialSet.UploadRole==UploadRole.CRC&&x.ClinicalDataTrialSet.ClinicalDataLevel!= ClinicalLevel.SubjectVisit)
                 .Where(x=>!x.IsSign)
                 .WhereIf(inDto.SubjectId!=null,x=>x.SubjectId==inDto.SubjectId)
+                .WhereIf(inDto.SubjectCode != null, x => x.Subject.Code.Contains(inDto.SubjectCode??string.Empty))
                 .Where(x=> x.ClinicalDataTrialSet.ClinicalDataLevel != ClinicalLevel.Subject)
                 .Include(x=>x.ClinicalDataTrialSet).Select(x=>new GetCRCSubjectClinicalOutDto() { 
                   SubjectId=x.SubjectId,
@@ -526,6 +527,7 @@ namespace IRaCIS.Core.Application.Service
                 .WhereIf(inDto.ReadModuleId != null, x => x.Id == inDto.ReadModuleId)
                 .WhereIf(inDto.IsCRCConfirm != null, x => x.IsCRCConfirm == inDto.IsCRCConfirm)
                  .WhereIf(inDto.IsPMConfirm != null, x => x.IsPMConfirm == inDto.IsPMConfirm)
+                .WhereIf(inDto.SubjectCode != null, x => x.Subject.Code.Contains(inDto.SubjectCode))
                 .WhereIf(inDto.TrialReadingCriterionId != null, x => x.TrialReadingCriterionId == inDto.TrialReadingCriterionId)
 				.WhereIf(inDto.SubjectId != null, x => x.SubjectId == inDto.SubjectId)
                 .WhereIf(inDto.StartTime != null, x => x.SubjectVisit.LatestScanDate >= inDto.StartTime)
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalAnswerDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalAnswerDto.cs
index 1b5cf3b6c..00d9647e9 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalAnswerDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalAnswerDto.cs
@@ -27,6 +27,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public Guid TrialId { get; set; }
 
         public Guid? SubjectId { get; set; }
+
+        public string? SubjectCode { get; set; }
     }
 
 
@@ -153,7 +155,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public Guid TrialId { get; set; }
 
 		public Guid? ReadModuleId { get; set; }
-	}
+
+        public string? SubjectCode { get; set; }
+    }
 
     public class CRCCancelConfirmClinicalInDto
     {