修改

IRaCIS.Core.API/Controllers/InspectionController.cs

@@ -20,6 +20,7 @@ using IRaCIS.Core.Infrastructure.Extention;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Newtonsoft.Json;
 
 namespace IRaCIS.Core.API.Controllers
 {
@@ -33,6 +34,7 @@ namespace IRaCIS.Core.API.Controllers
         private readonly IUserInfo _userInfo;
         private readonly ITrialDocumentService _trialDocumentService;
         private readonly IQCListService _qCListService;
+        private readonly IHttpContextAccessor _httpContext;
         private readonly ITrialConfigService _trialConfigService;
         private readonly INoneDicomStudyService _noneDicomStudyService;
         private readonly ISubjectService _subjectService;
@@ -51,6 +53,7 @@ namespace IRaCIS.Core.API.Controllers
             ITrialDocumentService trialDocumentService,
             IRepository<DataInspection> dataInspectionRepository,
             IQCListService _qCListService,
+              IHttpContextAccessor httpContext,
             IInspectionService sinspectionService,
             ITrialConfigService _trialConfigService,
             INoneDicomStudyService noneDicomStudyService,
@@ -68,6 +71,7 @@ namespace IRaCIS.Core.API.Controllers
             this._inspectionService = sinspectionService;
             this._trialDocumentService = trialDocumentService;
             this._qCListService = _qCListService;
+            this._httpContext = httpContext;
             this._trialConfigService = _trialConfigService;
             this._noneDicomStudyService = noneDicomStudyService;
             this._subjectService = _subjectService;
@@ -353,6 +357,22 @@ namespace IRaCIS.Core.API.Controllers
             return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, fun);
         }
 
+        /// <summary>
+        /// 一致性核查 excel上传 支持三种格式
+        /// </summary>
+        /// <param name="opt"></param>
+        /// <returns></returns>
+        [HttpPost, Route("Inspection/QCOperation/UploadVisitCheckExcel")]
+        [UnitOfWork]
+        public async Task<IResponseOutput> UploadVisitCheckExcel(IFormFile file, [FromForm]UploadVisitCheckExcelDto opt)
+        {
+           
+
+            var fun = await _qCOperationService.UploadVisitCheckExcel(file, opt.trialId);
+
+            var data = JsonConvert.DeserializeObject<DataInspectionAddDTO>(opt.AuditInfo);
+            return await _inspectionService.Enforcement(opt.trialId, data, null, null, fun);
+        }
 
         #endregion
         #region 影像上传

IRaCIS.Core.API/IRaCIS.Core.API.xml

@@ -165,6 +165,13 @@
              <param name="opt"></param>
              <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.UploadVisitCheckExcel(Microsoft.AspNetCore.Http.IFormFile,IRaCIS.Core.Application.Contracts.UploadVisitCheckExcelDto)">
+            <summary>
+            一致性核查 excel上传 支持三种格式
+            </summary>
+            <param name="opt"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.API.Controllers.InspectionController.UpdateSubjectAndSVInfo(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Contracts.UploadSubjectAndVisitCommand})">
             <summary>
             疾病进展确认评估

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -1447,7 +1447,7 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Image.QA.QCOperationService.UploadVisitCheckExcel(Microsoft.AspNetCore.Http.IFormFile,MediatR.IMediator,System.Guid,Microsoft.AspNetCore.Hosting.IWebHostEnvironment)">
+        <member name="M:IRaCIS.Core.Application.Image.QA.QCOperationService.UploadVisitCheckExcel(Microsoft.AspNetCore.Http.IFormFile,System.Guid)">
             <summary>
             一致性核查 excel上传 支持三种格式
             </summary>

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

@@ -35,7 +35,7 @@ namespace IRaCIS.Core.Application.Image.QA
         Task<IResponseOutput> SetVisitUrgent(Guid trialId, Guid subjectVisitId, bool setOrCancel);
         Task<IResponseOutput> UpdateModality(Guid id, int type, [FromQuery] string modality, [FromQuery] string bodyPart);
         Task<IResponseOutput> UpdateSubjectAndSVInfo(UploadSubjectAndVisitCommand command);
-        Task<IResponseOutput> UploadVisitCheckExcel(IFormFile file, [FromServices] IMediator _mediator, Guid trialId, [FromServices] IWebHostEnvironment _hostEnvironment);
+        Task<IResponseOutput> UploadVisitCheckExcel(IFormFile file, Guid trialId);
         Task<IResponseOutput> VerifyCanQCPassedOrFailed(Guid subjectVisitId);
 
         Task<IResponseOutput> ForwardSVDicomImage(Guid[] subjectVisitIdList);

IRaCIS.Core.Application/Service/QC/QCOperationService.cs

@@ -33,12 +33,14 @@ namespace IRaCIS.Core.Application.Image.QA
         private readonly IRepository<SubjectVisit> _subjectVisitRepository;
         private readonly IRepository<Trial> _trialRepository;
         private readonly IServiceProvider serviceProvider;
+        private readonly IMediator _mediator;
         private readonly IInspectionService _inspectionService;
         private object _locker = new object();
 
         public QCOperationService(DicomFileStoreHelper dicomFileStoreHelper, IRepository<SubjectVisit> subjectVisitRepository,
             IRepository<Trial> trialRepository,
             IServiceProvider serviceProvider,
+            IMediator mediator,
                IInspectionService sinspectionService,
             IRepository<DicomStudy> _trialRepository
             )
@@ -47,6 +49,7 @@ namespace IRaCIS.Core.Application.Image.QA
             _subjectVisitRepository = subjectVisitRepository;
             this._trialRepository = trialRepository;
             this.serviceProvider = serviceProvider;
+            _mediator = mediator;
             this._inspectionService = sinspectionService;
         }
 
@@ -549,7 +552,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// <returns></returns>
         [HttpPost("{trialId:guid}")]
         [TypeFilter(typeof(TrialResourceFilter))]
-        public async Task<IResponseOutput> UploadVisitCheckExcel(IFormFile file, [FromServices] IMediator _mediator, Guid trialId, [FromServices] IWebHostEnvironment _hostEnvironment)
+        public async Task<IResponseOutput> UploadVisitCheckExcel(IFormFile file,  Guid trialId)
         {
             if (_userInfo.UserTypeEnumInt != (int)UserTypeEnum.ProjectManager)
             {

IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs

@@ -111,7 +111,13 @@ namespace IRaCIS.Core.Application.Contracts
 
     }
 
+    public class UploadVisitCheckExcelDto
+    {
      
+        public Guid trialId { get; set; }
+
+        public string AuditInfo { get; set; }
+    }
     public class ForwardSVDicomImageDto
     {
         public Guid[] subjectVisitIdList { get; set; }