Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

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; }
     }
 
 

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,

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs

@@ -254,6 +254,8 @@ namespace IRaCIS.Application.Contracts
 
         #region 中心调研
 
+        public bool IsCloseEquipmentSurvey { get; set; }
+
         public List<string> NotShowFieldList { get; set; } = new List<string>();
 
         public List<SiteSurveyModifyFiled> ModifyFiledList { get; set; } = new List<SiteSurveyModifyFiled>();