修改统计

This commit is contained in:
2025-04-09 15:09:53 +08:00
parent a7848727ee
commit 2ceddc1340
9 changed files with 265 additions and 87 deletions
@@ -11,6 +11,32 @@ using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Application.Contracts
{
public class ImageBackQueryDto : PageInput
{
[NotDefault]
public Guid TrialId { get; set; }
public Guid? TrialSiteId { get; set; }
public string SubjectCode { get; set; } = string.Empty;
public Guid? CreateUserId { get; set; }
public ImageBackApplyEnum? ApplyUserRole { get; set; }
public DateTime? ApplyBeginTime { get; set; }
public DateTime? ApplyEndTime { get; set; }
public ImageBackStateEnum? ImageBackState { get; set; }
public DateTime? AuditBeginTime { get; set; }
public DateTime? AuditEndTime { get; set; }
}
public class CRCVisitSearchDTO : PageInput
{
@@ -166,7 +192,7 @@ namespace IRaCIS.Core.Application.Contracts
[Comment("阅片任务产生之前 采集影像")]
public CollectImagesType CollectImagesEnum { get; set; }
public List<StudyName> StudyNameList { get; set; }
public List<StudyName> StudyNameList { get; set; }
public List<string> ImageFormatList { get; set; }
@@ -1687,6 +1713,40 @@ namespace IRaCIS.Core.Application.Contracts
#endregion
public class ImageBackViewModel
{
public Guid Id { get; set; }
public DateTime CreateTime { get; set; }
public string CreateUserName { get; set; }
public string CreateUserFullName { get; set; }
public DateTime? AuditTime { get; set; }
public Guid SubjectVisitId { get; set; }
public ImageBackApplyEnum ApplyUserRole { get; set; }
public ImageBackStateEnum ImageBackState { get; set; }
public bool IsUrgent { get; set; }
public string VisitName { get; set; } = string.Empty;
public DateTime? EarliestScanDate { get; set; }
public DateTime? LatestScanDate { get; set; }
public decimal VisitNum { get; set; }
public string SubjectCode { get; set; } = String.Empty;
public String TrialSiteCode { get; set; } = String.Empty;
}
public class QCCRCVisitViewModel : QCVisitBasicListViewModel
@@ -2108,7 +2168,6 @@ namespace IRaCIS.Core.Application.Contracts
public DateTime? ReviewAuditTime { get; set; }
public DateTime? PreliminaryAuditTime { get; set; }
public ImageBackStateEnum ImageBackState { get; set; }
public DateTime? AuditTime => QCProcessEnum == TrialQCProcess.SingleAudit ? PreliminaryAuditTime : (QCProcessEnum == TrialQCProcess.DoubleAudit ? ReviewAuditTime : null);
}