清理仓储完成3

IRC.Core.SCP/Service/BaseService.cs

@@ -26,7 +26,6 @@ namespace IRaCIS.Core.SCP.Service
 
         public IUserInfo _userInfo { get; set; }
 
-        public IRepository _repository { get; set; }
 
         public IStringLocalizer _localizer { get; set; }
 
@@ -51,9 +50,6 @@ namespace IRaCIS.Core.SCP.Service
         [MemberNotNull(nameof(_userInfo))]
         public IUserInfo _userInfo { get; set; }
 
-        [MemberNotNull(nameof(_repository))]
-        public IRepository _repository { get; set; }
-
         [MemberNotNull(nameof(_localizer))]
         public IStringLocalizer _localizer { get; set; }
 
@@ -75,8 +71,7 @@ namespace IRaCIS.Core.SCP.Service
         [MemberNotNull(nameof(_userInfo))]
         public IUserInfo _userInfo { get; set; }
 
-        [MemberNotNull(nameof(_repository))]
+
-        public IRepository _repository { get; set; }
 
         [MemberNotNull(nameof(_localizer))]
         public IStringLocalizer _localizer { get; set; }
@@ -93,8 +88,6 @@ namespace IRaCIS.Core.SCP.Service
 
         public IUserInfo _userInfo { get; set; }
 
-        public IRepository _repository { get; set; }
-
         public IStringLocalizer _localizer { get; set; }
 
         public static IResponseOutput Null404NotFound<TEntity>(TEntity? businessObject) where TEntity : class

IRaCIS.Core.API/Controllers/ExtraController.cs

@@ -428,7 +428,7 @@ namespace IRaCIS.Api.Controllers
 
         [HttpGet, Route("ip")]
         [AllowAnonymous]
