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

修改IR 阅片查询
continuous-integration/drone/push Build is passing Details

Test_HIR_Net8
hang 2024-11-28 10:49:45 +08:00
parent a8c9587572
commit 0ab9cebe45
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
View File

@ -649,6 +649,9 @@ namespace IRaCIS.Core.Application.ViewModel
public class IRUnReadSubjectQuery : PageInput
{
public string? PatientName { get; set; }
public string? PatientIdStr { get; set; }
public Guid TrialId { get; set; }
public string SubjectCode { get; set; }

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

@ -1051,6 +1051,10 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
.WhereIf(!string.IsNullOrEmpty(inQuery.SubjectCode), t => (t.OriginalReReadingTask.Subject.Code.Contains(inQuery.SubjectCode) && t.OriginalReReadingTask.IsAnalysisCreate == false) || (t.OriginalReReadingTask.BlindSubjectCode.Contains(inQuery.SubjectCode) && t.OriginalReReadingTask.IsAnalysisCreate))
.WhereIf(inQuery.BeginAllocateDate != null, t => t.OriginalReReadingTask.AllocateTime > inQuery.BeginAllocateDate)
.WhereIf(inQuery.EndAllocateDate != null, t => t.OriginalReReadingTask.AllocateTime < inQuery.EndAllocateDate!.Value.AddDays(1))
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.PatientIdStr), t => t.OriginalReReadingTask.Subject.SubjectPatientList.Any(t => t.Patient.PatientIdStr.Contains(inQuery.PatientIdStr)))
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.PatientName), t => t.OriginalReReadingTask.Subject.SubjectPatientList.Any(t => t.Patient.PatientName.Contains(inQuery.PatientName)))
.ProjectTo<ReReadingTaskView>(_mapper.ConfigurationProvider);
@ -1136,6 +1140,8 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
TrialId = trialId,
TrialReadingCriterionId = trialReadingCriterionId,
SubjectCode = inQuery.SubjectCode,
PatientIdStr=inQuery.PatientIdStr,
PatientName=inQuery.PatientName,
PageIndex = inQuery.PageIndex,
PageSize = inQuery.PageSize,