diff --git a/IRC.Core.SCP/Service/BaseService.cs b/IRC.Core.SCP/Service/BaseService.cs index a10e9bf9c..e1a97e0b9 100644 --- a/IRC.Core.SCP/Service/BaseService.cs +++ b/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? businessObject) where TEntity : class diff --git a/IRaCIS.Core.API/Controllers/ExtraController.cs b/IRaCIS.Core.API/Controllers/ExtraController.cs index a4cbf199d..f2e7760d2 100644 --- a/IRaCIS.Core.API/Controllers/ExtraController.cs +++ b/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(); diff --git a/IRaCIS.Core.API/Controllers/FinancialChangeController.cs b/IRaCIS.Core.API/Controllers/FinancialChangeController.cs index 0b3b13468..43f02d674 100644 --- a/IRaCIS.Core.API/Controllers/FinancialChangeController.cs +++ b/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)] diff --git a/IRaCIS.Core.API/Controllers/InspectionController.cs b/IRaCIS.Core.API/Controllers/InspectionController.cs index bbeaf4e35..26c8ba83e 100644 --- a/IRaCIS.Core.API/Controllers/InspectionController.cs +++ b/IRaCIS.Core.API/Controllers/InspectionController.cs @@ -26,78 +26,19 @@ 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 _dataInspectionRepository; - private delegate Task executionFun(dynamic data); - - public InspectionController(IRepository repository, - IRepository _repositoryDataInspection, - IMapper mapper, IUserInfo userInfo, - ITrialDocumentService trialDocumentService, - IRepository 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 获取稽查数据 /// /// 获取稽查数据 diff --git a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs index 309a69f63..2e9f81109 100644 --- a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs +++ b/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 _subjectVisitRepository, diff --git a/IRaCIS.Core.Application/BaseService.cs b/IRaCIS.Core.Application/BaseService.cs index 1d87bdb1f..a4fe57913 100644 --- a/IRaCIS.Core.Application/BaseService.cs +++ b/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; } diff --git a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs index d84811f9f..592ca05f9 100644 --- a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs +++ b/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(); diff --git a/IRaCIS.Core.Application/TestService.cs b/IRaCIS.Core.Application/TestService.cs index 089c33355..56983e702 100644 --- a/IRaCIS.Core.Application/TestService.cs +++ b/IRaCIS.Core.Application/TestService.cs @@ -491,7 +491,7 @@ namespace IRaCIS.Application.Services /// [AllowAnonymous] [UnitOfWork] - public async Task OldLocalImageResizeJpg([FromServices] IOSSService oSSService, [FromServices] IRepository _repository, [FromServices] IWebHostEnvironment _hostEnvironment) + public async Task OldLocalImageResizeJpg([FromServices] IOSSService oSSService, [FromServices] IWebHostEnvironment _hostEnvironment) { var aliConfig = oSSService.ObjectStoreServiceOptions.AliyunOSS; diff --git a/IRaCIS.Core.Application/Triggers/SubjectStateTrigger.cs b/IRaCIS.Core.Application/Triggers/SubjectStateTrigger.cs index aeaba6f90..3f5a484c3 100644 --- a/IRaCIS.Core.Application/Triggers/SubjectStateTrigger.cs +++ b/IRaCIS.Core.Application/Triggers/SubjectStateTrigger.cs @@ -13,7 +13,6 @@ namespace IRaCIS.Core.Application.Triggers /// public class SubjectStateTrigger( IStringLocalizer _localizer, - IRepository _repository, IRepository _subjectVisitRepository) : IAfterSaveTrigger { diff --git a/IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs b/IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs index a530cec5c..9889f1d3a 100644 --- a/IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs +++ b/IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs @@ -20,8 +20,8 @@ namespace IRaCIS.Core.Application.Triggers IVisitTaskHelpeService _ivisitTaskHelpeService, IStringLocalizer _localizer, IRepository _trialRepository, - IRepository _readingQuestionCriterionTrialRepository, - IRepository _repository) : IAfterSaveTrigger + IRepository _readingQuestionCriterionTrialRepository + ) : IAfterSaveTrigger { diff --git a/IRaCIS.Core.Application/Triggers/SubjectVisitTrigger.cs b/IRaCIS.Core.Application/Triggers/SubjectVisitTrigger.cs index 2107b9dff..a5d1043bf 100644 --- a/IRaCIS.Core.Application/Triggers/SubjectVisitTrigger.cs +++ b/IRaCIS.Core.Application/Triggers/SubjectVisitTrigger.cs @@ -11,8 +11,8 @@ namespace IRaCIS.Core.Application.Triggers IRepository _subjectVisitRepository, IClinicalAnswerService _iClinicalAnswerService, IRepository _dicomSeriesRepository, - IRepository _noneDicomStudyRepository, - IRepository _repository) : IAfterSaveTrigger, IAfterSaveTrigger, IAfterSaveTrigger + IRepository _noneDicomStudyRepository + ) : IAfterSaveTrigger, IAfterSaveTrigger, IAfterSaveTrigger { diff --git a/IRaCIS.Core.Infra.EFCore/Repository/IRepository.cs b/IRaCIS.Core.Infra.EFCore/Repository/IRepository.cs index 62cb6f3b5..0d30571c0 100644 --- a/IRaCIS.Core.Infra.EFCore/Repository/IRepository.cs +++ b/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 diff --git a/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs b/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs index d8daf48a1..af822f27b 100644 --- a/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs +++ b/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 InsertOrUpdateAsync(TFrom from, bool autoSave = false, params EntityVerifyExp[] verify) { var entity = _mapper.Map(from);