签名接口修改

IRaCIS.Core.API/Controllers/FinancialChangeController.cs

@@ -43,11 +43,9 @@ namespace IRaCIS.Core.API.Controllers.Special
 
         public async Task<IResponseOutput> AddOrUpdateTrialInspection(DataInspectionDto<TrialCommand> opt)
         {
-            var fun =await AddOrUpdateTrial(opt.OptCommand);
+            var fun =await AddOrUpdateTrial(opt.Data);
-            opt.AuditInfo.TrialId = fun.Data.Id;
+         
-            opt.AuditInfo.TrialName = fun.Data.ExperimentName;
+            return fun;
-            opt.AuditInfo.ResearchProgramNo = fun.Data.ResearchProgramNo;
-            return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo,null, fun);
         }
 
 

IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs

@@ -7,6 +7,7 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -192,6 +193,14 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
         public bool setOrCancel { get; set; }
     }
 
+
+    public class UpdateTrialStateDto
+    {
+        public Guid trialId  {get; set; }
+        public string trialStatusStr { get; set; }
+
+        public string? reason { get; set; }
+    }
     public class QCPassedOrFailedDto
     {
         public Guid trialId { get; set; }
@@ -261,34 +270,17 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
     /// 稽查泛型Dto
     /// </summary>
     /// <typeparam name="T">泛型</typeparam>
-    public class DataInspectionDto<T> :  IInspectionDTO, ISignDTO
+    public class DataInspectionDto<T> 
     {
       
 
 
-        public T OptCommand { get; set; }
+        public T Data { get; set; }
 
+        [NotDefault]
+        public Guid SignCodeId { 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 Qc

IRaCIS.Core.Application/Service/Inspection/InspectionService.cs

@@ -170,7 +170,18 @@ namespace IRaCIS.Core.Application.Service.Inspection
         }
 
         //public async Task<string> 
-     
+
+
+        /// <summary>
+        /// 传入参数记录ID
+        /// </summary>
+        /// <param name="SignId"></param>
+        /// <returns></returns>
+        public async Task RecordSing(Guid SignId)
+        {
+            _userInfo.SignId = SignId;
+            await _repository.BatchUpdateAsync<TrialSign>(t => t.Id == SignId, u => new TrialSign() { IsCompleted = true });
+        }
 
         /// <summary>
         /// 通用逻辑封装

IRaCIS.Core.Application/Service/Inspection/Interface/IInspectionService.cs

@@ -20,6 +20,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.Interface
 
         Task<Guid> AddSignRecordAsync(SignDTO signDTO);
 
+         Task RecordSing(Guid SignId);
         Task<dynamic> Enforcement(dynamic OptCommand, DataInspectionAddDTO AuditInfo, SignDTO SignInfo, dynamic fun, IResponseOutput? response = null);
 
         //Task SetEnum(DataInspectionAddDTO Data);

IRaCIS.Core.Application/Service/QC/Interface/IQCOperationService.cs

@@ -39,6 +39,7 @@ namespace IRaCIS.Core.Application.Image.QA
         Task<IResponseOutput> UploadVisitCheckExcel(IFormFile file, Guid trialId);
         Task<IResponseOutput> VerifyCanQCPassedOrFailed(Guid subjectVisitId);
 
+ 
         Task<IResponseOutput> ForwardSVDicomImage(Guid[] subjectVisitIdList);
     }
 }