From 12a2683bc3e997d2e585acf96df8f6331f0c5f47 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 30 Jun 2025 17:19:54 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E4=BA=BA=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Allocation/TaskAllocationRuleService.cs             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs
index 07864c8d8..3464c55bc 100644
--- a/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs
@@ -125,7 +125,7 @@ namespace IRaCIS.Core.Application.Service
         [HttpGet("{trialId:guid}")]
         public async Task<List<TrialDoctorUserSelectView>> GetDoctorUserSelectList(Guid trialId, [FromServices] IRepository<Enroll> _enrollRepository)
         {
-            var query = from enroll in _enrollRepository.Where(t => t.TrialId == trialId /*&& t.TaskAllocationRule.IsEnable*/ && /*(t.EnrollStatus >= EnrollStatus.ConfirmIntoGroup ||*/ t.Trial.VisitTaskList.Any(v => v.DoctorUserId == t.DoctorUser.Id))
+            var query = from enroll in _enrollRepository.Where(t => t.TrialId == trialId /*&& t.TaskAllocationRule.IsEnable*/ && /*(t.EnrollStatus >= EnrollStatus.ConfirmIntoGroup ||*/ t.Trial.SubjectDoctorUserList.Any(v => v.DoctorUserId == t.DoctorUser.Id))
                         join user in _userRoleRepository.AsQueryable() on enroll.DoctorId equals user.DoctorId
                         select new TrialDoctorUserSelectView()
                         {

From bc5b93b92427fab82dd223f81c4cf84243d0fd20 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 1 Jul 2025 16:04:21 +0800
Subject: [PATCH 2/3] =?UTF-8?q?QC=20=E9=97=AE=E9=A2=98=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E7=A8=BD=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/TrialSiteUser/TrialConfigService.cs                | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
index ecc94cf0f..3cc926a75 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
@@ -903,7 +903,8 @@ namespace IRaCIS.Core.Application
                     throw new BusinessValidationFailedException(_localizer["TrialConfig_AuditQuestionConfirmed"]);
                 }
 
-                await _trialQCQuestionRepository.UpdatePartialFromQueryAsync(t => t.TrialId == signConfirmDTO.TrialId, x => new TrialQCQuestion
+                //不记录这个稽查，不关注问题上的确认标记
+                await _trialQCQuestionRepository.BatchUpdateNoTrackingAsync(t => t.TrialId == signConfirmDTO.TrialId, x => new TrialQCQuestion
                 {
                     IsConfirm = true
                 });

From 6d9cfe5e453d997ebd1fbbbf84d98857a87e4487 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 1 Jul 2025 16:21:38 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A8=BD=E6=9F=A5?=
 =?UTF-8?q?=EF=BC=8C=E5=BF=BD=E7=95=A5UserRole=20=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E7=A8=BD=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Inspection/FrontAuditConfigService.cs               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs
index d8473c5f3..570ebd0c7 100644
--- a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs
@@ -364,7 +364,7 @@ namespace IRaCIS.Core.Application.Service
                 var relationParentInspection = await _dataInspectionRepository.Where(t => t.GeneralId == objectRelationParentId && (t.CreateTime <= createTime || t.BatchId == batchId) && t.Id != id).OrderByDescending(x => x.CreateTime).Select(t => new { t.ObjectRelationParentId, t.CreateTime, t.JsonDetail, t.BatchId, t.ObjectRelationParentId2, t.ObjectRelationParentId3, t.EntityName, t.Id }).FirstOrDefaultAsync();
 
 
-                if (relationParentInspection != null)
+                if (relationParentInspection != null && relationParentInspection.EntityName!="UserRole")
                 {
 
                     Dictionary<string, object> jsonDic = (JsonConvert.DeserializeObject<Dictionary<string, object>>(relationParentInspection.JsonDetail)).IfNullThrowConvertException();