From 7ed0258cfde2a31e2eda26cd6e8424e91392c1e2 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 16 Jun 2026 17:11:10 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=AD=E5=BF=83=E8=B0=83=E7=A0=94?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=E8=BF=94=E5=9B=9E=E7=A6=81?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/TrialSiteUser/TrialSiteService.cs         | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs
index 615440f8f..3d03a692b 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs
@@ -270,11 +270,18 @@ namespace IRaCIS.Core.Application.Services
         /// <param name="trialId"></param>
         /// <returns></returns>
         [HttpGet("{trialId:guid}")]
-        public async Task<IEnumerable<TrialSiteForSelect>> GetTrialSiteSelect(Guid trialId)
+        public async Task<IEnumerable<TrialSiteForSelect>> GetTrialSiteSelect(Guid trialId, bool? ignoreDisable)
         {
             //CRC只看到他负责的    
 
-            var list = await _trialSiteRepository.Where(t => t.TrialId == trialId)
+            var query = _trialSiteRepository.Where(t => t.TrialId == trialId);
+
+            if (ignoreDisable == true)
+            {
+                query = query.IgnoreQueryFilters();
+            }
+
+            var list = await query
                           .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA, t => t.CRCUserList.Any(t => t.UserId == _userInfo.UserRoleId))
                           .ProjectTo<TrialSiteForSelect>(_mapper.ConfigurationProvider).OrderBy(t => t.TrialSiteCode).ToListAsync();
 

From 6e22246555afbca211db3f13b6f5618a3fa1116c Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 16 Jun 2026 17:16:03 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/TrialSiteUser/Interface/ITrialSiteService.cs        | 2 +-
 .../Service/TrialSiteUser/TrialSiteService.cs                   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialSiteService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialSiteService.cs
index 81b167427..54b981c3d 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialSiteService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialSiteService.cs
@@ -13,6 +13,6 @@ namespace IRaCIS.Core.Application.Interfaces
         Task<PageOutput<SiteStatDTO>> GetSiteCRCList(SiteCrcQueryDTO param);
         Task<IResponseOutput<PageOutput<SiteStatSimpleDTO>> > GetSiteCRCSimpleList(SiteCrcQueryDTO param);
         Task<PageOutput<TrialSiteScreeningDTO>> GetTrialSiteScreeningList(TrialSiteQuery trialSiteQuery);
-        Task<IEnumerable<TrialSiteForSelect>> GetTrialSiteSelect(Guid trialId);
+        Task<IEnumerable<TrialSiteForSelect>> GetTrialSiteSelect(Guid trialId, bool? ignoreDisable);
     }
 }
\ No newline at end of file
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs
index 3d03a692b..8efbe7415 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs
@@ -268,6 +268,7 @@ namespace IRaCIS.Core.Application.Services
         ///   获取项目下的 site 下拉框数据    CRC只看到他负责的    
         /// </summary>
         /// <param name="trialId"></param>
+        /// <param name="ignoreDisable"></param>
         /// <returns></returns>
         [HttpGet("{trialId:guid}")]
         public async Task<IEnumerable<TrialSiteForSelect>> GetTrialSiteSelect(Guid trialId, bool? ignoreDisable)

From 70160cb937eac001688b8ecc5a4a163a62932664 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 17 Jun 2026 17:17:01 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=BF=BD=E7=95=A5null=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/IRaCIS.Core.Application.xml     | 9 +++++----
 IRaCIS.Core.Application/Service/Visit/SubjectService.cs | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 2df12f3b0..8b8aff1fd 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -17516,17 +17516,17 @@
         </member>
         <member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Question">
             <summary>
-            ����
+            质疑
             </summary>
         </member>
         <member name="F:IRaCIS.Core.Application.ViewModel.AccessToDialogueEnum.Consistency">
             <summary>
-            һ���Ժ˲�
+            一致性核查
             </summary>
         </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.CopyFrontAuditConfigItemDto">
             <summary>
-            ����
+            复制
             </summary>
         </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.SystemNoticeView">
@@ -20265,11 +20265,12 @@
             <param name="editTrialSiteCommand"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Services.TrialMaintenanceService.GetTrialSiteSelect(System.Guid)">
+        <member name="M:IRaCIS.Core.Application.Services.TrialMaintenanceService.GetTrialSiteSelect(System.Guid,System.Nullable{System.Boolean})">
             <summary>
               获取项目下的 site 下拉框数据    CRC只看到他负责的    
             </summary>
             <param name="trialId"></param>
+            <param name="ignoreDisable"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.Services.TrialMaintenanceService.DeleteTrialSite(System.Guid)">
diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectService.cs
index 083474c56..17a78b217 100644
--- a/IRaCIS.Core.Application/Service/Visit/SubjectService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/SubjectService.cs
@@ -74,7 +74,7 @@ namespace IRaCIS.Core.Application.Service
         public async Task<IResponseOutput> UpdateSubjectStatus(SubjectStatusChangeCommand subjectStatusChangeCommand)
         {
             subjectStatusChangeCommand.IsSubjectQuit = subjectStatusChangeCommand.Status == SubjectStatus.EndOfVisit;
-            await _subjectRepository.UpdateFromDTOAsync(subjectStatusChangeCommand, true);
+            await _subjectRepository.UpdateFromDTOAsync(subjectStatusChangeCommand,true, false);
             return ResponseOutput.Ok();
         }