-        public IResponseOutput Get([FromServices] IHttpContextAccessor _context/*, [FromServices] IUserService _userService*/)
+        public IResponseOutput Get([FromServices] IHttpContextAccessor _context)
         {
 
             StringBuilder sb = new StringBuilder();
@@ -449,7 +449,7 @@ namespace IRaCIS.Api.Controllers
 
         [HttpGet, Route("ip2")]
         [AllowAnonymous]
-        public IResponseOutput Get2([FromServices] IHttpContextAccessor _context, [FromServices] IRepository _userService)
+        public IResponseOutput Get2([FromServices] IHttpContextAccessor _context)
         {
 
             StringBuilder sb = new StringBuilder();

IRaCIS.Core.API/Controllers/FinancialChangeController.cs

@@ -19,18 +19,12 @@ namespace IRaCIS.Core.API.Controllers.Special
     //谨慎修改 涉及到财务模块
 
     [ApiController, Authorize, ApiExplorerSettings(GroupName = "Financial")]
-    public class FinancialChangeController : ControllerBase
+    public class FinancialChangeController(
+        ITrialService _trialService,
+        ICalculateService _calculateService,
+        IStringLocalizer _localizer) : ControllerBase
     {
-        private readonly ITrialService _trialService;
+       
-        private readonly ICalculateService _calculateService;
-		private  IStringLocalizer _localizer { get; set; }
-		public FinancialChangeController(ITrialService trialService, ICalculateService calculateService, IStringLocalizer localizer
-			)
-        {
-            _localizer = localizer;
-			_trialService = trialService;
-            _calculateService = calculateService;
-        }
 
 
         //[TrialAudit(AuditType.TrialAudit, AuditOptType.AddOrUpdateTrial)]

IRaCIS.Core.API/Controllers/InspectionController.cs

@@ -26,77 +26,18 @@ namespace IRaCIS.Core.API.Controllers
 
     [ApiController, ApiExplorerSettings(GroupName = "Reviewer")]
     [UnitOfWork]
-    public class InspectionController : ControllerBase
+    public class InspectionController(
+        ITrialDocumentService _trialDocumentService,
+        IReadingImageTaskService _iReadingImageTaskService,
+        ITrialConfigService _trialConfigService,
+        IClinicalAnswerService _clinicalAnswerService,
+        IReadingClinicalDataService _readingClinicalDataService,
+        IQCOperationService _qCOperationService,
+        IInspectionService _inspectionService,
+        IReadingMedicalReviewService _readingMedicalReviewService,
+        IReadingMedicineQuestionService _readingMedicineQuestionService
+        ) : ControllerBase
     {
-        private readonly IRepository _repository;
-        private readonly IMapper _mapper;
-        private readonly IUserInfo _userInfo;
-        private readonly ITrialDocumentService _trialDocumentService;
-        private readonly IQCListService _qCListService;
-        private readonly IReadingImageTaskService _iReadingImageTaskService;
-        private readonly IHttpContextAccessor _httpContext;
-        private readonly ITrialConfigService _trialConfigService;
-        private readonly INoneDicomStudyService _noneDicomStudyService;
-        private readonly IClinicalAnswerService _clinicalAnswerService;
-        private readonly ISubjectService _subjectService;
-        private readonly IReadingClinicalDataService _readingClinicalDataService;
-        private readonly ISubjectVisitService _subjectVisitService;
-        private readonly IQCOperationService _qCOperationService;
-        private readonly IClinicalDataService _clinicalDataService;
-        private readonly IVisitPlanService _visitPlanService;
-     
-        private readonly IInspectionService _inspectionService;
-        private readonly IReadingMedicalReviewService _readingMedicalReviewService;
-        private readonly IReadingMedicineQuestionService _readingMedicineQuestionService;
-        private readonly IRepository<DataInspection> _dataInspectionRepository;
-        private delegate Task<IResponseOutput> executionFun(dynamic data);
-
-        public InspectionController(IRepository repository,
-            IRepository<DataInspection> _repositoryDataInspection,
-            IMapper mapper, IUserInfo userInfo,
-            ITrialDocumentService trialDocumentService,
-            IRepository<DataInspection> dataInspectionRepository,
-            IQCListService _qCListService,
-              IReadingImageTaskService _iReadingImageTaskService,
-            IHttpContextAccessor httpContext,
-            IInspectionService sinspectionService,
-              IReadingMedicalReviewService readingMedicalReviewService,
-             IReadingMedicineQuestionService readingMedicineQuestionService,
-            ITrialConfigService _trialConfigService,
-            INoneDicomStudyService noneDicomStudyService,
-            IClinicalAnswerService clinicalAnswerService,
-            ISubjectService _subjectService,
-            IReadingClinicalDataService _readingClinicalDataService,
-            ISubjectVisitService subjectVisitService,
-            IQCOperationService qCOperationService,
-            IClinicalDataService clinicalDataService,
-            IVisitPlanService visitPlanService
-            )
-        {
-            this._repository = repository;
-            this._mapper = mapper;
-            this._userInfo = userInfo;
-            this._inspectionService = sinspectionService;
-            this._readingMedicalReviewService = readingMedicalReviewService;
-            this._readingMedicineQuestionService = readingMedicineQuestionService;
-            this._trialDocumentService = trialDocumentService;
-            this._qCListService = _qCListService;
-            this._iReadingImageTaskService = _iReadingImageTaskService;
-            this._httpContext = httpContext;
-            this._trialConfigService = _trialConfigService;
-            this._noneDicomStudyService = noneDicomStudyService;
-            this._clinicalAnswerService = clinicalAnswerService;
-            this._subjectService = _subjectService;
-            this._readingClinicalDataService = _readingClinicalDataService;
-            this._subjectVisitService = subjectVisitService;
-            this._qCOperationService = qCOperationService;
-            this._clinicalDataService = clinicalDataService;
-            this._visitPlanService = visitPlanService;
-            this._dataInspectionRepository = dataInspectionRepository;
-        }
-
-
-
        
         #region 获取稽查数据
         /// <summary>

IRaCIS.Core.API/Controllers/UploadDownLoadController.cs

@@ -230,8 +230,6 @@ namespace IRaCIS.Core.API.Controllers
     [ApiController]
     public class StudyController(
         IMediator _mediator,
-        IWebHostEnvironment _hostEnvironment,
-        IRepository _repository,
         QCCommon _qCCommon,
         IUserInfo _userInfo,
         IRepository<SubjectVisit> _subjectVisitRepository,

IRaCIS.Core.Application/BaseService.cs

@@ -27,7 +27,7 @@ namespace IRaCIS.Core.Application
 
         public IUserInfo _userInfo { get; set; }
 
-        public IRepository _repository { get; set; }
+
 
         public IStringLocalizer _localizer { get; set; }
 
@@ -52,8 +52,6 @@ namespace IRaCIS.Core.Application
         [MemberNotNull(nameof(_userInfo))]
         public IUserInfo _userInfo { get; set; }
 
-        [MemberNotNull(nameof(_repository))]
-        public IRepository _repository { get; set; }
 
         [MemberNotNull(nameof(_localizer))]
         public IStringLocalizer _localizer { get; set; }
@@ -79,9 +77,6 @@ namespace IRaCIS.Core.Application
         [MemberNotNull(nameof(_userInfo))]
         public IUserInfo _userInfo { get; set; }
 
-        [MemberNotNull(nameof(_repository))]
-        public IRepository _repository { get; set; }
-
         [MemberNotNull(nameof(_localizer))]
         public IStringLocalizer _localizer { get; set; }
 
@@ -98,8 +93,6 @@ namespace IRaCIS.Core.Application
 
         public IUserInfo _userInfo { get; set; }
 
-        public IRepository _repository { get; set; }
-
         public IStringLocalizer _localizer { get; set; }
 
         public IFusionCache _fusionCache { get; set; }

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

@@ -994,7 +994,8 @@ namespace IRaCIS.Core.Application.Service
 
 			var additem = await _frontAuditConfigRepository.FirstOrDefaultAsync(x => x.Id == item.AddItemGuid);
 
-			var alllist = _frontAuditConfigRepository.Where(x => item.DataSourceGuids.Contains(x.ParentId)).ToList().GroupBy(x => new { x.ValueCN }, (key, lst) => new FrontAuditConfig
+			//跟踪的方式查询，直接修改，然后保存数据库
+			var alllist = _frontAuditConfigRepository.Where(x => item.DataSourceGuids.Contains(x.ParentId),true).ToList().GroupBy(x => new { x.ValueCN }, (key, lst) => new FrontAuditConfig
 			{
 				Sort = lst.Select(x => x.Sort).FirstOrDefault(),
 				TableConfigJsonStr = lst.Select(x => x.TableConfigJsonStr).FirstOrDefault(),
@@ -1065,7 +1066,6 @@ namespace IRaCIS.Core.Application.Service
 			});
 
 
-			await _repository.UpdateRange(neewupdate);
 			await _frontAuditConfigRepository.AddRangeAsync(list);
 			await _frontAuditConfigRepository.SaveChangesAsync();
 

IRaCIS.Core.Application/TestService.cs

@@ -491,7 +491,7 @@ namespace IRaCIS.Application.Services
         /// <returns></returns>
         [AllowAnonymous]
         [UnitOfWork]
-        public async Task<IResponseOutput> OldLocalImageResizeJpg([FromServices] IOSSService oSSService, [FromServices] IRepository _repository, [FromServices] IWebHostEnvironment _hostEnvironment)
+        public async Task<IResponseOutput> OldLocalImageResizeJpg([FromServices] IOSSService oSSService,  [FromServices] IWebHostEnvironment _hostEnvironment)
         {
 
             var aliConfig = oSSService.ObjectStoreServiceOptions.AliyunOSS;

IRaCIS.Core.Application/Triggers/SubjectStateTrigger.cs

@@ -13,7 +13,6 @@ namespace IRaCIS.Core.Application.Triggers
     /// </summary>
     public class SubjectStateTrigger(
           IStringLocalizer _localizer,
-          IRepository _repository,
           IRepository<SubjectVisit> _subjectVisitRepository) : IAfterSaveTrigger<Subject>
     {
        

IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs

@@ -20,8 +20,8 @@ namespace IRaCIS.Core.Application.Triggers
          IVisitTaskHelpeService _ivisitTaskHelpeService,
          IStringLocalizer _localizer,
          IRepository<Trial> _trialRepository,
-         IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
+         IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository
-         IRepository _repository) : IAfterSaveTrigger<SubjectVisit>
+         ) : IAfterSaveTrigger<SubjectVisit>
     {
        
 

IRaCIS.Core.Application/Triggers/SubjectVisitTrigger.cs

@@ -11,8 +11,8 @@ namespace IRaCIS.Core.Application.Triggers
          IRepository<SubjectVisit> _subjectVisitRepository,
          IClinicalAnswerService _iClinicalAnswerService,
          IRepository<DicomSeries> _dicomSeriesRepository,
-         IRepository<NoneDicomStudy> _noneDicomStudyRepository,
+         IRepository<NoneDicomStudy> _noneDicomStudyRepository
-         IRepository _repository) : IAfterSaveTrigger<NoneDicomStudy>, IAfterSaveTrigger<DicomStudy>, IAfterSaveTrigger<NoneDicomStudyFile>
+         ) : IAfterSaveTrigger<NoneDicomStudy>, IAfterSaveTrigger<DicomStudy>, IAfterSaveTrigger<NoneDicomStudyFile>
     {
        
 

IRaCIS.Core.Infra.EFCore/Repository/IRepository.cs

@@ -17,7 +17,7 @@ using Microsoft.Extensions.Localization;
 namespace IRaCIS.Core.Infra.EFCore
 {
 
-    #region 泛型通用版本
+    #region 泛型通用版本  非必要 禁止使用！！！
 
 
     public interface IRepository

IRaCIS.Core.Infra.EFCore/Repository/Repository.cs

@@ -44,7 +44,6 @@ namespace IRaCIS.Core.Infra.EFCore
             _dbContext = dbContext;
             _mapper = mapper;
             _userInfo = userInfo;
-
         }
 
 
@@ -381,7 +380,7 @@ namespace IRaCIS.Core.Infra.EFCore
 
 
 
-            #region 保存 、忽略 、验证
+        #region 保存 、忽略 、验证
         public async Task<TEntity> InsertOrUpdateAsync<TFrom>(TFrom from, bool autoSave = false, params EntityVerifyExp<TEntity>[] verify)
         {
             var entity = _mapper.Map<TEntity>(from);