From 3850be9ab85c4038a6ad64235446fbb7e4c9d1ea Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 11 Aug 2026 17:36:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E7=A0=94=E5=A2=9E=E5=8A=A0=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IRaCIS.Core.Application.xml                    | 14 ++++++++++++++
 .../SiteSurvey/DTO/TrialSiteSurveyViewModel.cs     |  8 ++++++++
 .../Service/SiteSurvey/TrialSiteSurveyService.cs   |  9 +++++++--
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index d848555a1..aa9be20bd 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -19588,6 +19588,20 @@
             <param name="inQuery"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Contracts.TrialSiteSurveyService.GetSiteSurveyInfoList(IRaCIS.Core.Application.Contracts.SiteSurveyInfoQuery)">
+            <summary>
+            调研表基本信息
+            </summary>
+            <param name="inQuery"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Contracts.TrialSiteSurveyService.GetTrialIsSPMJoin(System.Guid)">
+            <summary>
+            SPM 是否参与流程
+            </summary>
+            <param name="trialId"></param>
+            <returns></returns>
+        </member>
         <member name="T:IRaCIS.Core.Application.Contracts.TrialSiteUserSurveyService">
             <summary>
             TrialSiteUserSurveyService
diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs b/IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs
index 9ffc200c5..c653b9082 100644
--- a/IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs
+++ b/IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs
@@ -492,6 +492,8 @@ namespace IRaCIS.Core.Application.Contracts
     {
         [NotDefault]
         public Guid TrialId { get; set; }
+
+        public Guid? TrialSiteId { get; set; }
         public string? TrialSiteCode { get; set; }
 
         public string? TrialSiteName { get; set; }
@@ -501,6 +503,12 @@ namespace IRaCIS.Core.Application.Contracts
     {
         [NotDefault]
         public Guid TrialId { get; set; }
+
+        public Guid? TrialSiteId { get; set; }
+
+        public string? TrialSiteCode { get; set; }
+
+        public string? TrialSiteName { get; set; }
     }
 
     public class SiteSurveyInfoDto
diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
index c5a2fc105..512f01876 100644
--- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
+++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
@@ -1465,7 +1465,8 @@ namespace IRaCIS.Core.Application.Contracts
         [HttpPost]
         public async Task<IResponseOutput> GetSiteSurveyEquipmentList(SiteSurveyEquipmentQuery inQuery)
         {
-            var pageList = _trialSiteEquipmentSurveyRepository.Where(t => t.TrialSiteSurvey.TrialId == inQuery.TrialId)
+            var pageList = await _trialSiteEquipmentSurveyRepository.Where(t => t.TrialSiteSurvey.TrialId == inQuery.TrialId)
+                .WhereIf(inQuery.TrialSiteId != null, t => t.TrialSiteSurvey.TrialSiteId==inQuery.TrialSiteId)
                 .WhereIf(inQuery.TrialSiteCode.IsNotNullOrEmpty(), t => t.TrialSiteSurvey.TrialSite.TrialSiteCode.Contains(inQuery.TrialSiteCode))
                 .WhereIf(inQuery.TrialSiteName.IsNotNullOrEmpty(), t => t.TrialSiteSurvey.TrialSite.TrialSiteAliasName.Contains(inQuery.TrialSiteName) ||
                  t.TrialSiteSurvey.TrialSite.TrialSiteName.Contains(inQuery.TrialSiteName))
@@ -1486,7 +1487,11 @@ namespace IRaCIS.Core.Application.Contracts
         [HttpPost]
         public async Task<IResponseOutput> GetSiteSurveyInfoList(SiteSurveyInfoQuery inQuery)
         {
-            var pageList = _trialSiteSurveyRepository.Where(t => t.TrialId == inQuery.TrialId)
+            var pageList = await _trialSiteSurveyRepository.Where(t => t.TrialId == inQuery.TrialId)
+                .WhereIf(inQuery.TrialSiteId != null, t => t.TrialSiteId == inQuery.TrialSiteId)
+                .WhereIf(inQuery.TrialSiteCode.IsNotNullOrEmpty(), t => t.TrialSite.TrialSiteCode.Contains(inQuery.TrialSiteCode))
+                .WhereIf(inQuery.TrialSiteName.IsNotNullOrEmpty(), t => t.TrialSite.TrialSiteAliasName.Contains(inQuery.TrialSiteName) ||
+                 t.TrialSite.TrialSiteName.Contains(inQuery.TrialSiteName))
 
                 .ProjectTo<TrialSiteSurveyView>(_mapper.ConfigurationProvider).ToPagedListAsync(inQuery);