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

修改重阅追踪过滤条件

Uat_Study
hang 2022-07-21 15:44:41 +08:00
parent 5a9b60dfa0
commit 92d1273506
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,6 +48,8 @@ namespace IRaCIS.Core.Application.ViewModel
public Guid SiteId { get; set; } public Guid SiteId { get; set; }
public String TrialSiteCode { get; set; } = String.Empty; public String TrialSiteCode { get; set; } = String.Empty;
public string SubjectCode { get; set; } = String.Empty; public string SubjectCode { get; set; } = String.Empty;
public bool
} }
@ -94,7 +96,7 @@ namespace IRaCIS.Core.Application.ViewModel
public class AnalysisTaskView: ReadingTaskView public class AnalysisTaskView: ReadingTaskView
{ {
public bool IsSelfAnalysis { get; set; } public bool? IsSelfAnalysis { get; set; }
} }
//public class IRReReadingTaskView: ReReadingTaskView //public class IRReReadingTaskView: ReReadingTaskView
@ -112,7 +114,7 @@ namespace IRaCIS.Core.Application.ViewModel
public Guid Id { get; set; } public Guid Id { get; set; }
public VisitTaskView OriginalReReadingTask { get; set; } public AnalysisTaskView OriginalReReadingTask { get; set; }
public string? ReReadingNewTaskCode { get; set; } public string? ReReadingNewTaskCode { get; set; }

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

@ -757,7 +757,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
var visitTaskQueryable = _visitTaskReReadingRepository var visitTaskQueryable = _visitTaskReReadingRepository
.Where(t => t.OriginalReReadingTask.TrialId == queryVisitTask.TrialId && t.OriginalReReadingTask.IsAnalysisCreate == false) .Where(t => t.OriginalReReadingTask.TrialId == queryVisitTask.TrialId /*&& t.OriginalReReadingTask.IsAnalysisCreate == false*/)
.WhereIf(queryVisitTask.RootReReadingTaskId != null, t => t.RootReReadingTaskId == queryVisitTask.RootReReadingTaskId || t.OriginalReReadingTaskId == queryVisitTask.RootReReadingTaskId) .WhereIf(queryVisitTask.RootReReadingTaskId != null, t => t.RootReReadingTaskId == queryVisitTask.RootReReadingTaskId || t.OriginalReReadingTaskId == queryVisitTask.RootReReadingTaskId)
.WhereIf(!string.IsNullOrEmpty(queryVisitTask.TaskCode), t => t.OriginalReReadingTask.TaskCode.Contains(queryVisitTask.TaskCode) || t.RootReReadingTask.TaskCode.Contains(queryVisitTask.TaskCode)) .WhereIf(!string.IsNullOrEmpty(queryVisitTask.TaskCode), t => t.OriginalReReadingTask.TaskCode.Contains(queryVisitTask.TaskCode) || t.RootReReadingTask.TaskCode.Contains(queryVisitTask.TaskCode))
.WhereIf(queryVisitTask.SiteId != null, t => t.OriginalReReadingTask.Subject.SiteId == queryVisitTask.SiteId) .WhereIf(queryVisitTask.SiteId != null, t => t.OriginalReReadingTask.Subject.SiteId == queryVisitTask.SiteId)