diff --git a/IRaCIS.Core.Application/MassTransit/Command/ConsistenCheckCommand.cs b/IRaCIS.Core.Application/MassTransit/Command/ConsistenCheckCommand.cs index 5f085ff13..899ce5d77 100644 --- a/IRaCIS.Core.Application/MassTransit/Command/ConsistenCheckCommand.cs +++ b/IRaCIS.Core.Application/MassTransit/Command/ConsistenCheckCommand.cs @@ -43,6 +43,10 @@ namespace IRaCIS.Core.Application.MassTransit.Command public DateTime CheckTime { get; set; } public string CheckResult { get; set; } + + + [DictionaryTranslateAttribute("CheckState")] + public CheckStateEnum CheckState { get; set; } } diff --git a/IRaCIS.Core.Application/MassTransit/Consumer/ConsistencyCheckConsumer.cs b/IRaCIS.Core.Application/MassTransit/Consumer/ConsistencyCheckConsumer.cs index f27466de2..d3e7c50e6 100644 --- a/IRaCIS.Core.Application/MassTransit/Consumer/ConsistencyCheckConsumer.cs +++ b/IRaCIS.Core.Application/MassTransit/Consumer/ConsistencyCheckConsumer.cs @@ -403,6 +403,7 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer { SubjectStatus = dbCurrentVisitFirst.SubjectStatus, CheckTime = DateTime.Now, + CheckState=CheckStateEnum.CVPassed, SiteCode = dbCurrentVisitFirst.SiteCode, SubjectCode = dbCurrentVisitFirst.SubjectCode, VisitName = dbCurrentVisitFirst.VisitName, @@ -420,6 +421,7 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer fullCheckResultList.Add(new FullCheckResult() { SubjectStatus = dbCurrentVisitFirst.SubjectStatus, + CheckState = CheckStateEnum.None, CheckTime = DateTime.Now, SiteCode = dbCurrentVisitFirst.SiteCode, SubjectCode = dbCurrentVisitFirst.SubjectCode, diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs index 97723c2ba..466bdfb8d 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs @@ -254,6 +254,8 @@ namespace IRaCIS.Application.Contracts #region 中心调研 + public bool IsCloseEquipmentSurvey { get; set; } + public List NotShowFieldList { get; set; } = new List(); public List ModifyFiledList { get; set; } = new List();