diff --git a/IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs b/IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs index 474d87f95..43973f565 100644 --- a/IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs +++ b/IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs @@ -35,10 +35,20 @@ namespace IRaCIS.Core.Application.Contracts } + public class TrialSignDocView:UnionDocumentWithConfirmInfoView + { + public string TrialCode { get; set; } + public string ResearchProgramNo { get; set; } + + public string ExperimentName { get; set; } + + } + public class UnionDocumentWithConfirmInfoView: UnionDocumentView { - public string TrialCode { get; set; } + + public DateTime? ConfirmTime { get; set; } public Guid? ConfirmUserId { get; set; } diff --git a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs index b271fcc00..b41b3d1b5 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs @@ -67,7 +67,7 @@ namespace IRaCIS.Core.Application.Services } [HttpPost] - public async Task> GetTrialSignDocumentList(TrialDocQuery querySystemDocument) + public async Task> GetTrialSignDocumentList(TrialDocQuery querySystemDocument) { var trialDocQueryable = from trialDoc in _trialDocumentRepository.AsQueryable(true) .WhereIf(querySystemDocument.TrialId!=null,t=>t.TrialId==querySystemDocument.TrialId) @@ -78,9 +78,11 @@ namespace IRaCIS.Core.Application.Services new { trialUser.UserId, TrialDocumentId = trialDoc.Id } equals new { UserId = confirm.ConfirmUserId, confirm.TrialDocumentId } into cc from confirm in cc.DefaultIfEmpty() - select new UnionDocumentWithConfirmInfoView() + select new TrialSignDocView() { TrialCode=trialDoc.Trial.TrialCode, + ResearchProgramNo = trialDoc.Trial.ResearchProgramNo, + ExperimentName = trialDoc.Trial.ExperimentName, Id = trialDoc.Id, IsSystemDoc = false, CreateTime = trialDoc.CreateTime,