XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改查询

Test_IRC_Net8
hang 2025-06-30 16:15:41 +08:00
parent 49a7d5fc29
commit b770f8765d
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs
View File

@ -48,7 +48,7 @@ namespace IRaCIS.Core.Application.Service
[TrialGlobalLimit( "AfterStopCannNotOpt" )] [TrialGlobalLimit("AfterStopCannNotOpt")]
public async Task<IResponseOutput> AddOrUpdateTaskAllocationRule(TaskAllocationRuleAddOrEdit addOrEditTaskAllocationRule) public async Task<IResponseOutput> AddOrUpdateTaskAllocationRule(TaskAllocationRuleAddOrEdit addOrEditTaskAllocationRule)
{ {
@ -79,7 +79,7 @@ namespace IRaCIS.Core.Application.Service
} }
[TrialGlobalLimit( "AfterStopCannNotOpt" )] [TrialGlobalLimit("AfterStopCannNotOpt")]
[HttpDelete("{taskAllocationRuleId:guid}")] [HttpDelete("{taskAllocationRuleId:guid}")]
public async Task<IResponseOutput> DeleteTaskAllocationRule(Guid taskAllocationRuleId) public async Task<IResponseOutput> DeleteTaskAllocationRule(Guid taskAllocationRuleId)
@ -125,7 +125,7 @@ namespace IRaCIS.Core.Application.Service
[HttpGet("{trialId:guid}")] [HttpGet("{trialId:guid}")]
public async Task<List<TrialDoctorUserSelectView>> GetDoctorUserSelectList(Guid trialId, [FromServices] IRepository<Enroll> _enrollRepository) 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 join user in _userRoleRepository.AsQueryable() on enroll.DoctorId equals user.DoctorId
select new TrialDoctorUserSelectView() select new TrialDoctorUserSelectView()
{ {

4
IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
View File

@ -1013,7 +1013,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
InstancePathList = z.DicomInstanceList.Select(k => new InstancePathList = z.DicomInstanceList.Select(k => new
{ {
k.Path, k.Path,
k.FileSize k.FileSize
}) })
}) })
@ -1031,7 +1031,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
{ {
file.FileName, file.FileName,
file.Path, file.Path,
file.FileType, file.FileType,
file.FileSize file.FileSize
}) })
}) })

4
IRaCIS.Core.Domain/Trial/Enroll.cs
View File

@ -19,6 +19,10 @@ public partial class Enroll : BaseFullAuditEntity
[JsonIgnore] [JsonIgnore]
public List<EnrollReadingCriterion> EnrollReadingCriteriaList { get; set; } public List<EnrollReadingCriterion> EnrollReadingCriteriaList { get; set; }
[JsonIgnore]
public TaskAllocationRule TaskAllocationRule { get; set; }
#endregion #endregion
public Guid DoctorId { get; set; } public Guid DoctorId { get; set; }
public Guid TrialId { get; set; } public Guid TrialId { get; set; }