IRC_NewDev
parent
960f479b91
commit
f2b53cd359
|
@ -230,7 +230,7 @@ namespace IRaCIS.Core.Application.Service
|
|||
.WhereIf(inQuery.IsInvalid != null, t => t.IsInvalid == inQuery.IsInvalid)
|
||||
.WhereIf(inQuery.IsGetBeRead,x=>!x.IsInvalid&&x.AuditState!= MedicalReviewAuditState.HaveSigned)
|
||||
.WhereIf(inQuery.TrialReadingCriterionId != null, t => t.VisitTask.TrialReadingCriterionId == inQuery.TrialReadingCriterionId)
|
||||
.OrderBy(x => x.AuditStateSort).ThenBy(x=>x.VisitTask.SubjectId).ThenBy(x=>x.VisitTask.ArmEnum).ThenBy(x=>x.VisitTask.VisitTaskNum)
|
||||
.OrderBy(x => x.AuditState== MedicalReviewAuditState.WaitAudit|| x.AuditState == MedicalReviewAuditState.Auditing).ThenBy(x=>x.VisitTask.SubjectId).ThenBy(x=>x.VisitTask.ArmEnum).ThenBy(x=>x.VisitTask.VisitTaskNum)
|
||||
.ProjectTo<TaskMedicalReviewView>(_mapper.ConfigurationProvider);
|
||||
|
||||
|
||||
|
|
|
@ -59,14 +59,6 @@ namespace IRaCIS.Core.Domain.Models
|
|||
[Required]
|
||||
public MedicalReviewAuditState AuditState { get; set; }
|
||||
|
||||
public int AuditStateSort {
|
||||
|
||||
get
|
||||
{
|
||||
return AuditState==MedicalReviewAuditState.HaveSigned?2:1;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
|
|
Loading…
Reference in New Issue