diff --git a/IRaCIS.Core.API/Controllers/InspectionController.cs b/IRaCIS.Core.API/Controllers/InspectionController.cs index 1cae76a89..11757f537 100644 --- a/IRaCIS.Core.API/Controllers/InspectionController.cs +++ b/IRaCIS.Core.API/Controllers/InspectionController.cs @@ -109,7 +109,6 @@ namespace IRaCIS.Core.API.Controllers public async Task ConfigTrialBasicInfo(DataInspectionDto opt) { - var fun = _trialConfigService.ConfigTrialBasicInfo; return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, fun); } diff --git a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs index cf00aa670..9a0d5ffe2 100644 --- a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs +++ b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs @@ -1,4 +1,5 @@ -using IRaCIS.Application.Contracts; +using Castle.Core.Internal; +using IRaCIS.Application.Contracts; using IRaCIS.Core.Application.Contracts; using Newtonsoft.Json; using System; @@ -141,15 +142,34 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO #endregion - public class DataInspectionDto : InspectionBase, IInspectionDTO, ISignDTO + public class DataInspectionDto : IInspectionDTO, ISignDTO { - public DataInspectionDto() - { - this.AuditInfo.JsonDetail= JsonConvert.SerializeObject(this.OptCommand); - } + public T OptCommand { get; set; } + + + public DataInspectionAddDTO AuditInfo + { + get + { + if (auditInfo.JsonDetail.IsNullOrEmpty()) + { + auditInfo.JsonDetail = JsonConvert.SerializeObject(OptCommand); + } + + return auditInfo; + } + set + { + auditInfo = value; + } + } + + private DataInspectionAddDTO auditInfo=new DataInspectionAddDTO (); + + public SignDTO SignInfo { get; set; } = new SignDTO() { }; } #region 受试者