From b770f8765d6c190c914e46427d21dda623b9f0f7 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 30 Jun 2025 16:15:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Allocation/TaskAllocationRuleService.cs         | 6 +++---
 .../Service/ImageAndDoc/DownloadAndUploadService.cs         | 4 ++--
 IRaCIS.Core.Domain/Trial/Enroll.cs                          | 4 ++++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs
index f01f99ede..07864c8d8 100644
--- a/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs
@@ -48,7 +48,7 @@ namespace IRaCIS.Core.Application.Service
 
 
 
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
 
         public async Task<IResponseOutput> AddOrUpdateTaskAllocationRule(TaskAllocationRuleAddOrEdit addOrEditTaskAllocationRule)
         {
@@ -79,7 +79,7 @@ namespace IRaCIS.Core.Application.Service
 
         }
 
-        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
 
         [HttpDelete("{taskAllocationRuleId:guid}")]
         public async Task<IResponseOutput> DeleteTaskAllocationRule(Guid taskAllocationRuleId)
@@ -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.EnrollStatus >= EnrollStatus.ConfirmIntoGroup)
+            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))
                         join user in _userRoleRepository.AsQueryable() on enroll.DoctorId equals user.DoctorId
                         select new TrialDoctorUserSelectView()
                         {
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
index 7695767ee..71918706c 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
@@ -1013,7 +1013,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                                     InstancePathList = z.DicomInstanceList.Select(k => new
                                     {
                                         k.Path,
-                                        k.FileSize
+                                         k.FileSize
                                     })
                                 })
 
@@ -1031,7 +1031,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                                 {
                                     file.FileName,
                                     file.Path,
-                                    file.FileType,
+                                     file.FileType,
                                     file.FileSize
                                 })
                             })
diff --git a/IRaCIS.Core.Domain/Trial/Enroll.cs b/IRaCIS.Core.Domain/Trial/Enroll.cs
index f41341c99..794be0fa1 100644
--- a/IRaCIS.Core.Domain/Trial/Enroll.cs
+++ b/IRaCIS.Core.Domain/Trial/Enroll.cs
@@ -19,6 +19,10 @@ public partial class Enroll : BaseFullAuditEntity
 
     [JsonIgnore]
     public List<EnrollReadingCriterion> EnrollReadingCriteriaList { get; set; }
+
+    [JsonIgnore]
+
+    public TaskAllocationRule TaskAllocationRule { get; set; }
     #endregion
     public Guid DoctorId { get; set; }
     public Guid TrialId { get; set; }