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

修改

IRC_NewDev
he 2024-03-25 09:30:12 +08:00
parent d6dacb93dd
commit 960f479b91
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -230,7 +230,7 @@ namespace IRaCIS.Core.Application.Service
.WhereIf(inQuery.IsInvalid != null, t => t.IsInvalid == inQuery.IsInvalid) .WhereIf(inQuery.IsInvalid != null, t => t.IsInvalid == inQuery.IsInvalid)
.WhereIf(inQuery.IsGetBeRead,x=>!x.IsInvalid&&x.AuditState!= MedicalReviewAuditState.HaveSigned) .WhereIf(inQuery.IsGetBeRead,x=>!x.IsInvalid&&x.AuditState!= MedicalReviewAuditState.HaveSigned)
.WhereIf(inQuery.TrialReadingCriterionId != null, t => t.VisitTask.TrialReadingCriterionId == inQuery.TrialReadingCriterionId) .WhereIf(inQuery.TrialReadingCriterionId != null, t => t.VisitTask.TrialReadingCriterionId == inQuery.TrialReadingCriterionId)
.OrderBy(x => x.AuditState).ThenBy(x=>x.VisitTask.SubjectId).ThenBy(x=>x.VisitTask.ArmEnum).ThenBy(x=>x.VisitTask.VisitTaskNum) .OrderBy(x => x.AuditStateSort).ThenBy(x=>x.VisitTask.SubjectId).ThenBy(x=>x.VisitTask.ArmEnum).ThenBy(x=>x.VisitTask.VisitTaskNum)
.ProjectTo<TaskMedicalReviewView>(_mapper.ConfigurationProvider); .ProjectTo<TaskMedicalReviewView>(_mapper.ConfigurationProvider);

16
IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs
View File

@ -59,12 +59,20 @@ namespace IRaCIS.Core.Domain.Models
[Required] [Required]
public MedicalReviewAuditState AuditState { get; set; } public MedicalReviewAuditState AuditState { get; set; }
public int AuditStateSort {
get
{
return AuditState==MedicalReviewAuditState.HaveSigned?2:1;
}
}
/// <summary>
/// 审核通过时间 /// <summary>
/// </summary> /// 审核通过时间
public DateTime? AuditSignTime { get; set; } /// </summary>
public DateTime? AuditSignTime { get; set; }
/// <summary> /// <summary>
/// 阅片人是否认同 /// 阅片人是否认同