From 0206947202473d94621a7dba296761624a99b841 Mon Sep 17 00:00:00 2001 From: hang <87227557@qq.com> Date: Sun, 13 Oct 2024 13:31:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=B1=9E=E6=80=A7=E6=B3=A8?= =?UTF-8?q?=E5=85=A5=E6=94=B9=E4=B8=BA=E6=9E=84=E9=80=A0=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E6=B3=A8=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/BaseService.cs | 80 +-------------- IRaCIS.Core.Application/GlobalUsings.cs | 5 +- .../IRaCIS.Core.Application.xml | 98 +++++++++---------- .../Allocation/TaskAllocationRuleService.cs | 6 +- .../Allocation/TaskConsistentRuleService.cs | 5 +- .../TaskMedicalReviewRuleService.cs | 5 +- .../Allocation/TaskMedicalReviewService.cs | 5 +- .../Allocation/VisitTaskHelpeService.cs | 7 +- .../Service/Allocation/VisitTaskService.cs | 2 +- .../Service/Common/CommonDocumentService.cs | 4 +- .../Service/Common/DevelopService.cs | 2 +- .../Service/Common/DictionaryService.cs | 3 +- .../Common/EmailNoticeConfigService.cs | 2 +- .../Service/Common/EventStoreRecordService.cs | 2 +- .../Service/Common/ExcelExportService.cs | 4 +- .../Service/Common/ExploreRecommendService.cs | 2 +- .../Common/InternationalizationService.cs | 3 +- .../Service/Common/MailService.cs | 5 +- .../Service/Common/PublishLogService.cs | 2 +- .../Service/Common/SystemBasicDataService.cs | 2 +- .../Service/Common/SystemMonitor.cs | 3 +- .../Service/Doctor/AttachmentService.cs | 2 +- .../Service/Doctor/DoctorListService.cs | 5 +- .../Service/Doctor/DoctorService.cs | 6 +- .../Service/Doctor/EducationService.cs | 5 +- .../Doctor/ResearchPublicationService.cs | 2 +- .../Service/Doctor/TrialExperienceService.cs | 6 +- .../Service/Doctor/VacationService.cs | 2 +- .../Service/Document/EmailSendService.cs | 5 +- .../Service/Document/SystemDocumentService.cs | 5 +- .../Service/Document/TrialDocumentService.cs | 5 +- .../Document/TrialEmailNoticeConfigService.cs | 7 +- .../Service/Financial/CalculateService.cs | 6 +- .../Service/Financial/ExchangeRateService.cs | 6 +- .../Service/Financial/FinancialService.cs | 6 +- .../Financial/PaymentAdjustmentService.cs | 6 +- .../Service/Financial/RankPriceService.cs | 6 +- .../Financial/ReviewerPayInfoService.cs | 6 +- .../Financial/TrialPaymentPriceService.cs | 6 +- .../Financial/TrialRevenuesPriceService.cs | 6 +- .../TrialRevenuesPriceVerificationService.cs | 6 +- .../Service/Financial/VolumeRewardService.cs | 2 +- .../ImageAndDoc/DicomArchiveService.cs | 6 +- .../ImageAndDoc/DownloadAndUploadService.cs | 6 +- .../Service/ImageAndDoc/ImageShareService.cs | 5 +- .../Service/ImageAndDoc/InstanceService.cs | 6 +- .../ImageAndDoc/NoneDicomStudyService.cs | 5 +- .../Service/ImageAndDoc/SeriesService.cs | 8 +- .../Service/ImageAndDoc/StudyService.cs | 6 +- .../ImageAndDoc/SystemAnonymizationService.cs | 2 +- .../Inspection/FrontAuditConfigService.cs | 5 +- .../Service/Inspection/InspectionService.cs | 5 +- .../Service/Institution/CROService.cs | 5 +- .../Service/Institution/HospitalService.cs | 5 +- .../Service/Institution/SiteService.cs | 5 +- .../Service/Institution/SponsorService.cs | 5 +- .../Service/Management/MenuService.cs | 5 +- .../Service/Management/SystemNoticeService.cs | 2 +- .../Service/Management/UserFeedBackService.cs | 2 +- .../Service/Management/UserService.cs | 5 +- .../Service/Management/UserTypeService.cs | 2 +- .../Service/QC/ClinicalDataService.cs | 5 +- .../Service/QC/QCCommon.cs | 2 +- .../Service/QC/QCListService.cs | 5 +- .../Service/QC/QCOperationService.cs | 7 +- .../Service/QC/QCQuestionService.cs | 5 +- .../Service/QC/TrialQCQuestionService.cs | 5 +- .../SubjectCriteriaEvaluationService.cs | 5 +- .../ClinicalData/ClinicalAnswerService.cs | 5 +- .../ClinicalData/ClinicalDataSetService.cs | 5 +- .../ClinicalData/ClinicalQuestionService.cs | 5 +- .../ReadingClinicalDataService.cs | 5 +- .../ReadingMedicalReviewService.cs | 5 +- .../ReadingMedicineQuestionService.cs | 5 +- .../ReadingCriterion/OrganInfoService.cs | 5 +- .../ReadingCriterionService.cs | 5 +- .../ReadingQuestionService.cs | 5 +- .../TumorAssessmentService.cs | 5 +- .../ReadingImageTaskService.cs | 3 +- .../ReadingPeriod/ReadModuleService.cs | 5 +- .../ReadingPeriod/ReadingPeriodSetService.cs | 5 +- .../Reading/ShortcutKey/ShortcutKeyService.cs | 5 +- .../ShortcutKey/UserWLTemplateService.cs | 5 +- .../General/GeneralCalculateService.cs | 3 +- .../General/ReadingCalculateService.cs | 27 ++--- .../IRECIST1Point1CalculateService.cs | 5 +- .../ReadingCalculate/IVUSCalculateService.cs | 5 +- .../LuganoCalculateService.cs | 6 +- .../LuganoWithoutPETCalculateService.cs | 6 +- .../ReadingCalculate/OCTCalculateService.cs | 5 +- .../ReadingCalculate/PCWG3CalculateService.cs | 6 +- .../RECIST1Point1CalculateService.cs | 6 +- .../RECIST1Point1_BMCalculateService.cs | 6 +- .../SelfDefineCalculateService.cs | 6 +- .../TrialSiteEquipmentSurveyService.cs | 5 +- .../SiteSurvey/TrialSiteSurveyService.cs | 5 +- .../SiteSurvey/TrialSiteUserSurveyService.cs | 5 +- .../Service/Stat/StatisticsService.cs | 5 +- .../UltrasonicDicomService.cs | 5 +- .../TrialSiteUser/PersonalWorkstation.cs | 3 +- .../TrialSiteUser/TrialConfigService.cs | 6 +- .../TrialSiteUser/TrialDicomAEService.cs | 5 +- .../TrialSiteUser/TrialExternalUserService.cs | 5 +- .../TrialSiteUser/TrialMaintenanceService.cs | 5 +- .../Service/TrialSiteUser/TrialService.cs | 7 +- .../TrialSiteUser/TrialSiteDicomAEService.cs | 2 +- .../Service/TrialSiteUser/TrialSiteService.cs | 5 +- .../Service/Visit/PatientService.cs | 5 +- .../Service/Visit/SubjectService.cs | 5 +- .../Service/Visit/SubjectVisitService.cs | 6 +- .../Service/Visit/VisitPlanService.cs | 5 +- .../Service/WorkLoad/DoctorWorkloadService.cs | 5 +- .../Service/WorkLoad/EnrollService.cs | 5 +- IRaCIS.Core.Application/TestService.cs | 5 +- .../User/UserTypeGroup.cs | 2 +- .../Context/IRaCISDBContext.cs | 1 - .../LiquidTemplate/EntityService.liquid | 3 +- 117 files changed, 285 insertions(+), 451 deletions(-) diff --git a/IRaCIS.Core.Application/BaseService.cs b/IRaCIS.Core.Application/BaseService.cs index c153e02d4..bc6b531e0 100644 --- a/IRaCIS.Core.Application/BaseService.cs +++ b/IRaCIS.Core.Application/BaseService.cs @@ -4,11 +4,11 @@ using IRaCIS.Core.Domain.Share; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Localization; + using Panda.DynamicWebApi; using Panda.DynamicWebApi.Attributes; using System.Diagnostics.CodeAnalysis; -using ZiggyCreatures.Caching.Fusion; + namespace IRaCIS.Core.Application.Service { @@ -22,17 +22,6 @@ namespace IRaCIS.Core.Application.Service [Authorize, DynamicWebApi] public class BaseService : IBaseService, IDynamicWebApi { - public IMapper _mapper { get; set; } - - public IUserInfo _userInfo { get; set; } - - - - public IStringLocalizer _localizer { get; set; } - - public IWebHostEnvironment _hostEnvironment { get; set; } - - public IFusionCache _fusionCache { get; set; } public static IResponseOutput Null404NotFound(TEntity? businessObject) where TEntity : class @@ -45,73 +34,10 @@ namespace IRaCIS.Core.Application.Service public interface IBaseService { - [MemberNotNull(nameof(_mapper))] - public IMapper _mapper { get; set; } + - [MemberNotNull(nameof(_userInfo))] - public IUserInfo _userInfo { get; set; } - - - [MemberNotNull(nameof(_localizer))] - public IStringLocalizer _localizer { get; set; } - - [MemberNotNull(nameof(_hostEnvironment))] - public IWebHostEnvironment _hostEnvironment { get; set; } - - [MemberNotNull(nameof(_fusionCache))] - public IFusionCache _fusionCache { get; set; } } #endregion - - #region 泛型版本测试 - - - public interface IBaseServiceTest where T : Entity - { - [MemberNotNull(nameof(_mapper))] - public IMapper _mapper { get; set; } - - [MemberNotNull(nameof(_userInfo))] - public IUserInfo _userInfo { get; set; } - - [MemberNotNull(nameof(_localizer))] - public IStringLocalizer _localizer { get; set; } - - [MemberNotNull(nameof(_fusionCache))] - public IFusionCache _fusionCache { get; set; } - - } - - [TypeFilter(typeof(UnifiedApiResultFilter))] - [Authorize, DynamicWebApi] - public class BaseServiceTest : IBaseServiceTest, IDynamicWebApi where T : Entity - { - public IMapper _mapper { get; set; } - - public IUserInfo _userInfo { get; set; } - - public IStringLocalizer _localizer { get; set; } - - public IFusionCache _fusionCache { get; set; } - - public static IResponseOutput Null404NotFound(TEntity? businessObject) where TEntity : class - { - return new ResponseOutput() - .NotOk($"The query object {typeof(TEntity).Name} does not exist , or was deleted by someone else, or an incorrect parameter query caused", code: ApiResponseCodeEnum.DataNotExist); - } - - - } - - - #endregion - - - - - - - } diff --git a/IRaCIS.Core.Application/GlobalUsings.cs b/IRaCIS.Core.Application/GlobalUsings.cs index 6798764ad..2c2e01dfa 100644 --- a/IRaCIS.Core.Application/GlobalUsings.cs +++ b/IRaCIS.Core.Application/GlobalUsings.cs @@ -5,7 +5,10 @@ global using IRaCIS.Core.Infra.EFCore; global using IRaCIS.Core.Infrastructure.Extention; global using Microsoft.EntityFrameworkCore; global using System.Linq.Expressions; - +global using ZiggyCreatures.Caching.Fusion; +global using Microsoft.Extensions.Localization; +global using AutoMapper; +global using IRaCIS.Core.Domain.Share; diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 05029cdb8..dd3e6535f 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -111,7 +111,7 @@ 分配规则 - + 分配规则 @@ -142,7 +142,7 @@ 一致性分析配置表 - + 一致性分析配置表 @@ -232,7 +232,7 @@ 医学审核生成规则 废弃 - + 医学审核生成规则 废弃 @@ -242,7 +242,7 @@ 任务医学审核 - + 任务医学审核 @@ -308,7 +308,7 @@ 访视读片任务 - + 访视读片任务 @@ -339,7 +339,7 @@ 访视读片任务 - + 访视读片任务 @@ -539,7 +539,7 @@ 系统模板文档配置表 - + 系统模板文档配置表 @@ -550,7 +550,7 @@ - + 开始时候一些帮助 比如根据配置的字典生成枚举 @@ -861,7 +861,7 @@ 数据字典-基础数据维护 - + 数据字典-基础数据维护 @@ -991,7 +991,7 @@ ExploreRecommendService - + ExploreRecommendService @@ -1016,7 +1016,7 @@ InternationalizationService - + InternationalizationService @@ -1067,7 +1067,7 @@ PublishLogService - + PublishLogService @@ -1077,7 +1077,7 @@ 医生文档关联关系维护 - + 医生文档关联关系维护 @@ -1313,7 +1313,7 @@ TrialEmailNoticeConfigService - + TrialEmailNoticeConfigService @@ -1708,7 +1708,7 @@ SystemAnonymizationService - + SystemAnonymizationService @@ -1925,7 +1925,7 @@ FrontAuditConfigService - + FrontAuditConfigService @@ -2159,7 +2159,7 @@ SystemNoticeService - + SystemNoticeService @@ -2175,7 +2175,7 @@ UserFeedBackService - + UserFeedBackService @@ -5008,7 +5008,7 @@ SubjectCriteriaEvaluationService - + SubjectCriteriaEvaluationService @@ -5084,7 +5084,7 @@ 临床答案 - + 临床答案 @@ -5215,7 +5215,7 @@ 临床数据配置 - + 临床数据配置 @@ -5289,7 +5289,7 @@ 临床数据问题 - + 临床数据问题 @@ -5470,7 +5470,7 @@ 阅片临床数据 - + 阅片临床数据 @@ -10796,7 +10796,7 @@ 阅片医学审核 - + 阅片医学审核 @@ -10882,7 +10882,7 @@ 医学审核问题 - + 医学审核问题 @@ -10993,7 +10993,7 @@ 器官服务层 - + 器官服务层 @@ -11299,7 +11299,7 @@ 阅片问题.标准 - + 阅片问题.标准 @@ -11553,7 +11553,7 @@ - + IR影像阅片 @@ -12054,7 +12054,7 @@ 阅片期配置 - + 阅片期配置 @@ -12126,7 +12126,7 @@ 生成的阅片模块(在大列表上展示的) 阅片期 - + 生成的阅片模块(在大列表上展示的) 阅片期 @@ -12185,7 +12185,7 @@ 快捷键服务 - + 快捷键服务 @@ -12221,7 +12221,7 @@ 用户WL模板 - + 用户WL模板 @@ -12265,7 +12265,7 @@ Dashboard统计、全局工作量统计、入组两个维度统计（按照项目、按照人） - + Dashboard统计、全局工作量统计、入组两个维度统计（按照项目、按照人） @@ -12361,7 +12361,7 @@ DicomAEService - + DicomAEService @@ -12384,7 +12384,7 @@ 项目外部人员 录入流程相关 - + 项目外部人员 录入流程相关 @@ -12466,7 +12466,7 @@ TrialSiteDicomAEService - + TrialSiteDicomAEService @@ -14306,7 +14306,7 @@ 系统邮件配置表 - + 系统邮件配置表 @@ -14347,7 +14347,7 @@ NoneDicomStudyService - + NoneDicomStudyService @@ -14370,7 +14370,7 @@ UserTypeRoleService - + UserTypeRoleService @@ -14393,7 +14393,7 @@ 受试者临床信息 - + 受试者临床信息 @@ -14674,7 +14674,7 @@ 系统QC 问题管理 - + 系统QC 问题管理 @@ -14702,7 +14702,7 @@ 项目QC 问题 管理 - + 项目QC 问题 管理 @@ -14768,7 +14768,7 @@ TrialSiteEquipmentSurveyService - + TrialSiteEquipmentSurveyService @@ -14778,7 +14778,7 @@ TrialSiteSurveyService - + TrialSiteSurveyService @@ -14870,7 +14870,7 @@ TrialSiteUserSurveyService - + TrialSiteUserSurveyService @@ -15360,7 +15360,7 @@ SystemBasicDataService - + SystemBasicDataService @@ -15391,7 +15391,7 @@ SystemDocumentService - + SystemDocumentService @@ -15414,7 +15414,7 @@ TrialDocumentService - + TrialDocumentService @@ -15510,7 +15510,7 @@ Financial---项目收入价格验证 - + Financial---项目收入价格验证 diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs index 098d56b99..aed26fe63 100644 --- a/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs @@ -17,12 +17,12 @@ namespace IRaCIS.Core.Application.Service /// 分配规则 /// [ApiExplorerSettings(GroupName = "Trial")] - public class TaskAllocationRuleService( - IRepository _taskAllocationRuleRepository, + public class TaskAllocationRuleService(IRepository _taskAllocationRuleRepository, IRepository _userRepository, IRepository _enrollRepository, IRepository _readingQuestionCriterionTrialRepository, - IRepository _subjectCanceDoctorRepository) : BaseService, ITaskAllocationRuleService + IRepository _subjectCanceDoctorRepository, + IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITaskAllocationRuleService { diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs index d0d45ccea..03f6d4813 100644 --- a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs @@ -21,8 +21,7 @@ namespace IRaCIS.Core.Application.Service /// 一致性分析配置表 /// [ApiExplorerSettings(GroupName = "Trial")] - public class TaskConsistentRuleService( - IRepository _taskConsistentRuleRepository, + public class TaskConsistentRuleService(IRepository _taskConsistentRuleRepository, IRepository _visitTaskRepository, IRepository _trialReadingCriterionRepository, IReadingClinicalDataService _readingClinicalDataService, @@ -33,7 +32,7 @@ namespace IRaCIS.Core.Application.Service IRepository _enrollRepository, IRepository _userRepository, IRepository _trialVirtualSiteCodeUpdateRepository, - IVisitTaskHelpeService _visitTaskCommonService) : BaseService, ITaskConsistentRuleService + IVisitTaskHelpeService _visitTaskCommonService, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITaskConsistentRuleService { diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewRuleService.cs index b0ae36046..155a76816 100644 --- a/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewRuleService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewRuleService.cs @@ -15,9 +15,8 @@ namespace IRaCIS.Core.Application.Service /// 医学审核生成规则 废弃 /// [ApiExplorerSettings(GroupName = "Trial")] - public class TaskMedicalReviewRuleService( - IRepository _taskMedicalReviewRuleRepository, - IRepository _trialUserRepository) : BaseService, ITaskMedicalReviewRuleService + public class TaskMedicalReviewRuleService(IRepository _taskMedicalReviewRuleRepository, + IRepository _trialUserRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITaskMedicalReviewRuleService { diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs index fa37eccdc..27594fbb3 100644 --- a/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs @@ -17,11 +17,10 @@ namespace IRaCIS.Core.Application.Service /// 任务医学审核 /// [ApiExplorerSettings(GroupName = "Trial")] - public class TaskMedicalReviewService( - IRepository _taskMedicalReviewRepository, + public class TaskMedicalReviewService(IRepository _taskMedicalReviewRepository, IRepository _trialUserRepository, IRepository _readingQuestionCriterionTrialRepository, - IRepository _visitTaskRepository) : BaseService, ITaskMedicalReviewService + IRepository _visitTaskRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITaskMedicalReviewService { diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs index b3df6ed32..27dcea7f7 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs @@ -11,6 +11,7 @@ using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share.Reading; using IRaCIS.Core.Infra.EFCore.Common; using MassTransit; +using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; using ZiggyCreatures.Caching.Fusion; @@ -22,8 +23,7 @@ namespace IRaCIS.Core.Application.Service /// 访视读片任务 /// [ApiExplorerSettings(GroupName = "Trial")] - public class VisitTaskHelpeService( - IRepository _visitTaskRepository, + public class VisitTaskHelpeService(IRepository _visitTaskRepository, IRepository _trialRepository, IRepository _subjectVisitRepository, IRepository _readingJudgeInfoRepository, @@ -35,7 +35,8 @@ namespace IRaCIS.Core.Application.Service IRepository _trialReadingCriterionRepository, IRepository _trialClinicalDataSetRepository, IRepository _readingClinicalDataRepository, - IRepository _readingConsistentClinicalDataRepository) : BaseService, IVisitTaskHelpeService + IRepository _readingConsistentClinicalDataRepository, + IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IWebHostEnvironment _hostEnvironment, IFusionCache _fusionCache) : BaseService, IVisitTaskHelpeService { diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index 07521fc83..375dc8d02 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -46,7 +46,7 @@ public class VisitTaskService(IRepository _visitTaskRepository, IRepository _readingCustomTagRepository, IRepository _taskInfluenceRepository, IRepository _trialQCQuestionAnswerRepository, - IRepository _subjectCriteriaEvaluationVisitStudyFilterRepository) : BaseService, IVisitTaskService + IRepository _subjectCriteriaEvaluationVisitStudyFilterRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IVisitTaskService { diff --git a/IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs b/IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs index 3b4e24f7f..e7bdc8743 100644 --- a/IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs +++ b/IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs @@ -7,6 +7,7 @@ using IRaCIS.Core.Application.Helper; using IRaCIS.Core.Application.Interfaces; using IRaCIS.Core.Application.ViewModel; +using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; namespace IRaCIS.Core.Application.Service @@ -15,7 +16,8 @@ namespace IRaCIS.Core.Application.Service /// 系统模板文档配置表 /// [ApiExplorerSettings(GroupName = "Common")] - public class CommonDocumentService(IRepository _commonDocumentRepository) : BaseService, ICommonDocumentService + public class CommonDocumentService(IRepository _commonDocumentRepository, + IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IWebHostEnvironment _hostEnvironment) : BaseService, ICommonDocumentService { [HttpPost] diff --git a/IRaCIS.Core.Application/Service/Common/DevelopService.cs b/IRaCIS.Core.Application/Service/Common/DevelopService.cs index d441ee56d..77eda0273 100644 --- a/IRaCIS.Core.Application/Service/Common/DevelopService.cs +++ b/IRaCIS.Core.Application/Service/Common/DevelopService.cs @@ -8,7 +8,7 @@ namespace IRaCIS.Core.Application.Service.Common /// /// [ApiExplorerSettings(GroupName = "Common")] - public class DevelopService(IRepository _dictionaryRepository) : BaseService + public class DevelopService(IRepository _dictionaryRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService { /// /// 根据配置的字典名生成后端枚举 diff --git a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs index 17abed632..eb300531f 100644 --- a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs +++ b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs @@ -23,8 +23,7 @@ namespace IRaCIS.Core.Application.Service IRepository _readingSystemCriterionDictionaryRepository, IRepository _readingCriterionDictionaryRepository, IRepository _readingQuestionCriterionSystem, - IRepository _readingQuestionCriterionTrial - ) : BaseService, IDictionaryService + IRepository _readingQuestionCriterionTrial, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IDictionaryService { diff --git a/IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs index b77f5bdbe..4a59b524d 100644 --- a/IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs +++ b/IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs @@ -15,7 +15,7 @@ namespace IRaCIS.Core.Application.Contracts /// [ApiExplorerSettings(GroupName = "Common")] public class EmailNoticeConfigService(IRepository _emailNoticeConfigrepository, - IRepository _emailNoticeUserTypeRepository) : BaseService, IEmailNoticeConfigService + IRepository _emailNoticeUserTypeRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IEmailNoticeConfigService { [HttpPost] diff --git a/IRaCIS.Core.Application/Service/Common/EventStoreRecordService.cs b/IRaCIS.Core.Application/Service/Common/EventStoreRecordService.cs index d2383ceff..c80624930 100644 --- a/IRaCIS.Core.Application/Service/Common/EventStoreRecordService.cs +++ b/IRaCIS.Core.Application/Service/Common/EventStoreRecordService.cs @@ -20,7 +20,7 @@ using System.Globalization; namespace IRaCIS.Core.Application.Service; [ApiExplorerSettings(GroupName = "Common")] -public class EventStoreRecordService(IRepository _eventStoreRecordRepository, IMediator _mediator,IPublishEndpoint _publishEndpoint) : BaseService +public class EventStoreRecordService(IRepository _eventStoreRecordRepository, IMediator _mediator,IPublishEndpoint _publishEndpoint, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService { /// /// 邮件事件消息列表 diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs index b3fe8dc23..a841bf32d 100644 --- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs @@ -8,6 +8,7 @@ using IRaCIS.Core.Domain.Models; using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Infra.EFCore.Common; using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; using NPOI.XSSF.UserModel; using System.Globalization; @@ -30,7 +31,8 @@ namespace IRaCIS.Core.Application.Service.Common IRepository _systemDocConfirmedUserRepository, IRepository _trialDocNeedConfirmedUserTypeRepository, IRepository _trialDocConfirmedUserRepository, - IRepository _subjectRepository) : BaseService + IRepository _subjectRepository, + IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IWebHostEnvironment _hostEnvironment) : BaseService { diff --git a/IRaCIS.Core.Application/Service/Common/ExploreRecommendService.cs b/IRaCIS.Core.Application/Service/Common/ExploreRecommendService.cs index 8040f8a90..59cce4aa2 100644 --- a/IRaCIS.Core.Application/Service/Common/ExploreRecommendService.cs +++ b/IRaCIS.Core.Application/Service/Common/ExploreRecommendService.cs @@ -14,7 +14,7 @@ namespace IRaCIS.Core.Application.Service /// ExploreRecommendService /// [ApiExplorerSettings(GroupName = "Common")] - public class ExploreRecommendService(IRepository _exploreRecommendRepository) : BaseService, IExploreRecommendService + public class ExploreRecommendService(IRepository _exploreRecommendRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IExploreRecommendService { diff --git a/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs b/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs index 0a4663b0d..f3f03ec80 100644 --- a/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs +++ b/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs @@ -17,7 +17,8 @@ namespace IRaCIS.Core.Application.Service /// InternationalizationService /// [ApiExplorerSettings(GroupName = "Common")] - public class InternationalizationService(IRepository _internationalizationRepository) : BaseService, IInternationalizationService + public class InternationalizationService(IRepository _internationalizationRepository, + IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IFusionCache _fusionCache) : BaseService, IInternationalizationService { diff --git a/IRaCIS.Core.Application/Service/Common/MailService.cs b/IRaCIS.Core.Application/Service/Common/MailService.cs index a0f71c036..05b59c2d7 100644 --- a/IRaCIS.Core.Application/Service/Common/MailService.cs +++ b/IRaCIS.Core.Application/Service/Common/MailService.cs @@ -39,8 +39,7 @@ namespace IRaCIS.Core.Application.Service Task UserFeedBackMail(Guid feedBackId); } - public class MailVerificationService( - IRepository _verificationCodeRepository, + public class MailVerificationService(IRepository _verificationCodeRepository, IRepository _systemBasicDatarepository, IRepository _visitTaskRepository, IRepository _trialSiteRepository, @@ -54,7 +53,7 @@ namespace IRaCIS.Core.Application.Service IRepository _dictionaryRepository, IRepository _emailNoticeConfigrepository, IOptionsMonitor systemEmailConfig, - IDistributedLockProvider _distributedLockProvider) : BaseService, IMailVerificationService + IDistributedLockProvider _distributedLockProvider, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IMailVerificationService { private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue; diff --git a/IRaCIS.Core.Application/Service/Common/PublishLogService.cs b/IRaCIS.Core.Application/Service/Common/PublishLogService.cs index 3667b86a8..ba0063066 100644 --- a/IRaCIS.Core.Application/Service/Common/PublishLogService.cs +++ b/IRaCIS.Core.Application/Service/Common/PublishLogService.cs @@ -17,7 +17,7 @@ namespace IRaCIS.Core.Application.Service /// PublishLogService /// [ApiExplorerSettings(GroupName = "Common")] - public class PublishLogService(IRepository _publishLogRepository) : BaseService, IPublishLogService + public class PublishLogService(IRepository _publishLogRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IPublishLogService { diff --git a/IRaCIS.Core.Application/Service/Common/SystemBasicDataService.cs b/IRaCIS.Core.Application/Service/Common/SystemBasicDataService.cs index 0885a6c04..bc1832680 100644 --- a/IRaCIS.Core.Application/Service/Common/SystemBasicDataService.cs +++ b/IRaCIS.Core.Application/Service/Common/SystemBasicDataService.cs @@ -12,7 +12,7 @@ namespace IRaCIS.Core.Application.Services /// SystemBasicDataService /// [ApiExplorerSettings(GroupName = "Common")] - public class SystemBasicDataService(IRepository _systemBasicDataRepository) : BaseService, ISystemBasicDataService + public class SystemBasicDataService(IRepository _systemBasicDataRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ISystemBasicDataService { diff --git a/IRaCIS.Core.Application/Service/Common/SystemMonitor.cs b/IRaCIS.Core.Application/Service/Common/SystemMonitor.cs index 138dd1875..c3050f46f 100644 --- a/IRaCIS.Core.Application/Service/Common/SystemMonitor.cs +++ b/IRaCIS.Core.Application/Service/Common/SystemMonitor.cs @@ -1,12 +1,13 @@ using IRaCIS.Core.Application.Helper; using IRaCIS.Core.Infrastructure; +using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; namespace IRaCIS.Core.Application.Service.Common { [ApiExplorerSettings(GroupName = "Common")] - public class SystemMonitor : BaseService + public class SystemMonitor(IStringLocalizer _localizer, IWebHostEnvironment _hostEnvironment) : BaseService { public void GetDiskInfo() diff --git a/IRaCIS.Core.Application/Service/Doctor/AttachmentService.cs b/IRaCIS.Core.Application/Service/Doctor/AttachmentService.cs index d93db3b63..ddc1f5ddd 100644 --- a/IRaCIS.Core.Application/Service/Doctor/AttachmentService.cs +++ b/IRaCIS.Core.Application/Service/Doctor/AttachmentService.cs @@ -9,7 +9,7 @@ namespace IRaCIS.Core.Application.Service /// 医生文档关联关系维护 /// [ApiExplorerSettings(GroupName = "Reviewer")] - public class AttachmentService(IRepository _attachmentrepository) : BaseService, IAttachmentService + public class AttachmentService(IRepository _attachmentrepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IAttachmentService { diff --git a/IRaCIS.Core.Application/Service/Doctor/DoctorListService.cs b/IRaCIS.Core.Application/Service/Doctor/DoctorListService.cs index be410634e..f9780ba8c 100644 --- a/IRaCIS.Core.Application/Service/Doctor/DoctorListService.cs +++ b/IRaCIS.Core.Application/Service/Doctor/DoctorListService.cs @@ -7,11 +7,10 @@ using System.Linq.Dynamic.Core; namespace IRaCIS.Core.Application.Service { [ApiExplorerSettings(GroupName = "Reviewer")] - public class DoctorListService( - IRepository _doctorRepository, + public class DoctorListService(IRepository _doctorRepository, IRepository _enrollRepository, IRepository _enrollDetailRepository, - IRepository _trialRepository) : BaseService, IDoctorListQueryService + IRepository _trialRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IDoctorListQueryService { diff --git a/IRaCIS.Core.Application/Service/Doctor/DoctorService.cs b/IRaCIS.Core.Application/Service/Doctor/DoctorService.cs index 2536fd9c4..039cf82f2 100644 --- a/IRaCIS.Core.Application/Service/Doctor/DoctorService.cs +++ b/IRaCIS.Core.Application/Service/Doctor/DoctorService.cs @@ -7,16 +7,14 @@ using Microsoft.AspNetCore.Mvc; namespace IRaCIS.Core.Application.Service { [ApiExplorerSettings(GroupName = "Reviewer")] - public class DoctorService( - IRepository _doctorRepository, + public class DoctorService(IRepository _doctorRepository, IRepository _doctorDictionaryRepository, IRepository _enrollRepository, IRepository _attachmentRepository, IRepository _doctorCriterionFileRepository, IRepository _trialRepository, IRepository _vacationRepository, - IRepository _trialExtRepository - ) : BaseService, IDoctorService + IRepository _trialExtRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IDoctorService { diff --git a/IRaCIS.Core.Application/Service/Doctor/EducationService.cs b/IRaCIS.Core.Application/Service/Doctor/EducationService.cs index db17face0..9184c8dff 100644 --- a/IRaCIS.Core.Application/Service/Doctor/EducationService.cs +++ b/IRaCIS.Core.Application/Service/Doctor/EducationService.cs @@ -7,9 +7,8 @@ using Microsoft.AspNetCore.Mvc; namespace IRaCIS.Core.Application.Service { [ApiExplorerSettings(GroupName = "Reviewer")] - public class EducationService( - IRepository _postgraduateRepository, - IRepository _educationRepository) : BaseService, IEducationService + public class EducationService(IRepository _postgraduateRepository, + IRepository _educationRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IEducationService { /// diff --git a/IRaCIS.Core.Application/Service/Doctor/ResearchPublicationService.cs b/IRaCIS.Core.Application/Service/Doctor/ResearchPublicationService.cs index a536251d0..f9d1075ae 100644 --- a/IRaCIS.Core.Application/Service/Doctor/ResearchPublicationService.cs +++ b/IRaCIS.Core.Application/Service/Doctor/ResearchPublicationService.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Mvc; namespace IRaCIS.Core.Application.Service { [ApiExplorerSettings(GroupName = "Reviewer")] - public class ResearchPublicationService(IRepository _researchPublicationRepository) : BaseService, IResearchPublicationService + public class ResearchPublicationService(IRepository _researchPublicationRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IResearchPublicationService { diff --git a/IRaCIS.Core.Application/Service/Doctor/TrialExperienceService.cs b/IRaCIS.Core.Application/Service/Doctor/TrialExperienceService.cs index 34416fc6f..5587e7be5 100644 --- a/IRaCIS.Core.Application/Service/Doctor/TrialExperienceService.cs +++ b/IRaCIS.Core.Application/Service/Doctor/TrialExperienceService.cs @@ -5,12 +5,10 @@ using Microsoft.AspNetCore.Mvc; namespace IRaCIS.Core.Application.Service { [ApiExplorerSettings(GroupName = "Reviewer")] - public class TrialExperienceService( - IRepository _trialExperienceRepository, + public class TrialExperienceService(IRepository _trialExperienceRepository, IRepository _doctorRepository, IRepository _trialExperienceCriteriaRepository, - IRepository _attachmentRepository - ) : BaseService, ITrialExperienceService + IRepository _attachmentRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITrialExperienceService { diff --git a/IRaCIS.Core.Application/Service/Doctor/VacationService.cs b/IRaCIS.Core.Application/Service/Doctor/VacationService.cs index ea79cba2d..879bbf542 100644 --- a/IRaCIS.Core.Application/Service/Doctor/VacationService.cs +++ b/IRaCIS.Core.Application/Service/Doctor/VacationService.cs @@ -6,7 +6,7 @@ using Panda.DynamicWebApi.Attributes; namespace IRaCIS.Core.Application.Service { [ApiExplorerSettings(GroupName = "Reviewer")] - public class VacationService(IRepository _vacationRepository) : BaseService, IVacationService + public class VacationService(IRepository _vacationRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IVacationService { /// diff --git a/IRaCIS.Core.Application/Service/Document/EmailSendService.cs b/IRaCIS.Core.Application/Service/Document/EmailSendService.cs index fc6081944..d64befeff 100644 --- a/IRaCIS.Core.Application/Service/Document/EmailSendService.cs +++ b/IRaCIS.Core.Application/Service/Document/EmailSendService.cs @@ -17,13 +17,12 @@ namespace IRaCIS.Core.Application.Service Task<(TrialEmailNoticeConfig?, SMTPEmailConfig?)> BuildEmailConfig(Guid trialId, EmailBusinessScenario businessScenario, Func topicAndHtmlFunc, Guid? siteId = null, Guid? trialReadingCriterionId = null); } - public class EmailSendService( - IRepository _trialEmailNoticeConfigRepository, + public class EmailSendService(IRepository _trialEmailNoticeConfigRepository, IRepository _trialRepository, IRepository _trialUserRepository, IRepository _visitTaskRepository, IRepository _trialSiteUserRepository, - IOptionsMonitor _SystemEmailSendConfig) : BaseService, IEmailSendService + IOptionsMonitor _SystemEmailSendConfig, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IEmailSendService { diff --git a/IRaCIS.Core.Application/Service/Document/SystemDocumentService.cs b/IRaCIS.Core.Application/Service/Document/SystemDocumentService.cs index eb9de5564..885776bbb 100644 --- a/IRaCIS.Core.Application/Service/Document/SystemDocumentService.cs +++ b/IRaCIS.Core.Application/Service/Document/SystemDocumentService.cs @@ -14,10 +14,9 @@ namespace IRaCIS.Core.Application.Services /// SystemDocumentService /// [ApiExplorerSettings(GroupName = "Trial")] - public class SystemDocumentService( - IRepository _systemDocumentRepository, + public class SystemDocumentService(IRepository _systemDocumentRepository, IRepository _userRepository, - IRepository _systemDocConfirmedUserRepository) : BaseService, ISystemDocumentService + IRepository _systemDocConfirmedUserRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ISystemDocumentService { diff --git a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs index 08ff3ce9a..edbbf0791 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs @@ -15,8 +15,7 @@ namespace IRaCIS.Core.Application.Services /// TrialDocumentService /// [ApiExplorerSettings(GroupName = "Trial")] - public class TrialDocumentService( - IRepository _trialDocumentRepository, + public class TrialDocumentService(IRepository _trialDocumentRepository, IRepository _trialDocUserTypeConfirmedUserRepository, IRepository _trialRepository, ISystemDocumentService _systemDocumentService, @@ -26,7 +25,7 @@ namespace IRaCIS.Core.Application.Services IRepository _systemDocumentRepository, IRepository _trialUserRepository, IRepository _trialDocConfirmedUserRepository, - IRepository _readingQuestionCriterionTrialRepository) : BaseService, ITrialDocumentService + IRepository _readingQuestionCriterionTrialRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITrialDocumentService { diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs index 606ce504a..4f79ad2f1 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs @@ -13,6 +13,7 @@ using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share.Common; using IRaCIS.Core.Infra.EFCore.Common; using IRaCIS.Core.Infrastructure; +using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; using Spire.Doc; @@ -25,8 +26,7 @@ namespace IRaCIS.Core.Application.Service /// TrialEmailNoticeConfigService /// [ApiExplorerSettings(GroupName = "Trial")] - public class TrialEmailNoticeConfigService( - IRepository _trialEmailNoticeConfigRepository, + public class TrialEmailNoticeConfigService(IRepository _trialEmailNoticeConfigRepository, IRepository _trialEmailBlackUserRepository, IRepository _emailNoticeConfigRepository, IRepository _trialRepository, @@ -42,7 +42,8 @@ namespace IRaCIS.Core.Application.Service IRepository _readingTaskQuestionAnswerRepository, IRepository _readingQuestionCriterionTrialRepository, IOptionsMonitor _systemEmailSendConfig, - IEmailSendService _emailSendService) : BaseService, ITrialEmailNoticeConfigService + IEmailSendService _emailSendService, + IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IWebHostEnvironment _hostEnvironment) : BaseService, ITrialEmailNoticeConfigService { diff --git a/IRaCIS.Core.Application/Service/Financial/CalculateService.cs b/IRaCIS.Core.Application/Service/Financial/CalculateService.cs index 4684eead2..e8e7ae94a 100644 --- a/IRaCIS.Core.Application/Service/Financial/CalculateService.cs +++ b/IRaCIS.Core.Application/Service/Financial/CalculateService.cs @@ -6,8 +6,7 @@ using Panda.DynamicWebApi.Attributes; namespace IRaCIS.Core.Application.Service { - public class CalculateService( - IRepository _paymentRepository, + public class CalculateService(IRepository _paymentRepository, IRepository _trialPaymentRepository, IRepository _doctorPayInfoRepository, IRepository _trialRepository, @@ -18,8 +17,7 @@ namespace IRaCIS.Core.Application.Service IVolumeRewardService _volumeRewardPriceService, IRepository _exchangeRateRepository, IRepository _payAdjustmentRepository, - IRepository _enrollRepository) - : BaseService, ICalculateService + IRepository _enrollRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ICalculateService { diff --git a/IRaCIS.Core.Application/Service/Financial/ExchangeRateService.cs b/IRaCIS.Core.Application/Service/Financial/ExchangeRateService.cs index 5e4456da5..9d3502f8a 100644 --- a/IRaCIS.Core.Application/Service/Financial/ExchangeRateService.cs +++ b/IRaCIS.Core.Application/Service/Financial/ExchangeRateService.cs @@ -7,10 +7,8 @@ namespace IRaCIS.Core.Application.Service { [ApiExplorerSettings(GroupName = "Financial")] - public class ExchangeRateService( - IRepository _exchangeRateRepository, - IRepository _paymentRepository) - : BaseService, IExchangeRateService + public class ExchangeRateService(IRepository _exchangeRateRepository, + IRepository _paymentRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IExchangeRateService { diff --git a/IRaCIS.Core.Application/Service/Financial/FinancialService.cs b/IRaCIS.Core.Application/Service/Financial/FinancialService.cs index de7969409..c18b323b7 100644 --- a/IRaCIS.Core.Application/Service/Financial/FinancialService.cs +++ b/IRaCIS.Core.Application/Service/Financial/FinancialService.cs @@ -9,8 +9,7 @@ using System.Linq.Dynamic.Core; namespace IRaCIS.Core.Application.Service { [ApiExplorerSettings(GroupName = "Financial")] - public class FinancialService( - IRepository _paymentRepository, + public class FinancialService(IRepository _paymentRepository, IRepository _doctorPayInfoRepository, IRepository _trialPaymentPriceRepository, IRepository _trialRepository, @@ -22,8 +21,7 @@ namespace IRaCIS.Core.Application.Service IRepository _trialRevenuePriceRepository, IRepository _payAdjustmentRepository, IRepository _enrollRepository, - IRepository _doctorWorkloadRepository) - : BaseService, IPaymentService + IRepository _doctorWorkloadRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IPaymentService { /// diff --git a/IRaCIS.Core.Application/Service/Financial/PaymentAdjustmentService.cs b/IRaCIS.Core.Application/Service/Financial/PaymentAdjustmentService.cs index 3b2b50760..b28b1c45f 100644 --- a/IRaCIS.Core.Application/Service/Financial/PaymentAdjustmentService.cs +++ b/IRaCIS.Core.Application/Service/Financial/PaymentAdjustmentService.cs @@ -7,12 +7,10 @@ using Panda.DynamicWebApi.Attributes; namespace IRaCIS.Core.Application.Service { [ApiExplorerSettings(GroupName = "Financial")] - public class PaymentAdjustmentService( - IRepository _payAdjustmentRepository, + public class PaymentAdjustmentService(IRepository _payAdjustmentRepository, IRepository _doctorRepository, IRepository _exchangeRateRepository, - IRepository _paymentRepository) - : BaseService, IPaymentAdjustmentService + IRepository _paymentRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IPaymentAdjustmentService { diff --git a/IRaCIS.Core.Application/Service/Financial/RankPriceService.cs b/IRaCIS.Core.Application/Service/Financial/RankPriceService.cs index 0d94ea88b..8433e1358 100644 --- a/IRaCIS.Core.Application/Service/Financial/RankPriceService.cs +++ b/IRaCIS.Core.Application/Service/Financial/RankPriceService.cs @@ -6,10 +6,8 @@ using Panda.DynamicWebApi.Attributes; namespace IRaCIS.Core.Application.Service { [ApiExplorerSettings(GroupName = "Financial")] - public class RankPriceService( - IRepository _rankPriceRepository, - IRepository _reviewerPayInfoRepository) - : BaseService, IRankPriceService + public class RankPriceService(IRepository _rankPriceRepository, + IRepository _reviewerPayInfoRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IRankPriceService { diff --git a/IRaCIS.Core.Application/Service/Financial/ReviewerPayInfoService.cs b/IRaCIS.Core.Application/Service/Financial/ReviewerPayInfoService.cs index 99beb1bb8..689e086af 100644 --- a/IRaCIS.Core.Application/Service/Financial/ReviewerPayInfoService.cs +++ b/IRaCIS.Core.Application/Service/Financial/ReviewerPayInfoService.cs @@ -6,12 +6,10 @@ using Panda.DynamicWebApi.Attributes; namespace IRaCIS.Core.Application.Service { [ApiExplorerSettings(GroupName = "Financial")] - public class ReviewerPayInfoService( - IRepository _doctorPayInfoRepository, + public class ReviewerPayInfoService(IRepository _doctorPayInfoRepository, IRepository _doctorRepository, IRepository _rankPriceRepository, - IRepository _hospitalRepository) - : BaseService, IReviewerPayInfoService + IRepository _hospitalRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IReviewerPayInfoService { [NonDynamicMethod] diff --git a/IRaCIS.Core.Application/Service/Financial/TrialPaymentPriceService.cs b/IRaCIS.Core.Application/Service/Financial/TrialPaymentPriceService.cs index fc76bdb08..ea24386e5 100644 --- a/IRaCIS.Core.Application/Service/Financial/TrialPaymentPriceService.cs +++ b/IRaCIS.Core.Application/Service/Financial/TrialPaymentPriceService.cs @@ -6,13 +6,11 @@ using Panda.DynamicWebApi.Attributes; namespace IRaCIS.Core.Application.Service { [ApiExplorerSettings(GroupName = "Financial")] - public class TrialPaymentPriceService( - IRepository _trialExtRepository, + public class TrialPaymentPriceService(IRepository _trialExtRepository, IRepository _enrollRepository, IRepository _doctorRepository, IRepository _croRepository, - IRepository _trialRepository) - : BaseService, ITrialPaymentPriceService + IRepository _trialRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITrialPaymentPriceService { diff --git a/IRaCIS.Core.Application/Service/Financial/TrialRevenuesPriceService.cs b/IRaCIS.Core.Application/Service/Financial/TrialRevenuesPriceService.cs index 6322f80b9..ca53653a8 100644 --- a/IRaCIS.Core.Application/Service/Financial/TrialRevenuesPriceService.cs +++ b/IRaCIS.Core.Application/Service/Financial/TrialRevenuesPriceService.cs @@ -6,13 +6,11 @@ using Panda.DynamicWebApi.Attributes; namespace IRaCIS.Core.Application.Service { [ApiExplorerSettings(GroupName = "Financial")] - public class TrialRevenuesPriceService( - IRepository _trialRepository, + public class TrialRevenuesPriceService(IRepository _trialRepository, IRepository _trialRevenuesPriceRepository, IRepository _croRepository, IRepository _dictionaryRepository, - IRepository _trialRevenuesPriceVerificationRepository) - : BaseService, ITrialRevenuesPriceService + IRepository _trialRevenuesPriceVerificationRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITrialRevenuesPriceService { diff --git a/IRaCIS.Core.Application/Service/Financial/TrialRevenuesPriceVerificationService.cs b/IRaCIS.Core.Application/Service/Financial/TrialRevenuesPriceVerificationService.cs index 110c145c9..47aa7a738 100644 --- a/IRaCIS.Core.Application/Service/Financial/TrialRevenuesPriceVerificationService.cs +++ b/IRaCIS.Core.Application/Service/Financial/TrialRevenuesPriceVerificationService.cs @@ -8,12 +8,10 @@ namespace IRaCIS.Core.Application.Services /// Financial---项目收入价格验证 /// [ApiExplorerSettings(GroupName = "Financial")] - public class TrialRevenuesPriceVerificationService( - IRepository _trialRevenuesPriceVerificationRepository, + public class TrialRevenuesPriceVerificationService(IRepository _trialRevenuesPriceVerificationRepository, IRepository _trialRepository, IRepository _doctorRepository, - IRepository _paymentRepository) - : BaseService, ITrialRevenuesPriceVerificationService + IRepository _paymentRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITrialRevenuesPriceVerificationService { [HttpPost] diff --git a/IRaCIS.Core.Application/Service/Financial/VolumeRewardService.cs b/IRaCIS.Core.Application/Service/Financial/VolumeRewardService.cs index c5a253063..f6becad46 100644 --- a/IRaCIS.Core.Application/Service/Financial/VolumeRewardService.cs +++ b/IRaCIS.Core.Application/Service/Financial/VolumeRewardService.cs @@ -5,7 +5,7 @@ using Panda.DynamicWebApi.Attributes; namespace IRaCIS.Core.Application.Service { [ApiExplorerSettings(GroupName = "Financial")] - public class VolumeRewardService(IRepository _volumeRewardRepository) : BaseService, IVolumeRewardService + public class VolumeRewardService(IRepository _volumeRewardRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IVolumeRewardService { /// diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DicomArchiveService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DicomArchiveService.cs index 02ec09b63..24dedee50 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DicomArchiveService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DicomArchiveService.cs @@ -13,13 +13,13 @@ using ZiggyCreatures.Caching.Fusion; namespace IRaCIS.Core.Application.Services { - public class DicomArchiveService( - IRepository _studyRepository, + public class DicomArchiveService(IRepository _studyRepository, IRepository _seriesRepository, IRepository _instanceRepository, IRepository _dictionaryRepository, IRepository _systemAnonymizationRepository, - IDistributedLockProvider _distributedLockProvider) : BaseService, IDicomArchiveService + IDistributedLockProvider _distributedLockProvider, + IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IWebHostEnvironment _hostEnvironment, IFusionCache _fusionCache) : BaseService, IDicomArchiveService { diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs index b37e540ab..2c927292b 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs @@ -29,8 +29,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc } [ApiExplorerSettings(GroupName = "Trial")] - public class DownloadAndUploadService( - IRepository _systemAnonymizationRepository, + public class DownloadAndUploadService(IRepository _systemAnonymizationRepository, IRepository _visitTaskRepository, IRepository _subjectVisitRepository, IOSSService _oSSService, @@ -45,7 +44,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc IRepository _noneDicomStudyFileReposiotry, IDistributedLockProvider _distributedLockProvider, IRepository _trialImageDownloadRepository, - IRepository _subjectRepository) : BaseService, IDownloadAndUploadService + IRepository _subjectRepository, + IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IFusionCache _fusionCache) : BaseService, IDownloadAndUploadService { diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/ImageShareService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/ImageShareService.cs index b023c8ca0..29fd733a7 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/ImageShareService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/ImageShareService.cs @@ -8,10 +8,9 @@ using Microsoft.AspNetCore.Mvc; namespace IRaCIS.Core.Application.Services { [AllowAnonymous, ApiExplorerSettings(GroupName = "Image")] - public class ImageShareService( - IRepository _imageShareRepository, + public class ImageShareService(IRepository _imageShareRepository, IRepository _studyRepository, - ITokenService _tokenService) : BaseService, IImageShareService + ITokenService _tokenService, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IImageShareService { diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/InstanceService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/InstanceService.cs index 8e656b8c4..336c2880c 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/InstanceService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/InstanceService.cs @@ -1,6 +1,7 @@ using IRaCIS.Core.Application.Contracts; using IRaCIS.Core.Application.Helper; using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; using System.Linq.Dynamic.Core; @@ -8,9 +9,8 @@ namespace IRaCIS.Core.Application.Services { [ApiExplorerSettings(GroupName = "Image")] [AllowAnonymous] - public class InstanceService( - IRepository _instanceRepository - ) : BaseService, IInstanceService + public class InstanceService(IRepository _instanceRepository, + IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IWebHostEnvironment _hostEnvironment) : BaseService, IInstanceService { diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs index 2598b9407..416455e62 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs @@ -15,14 +15,13 @@ namespace IRaCIS.Core.Application.Contracts /// NoneDicomStudyService /// [ApiExplorerSettings(GroupName = "Image")] - public class NoneDicomStudyService( - IRepository _noneDicomStudyRepository, + public class NoneDicomStudyService(IRepository _noneDicomStudyRepository, IRepository _noneDicomStudyFileRepository, IRepository _trialRepository, IDistributedLockProvider _distributedLockProvider, IRepository _subjectVisitRepository, IRepository _visitTaskRepository, - QCCommon _qCCommon) : BaseService, INoneDicomStudyService + QCCommon _qCCommon, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, INoneDicomStudyService { diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/SeriesService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/SeriesService.cs index d25951c82..a39763263 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/SeriesService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/SeriesService.cs @@ -1,16 +1,16 @@ using IRaCIS.Core.Application.Contracts.Dicom.DTO; using IRaCIS.Core.Application.Helper; using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; namespace IRaCIS.Core.Application.Services { [ApiExplorerSettings(GroupName = "Image")] [AllowAnonymous] - public class SeriesService( - IRepository _seriesRepository, - IRepository _instanceRepository - ) : BaseService + public class SeriesService(IRepository _seriesRepository, + IRepository _instanceRepository, + IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IWebHostEnvironment _hostEnvironment) : BaseService { diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs index e9cde73d0..ce3ab2dbb 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs @@ -12,8 +12,7 @@ using ZiggyCreatures.Caching.Fusion; namespace IRaCIS.Core.Application.Service.ImageAndDoc { [ApiExplorerSettings(GroupName = "Image")] - public class StudyService( - IRepository _subjectVisitRepository, + public class StudyService(IRepository _subjectVisitRepository, IRepository _dicomInstanceRepository, IRepository _dicomSeriesRepository, IRepository _dicomstudyRepository, @@ -25,7 +24,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc IRepository _studyMonitorRepository, IRepository _systemAnonymizationRepository, IRepository _noneDicomStudyRepository, - IDistributedLockProvider _distributedLockProvider) : BaseService, IStudyService + IDistributedLockProvider _distributedLockProvider, + IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IFusionCache _fusionCache) : BaseService, IStudyService { diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/SystemAnonymizationService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/SystemAnonymizationService.cs index 4eddcbfe5..a923cb9e8 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/SystemAnonymizationService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/SystemAnonymizationService.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Application.Service /// SystemAnonymizationService /// [ApiExplorerSettings(GroupName = "Image")] - public class SystemAnonymizationService(IRepository _systemAnonymizationRepository) : BaseService, ISystemAnonymizationService + public class SystemAnonymizationService(IRepository _systemAnonymizationRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ISystemAnonymizationService { diff --git a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs index c46739705..6bf2306e7 100644 --- a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs +++ b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs @@ -23,8 +23,7 @@ namespace IRaCIS.Core.Application.Service /// FrontAuditConfigService /// [ApiExplorerSettings(GroupName = "Reviewer")] - public class FrontAuditConfigService( - IRepository _frontAuditConfigRepository, + public class FrontAuditConfigService(IRepository _frontAuditConfigRepository, IRepository _qCChallengeDialogRepository, IRepository _dataInspectionRepository, IRepository _qCChallengeRepository, @@ -32,7 +31,7 @@ namespace IRaCIS.Core.Application.Service IRepository _trialRepository, IRepository _userRepository, - IRepository _checkChallengeDialogRepository) : BaseService, IFrontAuditConfigService + IRepository _checkChallengeDialogRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IFrontAuditConfigService { diff --git a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs index 5a528e5ea..1633381e2 100644 --- a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs +++ b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs @@ -9,8 +9,7 @@ using Panda.DynamicWebApi.Attributes; namespace IRaCIS.Core.Application.Service.Inspection { [NonDynamicWebApi] - public class InspectionService( - IRepository _dataInspectionRepository, + public class InspectionService(IRepository _dataInspectionRepository, IRepository _dictionaryRepository, IRepository _trialSignRepository, IRepository _userRepository, @@ -20,7 +19,7 @@ namespace IRaCIS.Core.Application.Service.Inspection IRepository _subjectVisitRepository, IRepository _userTypeRepository, IRepository _visitTaskRepository, - IRepository _frontAuditConfigRepository) : BaseService, IInspectionService + IRepository _frontAuditConfigRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IInspectionService { diff --git a/IRaCIS.Core.Application/Service/Institution/CROService.cs b/IRaCIS.Core.Application/Service/Institution/CROService.cs index f1502e2b7..dbe34930a 100644 --- a/IRaCIS.Core.Application/Service/Institution/CROService.cs +++ b/IRaCIS.Core.Application/Service/Institution/CROService.cs @@ -5,9 +5,8 @@ using Microsoft.AspNetCore.Mvc; namespace IRaCIS.Core.Application.Service { [ApiExplorerSettings(GroupName = "Institution")] - public class CroService( - IRepository _croRepository, - IRepository _trialRepository) : BaseService, ICroService + public class CroService(IRepository _croRepository, + IRepository _trialRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ICroService { diff --git a/IRaCIS.Core.Application/Service/Institution/HospitalService.cs b/IRaCIS.Core.Application/Service/Institution/HospitalService.cs index 95f6a562f..6e8262b07 100644 --- a/IRaCIS.Core.Application/Service/Institution/HospitalService.cs +++ b/IRaCIS.Core.Application/Service/Institution/HospitalService.cs @@ -5,10 +5,9 @@ using Microsoft.AspNetCore.Mvc; namespace IRaCIS.Core.Application.Service { [ApiExplorerSettings(GroupName = "Institution")] - public class HospitalService( - IRepository _hospitalRepository, + public class HospitalService(IRepository _hospitalRepository, IRepository _doctorRepository, - IRepository _siteRepository) : BaseService, IHospitalService + IRepository _siteRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IHospitalService { diff --git a/IRaCIS.Core.Application/Service/Institution/SiteService.cs b/IRaCIS.Core.Application/Service/Institution/SiteService.cs index 79cf88f4d..4a12a4c3e 100644 --- a/IRaCIS.Core.Application/Service/Institution/SiteService.cs +++ b/IRaCIS.Core.Application/Service/Institution/SiteService.cs @@ -8,12 +8,11 @@ using Site = IRaCIS.Core.Domain.Models.Site; namespace IRaCIS.Core.Application.Service { [ApiExplorerSettings(GroupName = "Institution")] - public class SiteService( - IRepository _siteRepository, + public class SiteService(IRepository _siteRepository, IRepository _trialSiteUserRepository, IDistributedLockProvider _distributedLockProvider, IRepository _trialSiteRepository, - IRepository _hospitalRepository) : BaseService, ISiteService + IRepository _hospitalRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ISiteService { diff --git a/IRaCIS.Core.Application/Service/Institution/SponsorService.cs b/IRaCIS.Core.Application/Service/Institution/SponsorService.cs index 5e078d393..686fe838e 100644 --- a/IRaCIS.Core.Application/Service/Institution/SponsorService.cs +++ b/IRaCIS.Core.Application/Service/Institution/SponsorService.cs @@ -5,9 +5,8 @@ using Microsoft.AspNetCore.Mvc; namespace IRaCIS.Core.Application.Service { [ApiExplorerSettings(GroupName = "Institution")] - public class SponsorService( - IRepository _sponsorRepository, - IRepository _trialRepository) : BaseService, ISponsorService + public class SponsorService(IRepository _sponsorRepository, + IRepository _trialRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ISponsorService { diff --git a/IRaCIS.Core.Application/Service/Management/MenuService.cs b/IRaCIS.Core.Application/Service/Management/MenuService.cs index d7c0aece4..f88d1777a 100644 --- a/IRaCIS.Core.Application/Service/Management/MenuService.cs +++ b/IRaCIS.Core.Application/Service/Management/MenuService.cs @@ -5,9 +5,8 @@ using Microsoft.AspNetCore.Mvc; namespace IRaCIS.Core.Application.Service { [ApiExplorerSettings(GroupName = "Management")] - public class MenuService( - IRepository _menuRepository, - IRepository _userTypeMenuRepository) : BaseService, IMenuService + public class MenuService(IRepository _menuRepository, + IRepository _userTypeMenuRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IMenuService { diff --git a/IRaCIS.Core.Application/Service/Management/SystemNoticeService.cs b/IRaCIS.Core.Application/Service/Management/SystemNoticeService.cs index 3432473f3..cfde80063 100644 --- a/IRaCIS.Core.Application/Service/Management/SystemNoticeService.cs +++ b/IRaCIS.Core.Application/Service/Management/SystemNoticeService.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Application.Service /// SystemNoticeService /// [ApiExplorerSettings(GroupName = "Management")] - public class SystemNoticeService(IRepository _systemNoticeRepository) : BaseService, ISystemNoticeService + public class SystemNoticeService(IRepository _systemNoticeRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ISystemNoticeService { diff --git a/IRaCIS.Core.Application/Service/Management/UserFeedBackService.cs b/IRaCIS.Core.Application/Service/Management/UserFeedBackService.cs index 82064f011..8ed020093 100644 --- a/IRaCIS.Core.Application/Service/Management/UserFeedBackService.cs +++ b/IRaCIS.Core.Application/Service/Management/UserFeedBackService.cs @@ -20,7 +20,7 @@ namespace IRaCIS.Core.Application.Service public class UserFeedBackService(IRepository _userFeedBackRepository, IRepository _visitTaskRepository, IRepository _subjectVisitRepository, - IRepository _subjectRepository) : BaseService, IUserFeedBackService + IRepository _subjectRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IUserFeedBackService { diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs index 6ccedcdfb..b1985e490 100644 --- a/IRaCIS.Core.Application/Service/Management/UserService.cs +++ b/IRaCIS.Core.Application/Service/Management/UserService.cs @@ -17,8 +17,7 @@ using LoginReturnDTO = IRaCIS.Application.Contracts.LoginReturnDTO; namespace IRaCIS.Core.Application.Service { [ApiExplorerSettings(GroupName = "Management")] - public class UserService( - IRepository _userRepository, + public class UserService(IRepository _userRepository, IMailVerificationService _mailVerificationService, IRepository _verificationCodeRepository, IRepository _userTrialRepository, @@ -29,7 +28,7 @@ namespace IRaCIS.Core.Application.Service IOptionsMonitor _verifyConfig, IOptionsMonitor systemEmailConfig, - ISearcher _searcher) : BaseService, IUserService + ISearcher _searcher, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IFusionCache _fusionCache) : BaseService, IUserService { private SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue; diff --git a/IRaCIS.Core.Application/Service/Management/UserTypeService.cs b/IRaCIS.Core.Application/Service/Management/UserTypeService.cs index be56a315f..924343023 100644 --- a/IRaCIS.Core.Application/Service/Management/UserTypeService.cs +++ b/IRaCIS.Core.Application/Service/Management/UserTypeService.cs @@ -12,7 +12,7 @@ namespace IRaCIS.Core.Application.Contracts /// UserTypeRoleService /// [ApiExplorerSettings(GroupName = "Management")] - public class UserTypeRoleService(IRepository _userTypeRepository, IRepository _userRepository) : BaseService, IUserTypeService + public class UserTypeRoleService(IRepository _userTypeRepository, IRepository _userRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IUserTypeService { [HttpPost] diff --git a/IRaCIS.Core.Application/Service/QC/ClinicalDataService.cs b/IRaCIS.Core.Application/Service/QC/ClinicalDataService.cs index 99516b634..1fbf40ce1 100644 --- a/IRaCIS.Core.Application/Service/QC/ClinicalDataService.cs +++ b/IRaCIS.Core.Application/Service/QC/ClinicalDataService.cs @@ -11,13 +11,12 @@ namespace IRaCIS.Core.Application.Contracts ///受试者临床信息 /// [ApiExplorerSettings(GroupName = "Image")] - public class ClinicalDataService( - IRepository _previousOtherRepository, + public class ClinicalDataService(IRepository _previousOtherRepository, IRepository _previousHistoryRepository, IRepository _previousSurgeryRepository, IRepository _previousPdfRepository, IRepository _subjectVisitRepository, - QCCommon _qCCommon) : BaseService, IClinicalDataService + QCCommon _qCCommon, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IClinicalDataService { diff --git a/IRaCIS.Core.Application/Service/QC/QCCommon.cs b/IRaCIS.Core.Application/Service/QC/QCCommon.cs index b8878e421..da3590c1e 100644 --- a/IRaCIS.Core.Application/Service/QC/QCCommon.cs +++ b/IRaCIS.Core.Application/Service/QC/QCCommon.cs @@ -3,7 +3,7 @@ using IRaCIS.Core.Infrastructure; namespace IRaCIS.Core.Application.Service { - public class QCCommon : BaseService + public class QCCommon(IStringLocalizer _localizer) : BaseService { diff --git a/IRaCIS.Core.Application/Service/QC/QCListService.cs b/IRaCIS.Core.Application/Service/QC/QCListService.cs index 316c62f2e..c6964a247 100644 --- a/IRaCIS.Core.Application/Service/QC/QCListService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCListService.cs @@ -9,8 +9,7 @@ using Microsoft.AspNetCore.Mvc; namespace IRaCIS.Core.Application.Image.QA { [ApiExplorerSettings(GroupName = "Image")] - public class QCListService( - IRepository _visitTaskRepository, + public class QCListService(IRepository _visitTaskRepository, IRepository _subjectVisitRepository, IRepository _trialRepository, IRepository _clinicalDataTrialSetRepository, @@ -22,7 +21,7 @@ namespace IRaCIS.Core.Application.Image.QA IRepository _dicomSeriesRepository, IRepository _noneDicomStudyRepository, IRepository _qcChallengeRepository, - IReadingImageTaskService _IReadingImageTaskService) : BaseService, IQCListService + IReadingImageTaskService _IReadingImageTaskService, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IQCListService { diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index bdcad72fe..2f8eb45a0 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -6,6 +6,7 @@ using IRaCIS.Core.Application.Service.Inspection.DTO; using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Infrastructure; using Medallion.Threading; +using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; using System.ComponentModel.DataAnnotations; @@ -14,8 +15,7 @@ using System.Data; namespace IRaCIS.Core.Application.Image.QA { [ApiExplorerSettings(GroupName = "Image")] - public class QCOperationService( - IRepository _subjectVisitRepository, + public class QCOperationService(IRepository _subjectVisitRepository, IRepository _qcChallengeRepository, IRepository _dicomStudyRepository, IRepository _dicomSeriesrepository, @@ -34,7 +34,8 @@ namespace IRaCIS.Core.Application.Image.QA IRepository _dicomInstanceRepository, IRepository _trialQCQuestionAnswerRepository, IRepository _readingQuestionCriterionTrialRepository, - IDistributedLockProvider _distributedLockProvider, IReadingClinicalDataService _readingClinicalDataService) : BaseService, IQCOperationService + IDistributedLockProvider _distributedLockProvider, IReadingClinicalDataService _readingClinicalDataService, + IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IWebHostEnvironment _hostEnvironment) : BaseService, IQCOperationService { diff --git a/IRaCIS.Core.Application/Service/QC/QCQuestionService.cs b/IRaCIS.Core.Application/Service/QC/QCQuestionService.cs index 4ead671f3..abd0a6865 100644 --- a/IRaCIS.Core.Application/Service/QC/QCQuestionService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCQuestionService.cs @@ -13,9 +13,8 @@ namespace IRaCIS.Core.Application.Contracts /// 系统QC 问题管理 /// [ApiExplorerSettings(GroupName = "Image")] - public class QCQuestionConfigureService( - IRepository _qcQuestionRepository, - IRepository _trialQCQuestionRepository) : BaseService, IQCQuestionService + public class QCQuestionConfigureService(IRepository _qcQuestionRepository, + IRepository _trialQCQuestionRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IQCQuestionService { diff --git a/IRaCIS.Core.Application/Service/QC/TrialQCQuestionService.cs b/IRaCIS.Core.Application/Service/QC/TrialQCQuestionService.cs index 3d9658067..39182efc9 100644 --- a/IRaCIS.Core.Application/Service/QC/TrialQCQuestionService.cs +++ b/IRaCIS.Core.Application/Service/QC/TrialQCQuestionService.cs @@ -15,12 +15,11 @@ namespace IRaCIS.Core.Application.Contracts /// 项目QC 问题 管理 /// [ApiExplorerSettings(GroupName = "Image")] - public class TrialQCQuestionConfigureService( - IRepository _trialQcQuestionRepository, + public class TrialQCQuestionConfigureService(IRepository _trialQcQuestionRepository, IRepository _trialRepository, IRepository _trialQCQuestionRepository, IRepository _trialQCQuestionAnswerRepository, - IRepository _qCQuestionRepository) : BaseService, ITrialQCQuestionConfigureService + IRepository _qCQuestionRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITrialQCQuestionConfigureService { diff --git a/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationService.cs b/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationService.cs index 33b20eb0e..75a76fb98 100644 --- a/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationService.cs +++ b/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationService.cs @@ -18,8 +18,7 @@ namespace IRaCIS.Core.Application.Service /// SubjectCriteriaEvaluationService /// [ApiExplorerSettings(GroupName = "Trial")] - public class SubjectCriteriaEvaluationService( - IRepository _subjectCriteriaEvaluationRepository, + public class SubjectCriteriaEvaluationService(IRepository _subjectCriteriaEvaluationRepository, IRepository _subjectRepository, IRepository _subjectVisitRepository, IRepository _subjectCriteriaEvaluationVisitFilterRepository, @@ -31,7 +30,7 @@ namespace IRaCIS.Core.Application.Service IRepository _dicomStudyRepository, IRepository _dicomSeriesRepository, IRepository _taskMedicalReviewRepository, - IRepository _visitTaskReReadingRepository) : BaseService, ISubjectCriteriaEvaluationService + IRepository _visitTaskReReadingRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ISubjectCriteriaEvaluationService { diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs index 958da7abc..c8171761e 100644 --- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs @@ -20,8 +20,7 @@ namespace IRaCIS.Core.Application.Service /// 临床答案 /// [ApiExplorerSettings(GroupName = "Reading")] - public class ClinicalAnswerService( - IRepository _trialClinicalQuestionRepository, + public class ClinicalAnswerService(IRepository _trialClinicalQuestionRepository, IRepository _trialClinicalTableQuestionRepository, IRepository _clinicalDataTrialSetRepository, IRepository _clinicalFormRepository, @@ -35,7 +34,7 @@ namespace IRaCIS.Core.Application.Service IRepository _readingClinicalDataRepository, IRepository _subjectVisitRepository, IClinicalQuestionService _iClinicalQuestionService, - IReadingClinicalDataService _iReadingClinicalDataService) : BaseService, IClinicalAnswerService + IReadingClinicalDataService _iReadingClinicalDataService, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IClinicalAnswerService { diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs index eefcc4e36..1556bcf87 100644 --- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs @@ -11,8 +11,7 @@ namespace IRaCIS.Core.Application.Service /// 临床数据配置 /// [ApiExplorerSettings(GroupName = "Reading")] - public class ClinicalDataSetService( - IClinicalQuestionService _iClinicalQuestionService, + public class ClinicalDataSetService(IClinicalQuestionService _iClinicalQuestionService, IRepository _subjectVisitRepository, IRepository _clinicalDataTrialSetRepository, IRepository _trialClinicalDataSetCriterionRepository, @@ -23,7 +22,7 @@ namespace IRaCIS.Core.Application.Service IRepository _trialRepository, IRepository _readingQuestionCriterionTrialRepository, IRepository _trialClinicalQuestionRepository, - IRepository _systemClinicalQuestionRepository) : BaseService + IRepository _systemClinicalQuestionRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService { diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs index a84ce53b7..7b3a6067a 100644 --- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs @@ -17,11 +17,10 @@ namespace IRaCIS.Core.Application.Service /// 临床数据问题 /// [ApiExplorerSettings(GroupName = "Reading")] - public class ClinicalQuestionService( - IRepository _trialClinicalQuestionRepository, + public class ClinicalQuestionService(IRepository _trialClinicalQuestionRepository, IRepository _systemClinicalQuestionRepository, IRepository _systemClinicalTableQuestionRepository, - IRepository _trialClinicalTableQuestionRepository) : BaseService, IClinicalQuestionService + IRepository _trialClinicalTableQuestionRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IClinicalQuestionService { diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs index 7934e18eb..1843dfe7c 100644 --- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs @@ -13,8 +13,7 @@ namespace IRaCIS.Core.Application.Service /// 阅片临床数据 /// [ApiExplorerSettings(GroupName = "Reading")] - public class ReadingClinicalDataService( - IRepository _readingClinicalDataRepository, + public class ReadingClinicalDataService(IRepository _readingClinicalDataRepository, IRepository _readingConsistentClinicalDataRepository, IRepository _clinicalDataTrialSetRepository, IRepository _visitTaskRepository, @@ -30,7 +29,7 @@ namespace IRaCIS.Core.Application.Service IRepository _subjectRepository, IRepository _readModuleRepository, IRepository _readingClinicalDataPDFRepository, - IRepository _readingConsistentClinicalDataPDFRepository) : BaseService, IReadingClinicalDataService + IRepository _readingConsistentClinicalDataPDFRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IReadingClinicalDataService { diff --git a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs index 693b94dca..22e686841 100644 --- a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs +++ b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs @@ -16,8 +16,7 @@ namespace IRaCIS.Core.Application.Service /// 阅片医学审核 /// [ApiExplorerSettings(GroupName = "Reading")] - public class ReadingMedicalReviewService( - IRepository _readingMedicineTrialQuestionRepository, + public class ReadingMedicalReviewService(IRepository _readingMedicineTrialQuestionRepository, IRepository _trialRepository, IRepository _visitTaskRepository, IRepository _readingTaskQuestionAnswerRepository, @@ -30,7 +29,7 @@ namespace IRaCIS.Core.Application.Service IRepository _readingMedicalReviewDialogRepository, IRepository _readingQuestionCriterionTrial, IRepository _readingMedicineQuestionAnswerRepository, - ITrialEmailNoticeConfigService _trialEmailNoticeConfigService) : BaseService, IReadingMedicalReviewService + ITrialEmailNoticeConfigService _trialEmailNoticeConfigService, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IReadingMedicalReviewService { diff --git a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs index 3610d42c8..27b42af64 100644 --- a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs @@ -13,11 +13,10 @@ namespace IRaCIS.Core.Application.Service /// 医学审核问题 /// [ApiExplorerSettings(GroupName = "Reading")] - public class ReadingMedicineQuestionService( - IRepository _readingMedicineTrialQuestionRepository, + public class ReadingMedicineQuestionService(IRepository _readingMedicineTrialQuestionRepository, IRepository _readingQuestionCriterionTrialRepository, IRepository _trialRepository, - IRepository _readingMedicineSystemQuestionRepository) : BaseService, IReadingMedicineQuestionService + IRepository _readingMedicineSystemQuestionRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IReadingMedicineQuestionService { diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs index 84bf8af6f..acf740d28 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs @@ -17,15 +17,14 @@ namespace IRaCIS.Core.Application.Service /// 器官服务层 /// [ApiExplorerSettings(GroupName = "Reading")] - public class OrganInfoService( - IRepository _organInfoRepository, + public class OrganInfoService(IRepository _organInfoRepository, IRepository _dictionaryRepository, IRepository _visitTaskRepository, IRepository _organTrialInfoRepository, IRepository _readingQuestionCriterionTrial, IRepository _criterionNidusRepository, IRepository _criterionNidusTrialRepository, - IRepository _readingQuestionCriterionSystemRepository) : BaseService, IOrganInfoService + IRepository _readingQuestionCriterionSystemRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IOrganInfoService { diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs index 9e8dba52b..54293e6ec 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs @@ -12,8 +12,7 @@ namespace IRaCIS.Core.Application.Service.RC [ApiExplorerSettings(GroupName = "Reading")] - public class ReadingQuestionService( - IRepository _readingQuestionCriterionSystemRepository, + public class ReadingQuestionService(IRepository _readingQuestionCriterionSystemRepository, IRepository _readingQuestionCriterionTrialRepository, IRepository _readingQuestionTrialRepository, IRepository _readingTaskQuestionAnswer, @@ -25,7 +24,7 @@ namespace IRaCIS.Core.Application.Service.RC IRepository _systemCriterionDictionaryCodeRepository, IRepository _readingTableQuestionAnswerRepository, IRepository _readingTableAnswerRowInfoRepository, - IRepository _readingTableQuestionTrialRepository) : BaseService + IRepository _readingTableQuestionTrialRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService { diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs index 1f27e0af8..48dc290c4 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs @@ -14,8 +14,7 @@ namespace IRaCIS.Core.Application.Service /// 阅片问题.标准 /// [ApiExplorerSettings(GroupName = "Reading")] - public class ReadingQuestionService( - IRepository _subjectVisitRepository, + public class ReadingQuestionService(IRepository _subjectVisitRepository, IRepository _readingQuestionCriterionSystemRepository, IRepository _readingQuestionCriterionTrialRepository, IRepository _readingQuestionSystemRepository, @@ -32,7 +31,7 @@ namespace IRaCIS.Core.Application.Service IRepository _organInfoRepository, IRepository _readingTableQuestionSystemRepository, IRepository _readingTaskQuestionAnswer, - IRepository _previousPDFRepository) : BaseService, IReadingQuestionService + IRepository _previousPDFRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IReadingQuestionService { diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/TumorAssessmentService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/TumorAssessmentService.cs index 2447e382a..7958887ba 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/TumorAssessmentService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/TumorAssessmentService.cs @@ -7,10 +7,9 @@ namespace IRaCIS.Core.Application.Service.TA [ApiExplorerSettings(GroupName = "Reading")] - public class ReadingQuestionService( - IRepository _tumorAssessmentRepository1Point1, + public class ReadingQuestionService(IRepository _tumorAssessmentRepository1Point1, IRepository _tumorAssessmentIRepository1Point1, - IRepository _tumorAssessmentRepository1Point1BM) : BaseService + IRepository _tumorAssessmentRepository1Point1BM, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService { diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 2a42aac6c..c32298cc2 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -60,7 +60,8 @@ namespace IRaCIS.Core.Application.Service IRepository _readingQuestionTrialRepository, IRepository _taskStudyRepository, IDownloadAndUploadService _downloadAndUploadService, - ITrialEmailNoticeConfigService _trialEmailNoticeConfigService) : BaseService, IReadingImageTaskService + ITrialEmailNoticeConfigService _trialEmailNoticeConfigService, + IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IFusionCache _fusionCache) : BaseService, IReadingImageTaskService { diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs index 91382f726..77c9ddd3c 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs @@ -13,8 +13,7 @@ namespace IRaCIS.Core.Application.Service /// 生成的阅片模块(在大列表上展示的) 阅片期 /// [ApiExplorerSettings(GroupName = "Reading")] - public class ReadModuleService( - IRepository _subjectVisitRepository, + public class ReadModuleService(IRepository _subjectVisitRepository, IRepository _subjectRepository, IRepository _userRepository, IRepository _trialRepository, @@ -27,7 +26,7 @@ namespace IRaCIS.Core.Application.Service IRepository _noneDicomStudyFileRepository, IRepository _readingClinicalDataRepository, IRepository _readingPeriodSetRepository, - IRepository _readModuleRepository) : BaseService + IRepository _readModuleRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService { diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadingPeriodSetService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadingPeriodSetService.cs index a0d6d8a9a..460d25aa6 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadingPeriodSetService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadingPeriodSetService.cs @@ -12,8 +12,7 @@ namespace IRaCIS.Core.Application.Service /// 阅片期配置 /// [ApiExplorerSettings(GroupName = "Reading")] - public class ReadingPeriodSetService( - IRepository _subjectVisitRepository, + public class ReadingPeriodSetService(IRepository _subjectVisitRepository, IRepository _readingPeriodSetRepository, IRepository _readModuleRepository, IRepository _visitStageRepository, @@ -23,7 +22,7 @@ namespace IRaCIS.Core.Application.Service IVisitTaskHelpeService _visitTaskHelpeService, IRepository _readingPeriodPlanRepository, IRepository _siteSetRepository, - IRepository _subjectRepository) : BaseService + IRepository _subjectRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService { diff --git a/IRaCIS.Core.Application/Service/Reading/ShortcutKey/ShortcutKeyService.cs b/IRaCIS.Core.Application/Service/Reading/ShortcutKey/ShortcutKeyService.cs index bd3ca637e..4bd2e0754 100644 --- a/IRaCIS.Core.Application/Service/Reading/ShortcutKey/ShortcutKeyService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ShortcutKey/ShortcutKeyService.cs @@ -12,9 +12,8 @@ namespace IRaCIS.Core.Application.Service /// 快捷键服务 /// [ApiExplorerSettings(GroupName = "Reading")] - public class ShortcutKeyService( - IRepository _dictionaryRepository, - IRepository _shortcutKeyRepository) : BaseService + public class ShortcutKeyService(IRepository _dictionaryRepository, + IRepository _shortcutKeyRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService { diff --git a/IRaCIS.Core.Application/Service/Reading/ShortcutKey/UserWLTemplateService.cs b/IRaCIS.Core.Application/Service/Reading/ShortcutKey/UserWLTemplateService.cs index 6951b5ec6..1887c5ade 100644 --- a/IRaCIS.Core.Application/Service/Reading/ShortcutKey/UserWLTemplateService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ShortcutKey/UserWLTemplateService.cs @@ -14,9 +14,8 @@ namespace IRaCIS.Core.Application.Service /// 用户WL模板 /// [ApiExplorerSettings(GroupName = "Reading")] - public class UserWLTemplateService( - IRepository _userWLTemplateRepository, - IRepository _userRepository) : BaseService + public class UserWLTemplateService(IRepository _userWLTemplateRepository, + IRepository _userRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService { diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs index 9f0afc244..5333bcaed 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs @@ -24,8 +24,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate IRepository _tumorAssessmentRepository, IRepository _readingTaskQuestionAnswerRepository, IRepository _inspectionFileRepository, - IOSSService oSSService - ) : BaseService, IGeneralCalculateService + IOSSService oSSService, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IGeneralCalculateService { diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs index 526b31a2d..54282f80d 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs @@ -2,6 +2,7 @@ using IRaCIS.Core.Application.ViewModel; using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Infrastructure; +using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using MiniExcelLibs; @@ -10,7 +11,13 @@ using System.Data; namespace IRaCIS.Core.Application.Service.ReadingCalculate { [ApiExplorerSettings(GroupName = "Image")] - public class ReadingCalculateService : BaseService, IReadingCalculateService + public class ReadingCalculateService(IEnumerable _criterionServices, + IRepository _visitTaskRepository, + IRepository _readingQuestionCriterionTrialRepository, + ICriterionCalculateService _useCriterion, + IStringLocalizer _localizer, IUserInfo _userInfo + + ) : BaseService, IReadingCalculateService { /// @@ -30,24 +37,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate - private readonly IEnumerable _criterionServices; - private readonly IRepository _visitTaskRepository; - private readonly IRepository _readingQuestionCriterionTrialRepository; - private ICriterionCalculateService _useCriterion; - - - public ReadingCalculateService(IEnumerable criterionServices, - IRepository visitTaskRepository, - IRepository readingQuestionCriterionTrialRepository - - ) - { - - _criterionServices = criterionServices; - this._visitTaskRepository = visitTaskRepository; - this._readingQuestionCriterionTrialRepository = readingQuestionCriterionTrialRepository; - } - /// diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs index 6a570721d..33890e963 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs @@ -12,8 +12,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { [ApiExplorerSettings(GroupName = "Reading")] - public class IRECIST1Point1CalculateService( - IRepository _readingTableQuestionAnswerRepository, + public class IRECIST1Point1CalculateService(IRepository _readingTableQuestionAnswerRepository, IRepository _visitTaskRepository, IRepository _readingQuestionCriterionTrialRepository, IRepository _readingTableQuestionTrialRepository, @@ -25,7 +24,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate IRepository _tumorAssessmentRepository, IGeneralCalculateService _generalCalculateService, IRepository _readingTaskQuestionAnswerRepository, - ILogger _logger) : BaseService, ICriterionCalculateService + ILogger _logger, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ICriterionCalculateService { /// diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs index c2a885b9e..37d479e9f 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs @@ -16,8 +16,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { [ApiExplorerSettings(GroupName = "Reading")] - public class IVUSCalculateService( - IRepository _readingTableQuestionAnswerRepository, + public class IVUSCalculateService(IRepository _readingTableQuestionAnswerRepository, IRepository _visitTaskRepository, IRepository _readingQuestionCriterionTrialRepository, IRepository _readingTableQuestionTrialRepository, @@ -31,7 +30,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate IRepository _readingTaskQuestionAnswerRepository, IVisitTaskHelpeService _visitTaskHelpeService, IHttpContextAccessor httpContext, - ILogger _logger) : BaseService, ICriterionCalculateService + ILogger _logger, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ICriterionCalculateService { /// diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs index b40c22e63..c8a774a9d 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs @@ -12,8 +12,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { [ApiExplorerSettings(GroupName = "Reading")] - public class LuganoCalculateService( - IRepository _readingTableQuestionAnswerRepository, + public class LuganoCalculateService(IRepository _readingTableQuestionAnswerRepository, IRepository _visitTaskRepository, IRepository _readingQuestionCriterionTrialRepository, IRepository _readingTableQuestionTrialRepository, @@ -27,8 +26,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate IRepository _tumorAssessmentRepository, ISubjectVisitService _subjectVisitService, IGeneralCalculateService _generalCalculateService, - IRepository _readingTaskQuestionAnswerRepository) - : BaseService, ICriterionCalculateService, ILuganoCalculateService + IRepository _readingTaskQuestionAnswerRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ICriterionCalculateService, ILuganoCalculateService { diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoWithoutPETCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoWithoutPETCalculateService.cs index 59ff882a3..e93bfa616 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoWithoutPETCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoWithoutPETCalculateService.cs @@ -12,8 +12,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { [ApiExplorerSettings(GroupName = "Reading")] - public class LuganoWithoutPETCalculateService( - IRepository _readingTableQuestionAnswerRepository, + public class LuganoWithoutPETCalculateService(IRepository _readingTableQuestionAnswerRepository, IRepository _visitTaskRepository, IRepository _readingQuestionCriterionTrialRepository, IRepository _readingTableQuestionTrialRepository, @@ -27,8 +26,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate IRepository _tumorAssessmentRepository, ISubjectVisitService _subjectVisitService, IGeneralCalculateService _generalCalculateService, - IRepository _readingTaskQuestionAnswerRepository) - : BaseService, ICriterionCalculateService, ILuganoCalculateService + IRepository _readingTaskQuestionAnswerRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ICriterionCalculateService, ILuganoCalculateService { /// diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs index 2f1eb99be..1878f5413 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs @@ -12,8 +12,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { [ApiExplorerSettings(GroupName = "Reading")] - public class OCTCalculateService( - IRepository _readingTableQuestionAnswerRepository, + public class OCTCalculateService(IRepository _readingTableQuestionAnswerRepository, IRepository _visitTaskRepository, IRepository _readingQuestionCriterionTrialRepository, IRepository _readingTableQuestionTrialRepository, @@ -27,7 +26,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate IGeneralCalculateService _generalCalculateService, IVisitTaskHelpeService _visitTaskHelpeService, IRepository _readingTaskQuestionAnswerRepository, - ILogger _logger) : BaseService, ICriterionCalculateService + ILogger _logger, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ICriterionCalculateService { /// diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs index 9aa5061e7..27c8ccf4a 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs @@ -9,8 +9,7 @@ using Microsoft.AspNetCore.Mvc; namespace IRaCIS.Core.Application.Service.ReadingCalculate { [ApiExplorerSettings(GroupName = "Reading")] - public class PCWG3CalculateService( - IRepository _readingTableQuestionAnswerRepository, + public class PCWG3CalculateService(IRepository _readingTableQuestionAnswerRepository, IRepository _visitTaskRepository, IRepository _readingQuestionCriterionTrialRepository, IRepository _readingTableQuestionTrialRepository, @@ -22,8 +21,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate IRepository _noneDicomStudyRepository, IRepository _tumorAssessmentRepository, IGeneralCalculateService _generalCalculateService, - IRepository _readingTaskQuestionAnswerRepository) - : BaseService, ICriterionCalculateService + IRepository _readingTaskQuestionAnswerRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ICriterionCalculateService { diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs index 256fe8a4c..dfeb51bc0 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs @@ -10,8 +10,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { [ApiExplorerSettings(GroupName = "Reading")] - public class RECIST1Point1CalculateService( - IRepository _readingTableQuestionAnswerRepository, + public class RECIST1Point1CalculateService(IRepository _readingTableQuestionAnswerRepository, IRepository _visitTaskRepository, IRepository _readingQuestionCriterionTrialRepository, IRepository _readingTableQuestionTrialRepository, @@ -22,8 +21,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate IRepository _subjectVisitRepository, IRepository _tumorAssessmentRepository, IGeneralCalculateService _generalCalculateService, - IRepository _readingTaskQuestionAnswerRepository) - : BaseService, ICriterionCalculateService + IRepository _readingTaskQuestionAnswerRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ICriterionCalculateService { /// diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs index 32ae2662f..70e446434 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs @@ -10,8 +10,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { [ApiExplorerSettings(GroupName = "Reading")] - public class RECIST1Point1_BMCalculateService( - IRepository _readingTableQuestionAnswerRepository, + public class RECIST1Point1_BMCalculateService(IRepository _readingTableQuestionAnswerRepository, IRepository _visitTaskRepository, IRepository _readingQuestionCriterionTrialRepository, IRepository _readingTableQuestionTrialRepository, @@ -22,8 +21,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate IRepository _subjectVisitRepository, IRepository _tumorAssessment_RECIST1Point1BM, IGeneralCalculateService _generalCalculateService, - IRepository _readingTaskQuestionAnswerRepository) - : BaseService, ICriterionCalculateService + IRepository _readingTaskQuestionAnswerRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ICriterionCalculateService { /// diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs index 052233762..c8b2d5060 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs @@ -8,8 +8,7 @@ using Microsoft.AspNetCore.Mvc; namespace IRaCIS.Core.Application.Service.ReadingCalculate { [ApiExplorerSettings(GroupName = "Reading")] - public class SelfDefineCalculateService( - IRepository _readingTableQuestionAnswerRepository, + public class SelfDefineCalculateService(IRepository _readingTableQuestionAnswerRepository, IRepository _visitTaskRepository, IRepository _readingQuestionCriterionTrialRepository, IRepository _readingTableQuestionTrialRepository, @@ -22,8 +21,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate IRepository _noneDicomStudyRepository, IRepository _tumorAssessmentRepository, IGeneralCalculateService _generalCalculateService, - IRepository _readingTaskQuestionAnswerRepository) - : BaseService, ICriterionCalculateService + IRepository _readingTaskQuestionAnswerRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ICriterionCalculateService { diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteEquipmentSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteEquipmentSurveyService.cs index b1e5b829a..4335838ad 100644 --- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteEquipmentSurveyService.cs +++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteEquipmentSurveyService.cs @@ -14,9 +14,8 @@ namespace IRaCIS.Core.Application.Contracts /// TrialSiteEquipmentSurveyService /// [ApiExplorerSettings(GroupName = "Trial")] - public class TrialSiteEquipmentSurveyService( - IRepository _trialSiteEquipmentSurveyRepository, - IRepository _trialSiteSurveyRepository) : BaseService, ITrialSiteEquipmentSurveyService + public class TrialSiteEquipmentSurveyService(IRepository _trialSiteEquipmentSurveyRepository, + IRepository _trialSiteSurveyRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITrialSiteEquipmentSurveyService { diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs index 3ba057439..054d98947 100644 --- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs +++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs @@ -25,8 +25,7 @@ namespace IRaCIS.Core.Application.Contracts /// TrialSiteSurveyService /// [ApiExplorerSettings(GroupName = "Trial")] - public class TrialSiteSurveyService( - IRepository _trialSiteSurveyRepository, + public class TrialSiteSurveyService(IRepository _trialSiteSurveyRepository, IRepository _trialSiteUserSurveyRepository, IRepository _userRepository, IRepository _trialRepository, @@ -39,7 +38,7 @@ namespace IRaCIS.Core.Application.Contracts ITokenService _tokenService, IRepository _userTypeRepository, IMailVerificationService _mailVerificationService, - IOptionsMonitor systemEmailConfig) : BaseService, ITrialSiteSurveyService + IOptionsMonitor systemEmailConfig, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITrialSiteSurveyService { private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue; diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteUserSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteUserSurveyService.cs index 006d0dd6a..26c9bbf2d 100644 --- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteUserSurveyService.cs +++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteUserSurveyService.cs @@ -14,11 +14,10 @@ namespace IRaCIS.Core.Application.Contracts /// TrialSiteUserSurveyService /// [ApiExplorerSettings(GroupName = "Trial")] - public class TrialSiteUserSurveyService( - IRepository _trialSiteUserSurveyRepository, + public class TrialSiteUserSurveyService(IRepository _trialSiteUserSurveyRepository, IRepository _trialRepository, IRepository _userRepository, - IRepository _trialSiteSurveyRepository) : BaseService, ITrialSiteUserSurveyService + IRepository _trialSiteSurveyRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITrialSiteUserSurveyService { diff --git a/IRaCIS.Core.Application/Service/Stat/StatisticsService.cs b/IRaCIS.Core.Application/Service/Stat/StatisticsService.cs index ffc6ae49b..087e92b17 100644 --- a/IRaCIS.Core.Application/Service/Stat/StatisticsService.cs +++ b/IRaCIS.Core.Application/Service/Stat/StatisticsService.cs @@ -10,8 +10,7 @@ namespace IRaCIS.Core.Application.Service /// [ApiExplorerSettings(GroupName = "Dashboard&Statistics")] - public class StatisticsService( - IRepository _doctorRepository, + public class StatisticsService(IRepository _doctorRepository, IRepository _trialRepository, IRepository _enrollRepository, IRepository _workloadRepository, @@ -20,7 +19,7 @@ namespace IRaCIS.Core.Application.Service IRepository _hospitalRepository, IRepository _enrollDetailRepository, IRepository _userRepository, - IRepository _userTrialRepository) : BaseService, IStatisticsService + IRepository _userTrialRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IStatisticsService { diff --git a/IRaCIS.Core.Application/Service/Third-partyProject/UltrasonicDicomService.cs b/IRaCIS.Core.Application/Service/Third-partyProject/UltrasonicDicomService.cs index 485449ad8..c260c33d2 100644 --- a/IRaCIS.Core.Application/Service/Third-partyProject/UltrasonicDicomService.cs +++ b/IRaCIS.Core.Application/Service/Third-partyProject/UltrasonicDicomService.cs @@ -12,11 +12,10 @@ namespace IRaCIS.Core.Application.Service.Third_partyProject { [ApiExplorerSettings(GroupName = "Trial")] - public class UltrasonicDicomService( - IRepository _trialRepository, + public class UltrasonicDicomService(IRepository _trialRepository, IRepository _studyRepository, IRepository _dictionaryRepository, - IRepository _visitTaskRepository) : BaseService + IRepository _visitTaskRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService { diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs index 4dbbc4005..84a776bd2 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs @@ -15,7 +15,8 @@ namespace IRaCIS.Core.Application IRepository _trialDocumentRepository, IRepository _systemDocumentRepository, IClinicalAnswerService _clinicalAnswerService, - IRepository _systemNoticeRepository) : BaseService + IRepository _systemNoticeRepository, + IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService { diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs index 1a4b37e65..2774ef0b3 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs @@ -18,8 +18,7 @@ using ZiggyCreatures.Caching.Fusion; namespace IRaCIS.Core.Application { [ApiExplorerSettings(GroupName = "Trial")] - public class TrialConfigService( - IRepository _trialRepository, + public class TrialConfigService(IRepository _trialRepository, IRepository _trialQCQuestionRepository, IRepository _readingQuestionCriterionTrialRepository, IRepository _readingQuestionTrialRepository, @@ -41,7 +40,8 @@ namespace IRaCIS.Core.Application IRepository _subjectVisitRepository, IRepository _enrollRepository, IRepository _trialStateChangeRepository, - IRepository _readingTableQuestionTrialRepository) : BaseService, ITrialConfigService + IRepository _readingTableQuestionTrialRepository, + IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IFusionCache _fusionCache) : BaseService, ITrialConfigService { diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialDicomAEService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialDicomAEService.cs index 0a88235d8..4e77f55b1 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialDicomAEService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialDicomAEService.cs @@ -15,9 +15,8 @@ namespace IRaCIS.Core.Application.Service /// DicomAEService /// [ApiExplorerSettings(GroupName = "Trial")] - public class TrialDicomAEService( - IRepository _dicomAERepository, - IRepository _trialRepository) : BaseService, IDicomAEService + public class TrialDicomAEService(IRepository _dicomAERepository, + IRepository _trialRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IDicomAEService { diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs index c1a55357f..8035fe6ac 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs @@ -20,14 +20,13 @@ namespace IRaCIS.Core.Application.Service /// 项目外部人员 录入流程相关 /// [ApiExplorerSettings(GroupName = "Trial")] - public class TrialExternalUserService( - IRepository _trialExternalUseRepository, + public class TrialExternalUserService(IRepository _trialExternalUseRepository, IRepository _userRepository, IRepository _trialUserRepository, IRepository _trialRepository, IRepository _userTypeRepository, IMailVerificationService _mailVerificationService, - IDistributedLockProvider _distributedLockProvider) : BaseService, ITrialExternalUserService + IDistributedLockProvider _distributedLockProvider, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITrialExternalUserService { diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs index 781688393..d33b9abf7 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs @@ -8,12 +8,11 @@ using Microsoft.AspNetCore.Mvc; namespace IRaCIS.Core.Application.Service { [ApiExplorerSettings(GroupName = "Trial")] - public class TrialMaintenanceService( - IRepository _trialUseRepository, + public class TrialMaintenanceService(IRepository _trialUseRepository, IRepository _userRepository, IRepository _trialSiteUserRepository, IRepository _subjectVisitRepository, - IRepository _trialRepository) : BaseService, ITrialMaintenanceService + IRepository _trialRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITrialMaintenanceService { [HttpGet] diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs index eacae4402..5850e26bb 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs @@ -15,8 +15,7 @@ namespace IRaCIS.Core.Application.Service [ApiExplorerSettings(GroupName = "Trial")] - public class TrialService( - IRepository _trialRepository, + public class TrialService(IRepository _trialRepository, IRepository _trialUserRepository, IRepository _croRepository, IRepository _enrollDetailRepository, @@ -28,8 +27,8 @@ namespace IRaCIS.Core.Application.Service IRepository _trialPaymentPriceRepository, IRepository _trialDictionaryRepository, IRepository _trialBodyPartRepository, - IOptionsMonitor _verifyConfig - ) : BaseService, ITrialService + IOptionsMonitor _verifyConfig, + IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IFusionCache _fusionCache) : BaseService, ITrialService { diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteDicomAEService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteDicomAEService.cs index db5e5bd00..461cd23be 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteDicomAEService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteDicomAEService.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Application.Service /// TrialSiteDicomAEService /// [ApiExplorerSettings(GroupName = "Trial")] - public class TrialSiteDicomAEService(IRepository _trialSiteDicomAERepository) : BaseService, ITrialSiteDicomAEService + public class TrialSiteDicomAEService(IRepository _trialSiteDicomAERepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITrialSiteDicomAEService { diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs index 4fc6bec86..3bb754265 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs @@ -9,13 +9,12 @@ using Microsoft.AspNetCore.Mvc; namespace IRaCIS.Core.Application.Services { [ApiExplorerSettings(GroupName = "Trial")] - public class TrialMaintenanceService( - IRepository _trialSiteRepository, + public class TrialMaintenanceService(IRepository _trialSiteRepository, IRepository _trialSiteUserRepository, IRepository _siteRepository, IRepository _subjectRepository, IRepository _visitTaskRepository, - IRepository _trialRepository) : BaseService, ITrialSiteService + IRepository _trialRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITrialSiteService { diff --git a/IRaCIS.Core.Application/Service/Visit/PatientService.cs b/IRaCIS.Core.Application/Service/Visit/PatientService.cs index f9f5ab9d0..6de44273c 100644 --- a/IRaCIS.Core.Application/Service/Visit/PatientService.cs +++ b/IRaCIS.Core.Application/Service/Visit/PatientService.cs @@ -14,8 +14,7 @@ using Subject = IRaCIS.Core.Domain.Models.Subject; namespace IRaCIS.Core.Application.Service { [ApiExplorerSettings(GroupName = "Trial")] - public class PatientService( - IRepository _trialRepository, + public class PatientService(IRepository _trialRepository, IRepository _patientRepository, IRepository _scpStudyRepository, IRepository _subjectRepository, @@ -24,7 +23,7 @@ namespace IRaCIS.Core.Application.Service IRepository _dicomStudyRepository, IRepository _scpPatientRepository, IRepository _scpImageUploadRepository, - IDistributedLockProvider _distributedLockProvider) : BaseService + IDistributedLockProvider _distributedLockProvider, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService { diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectService.cs index 49318c930..ded5906bd 100644 --- a/IRaCIS.Core.Application/Service/Visit/SubjectService.cs +++ b/IRaCIS.Core.Application/Service/Visit/SubjectService.cs @@ -7,10 +7,9 @@ using Microsoft.AspNetCore.Mvc; namespace IRaCIS.Core.Application.Service { [ApiExplorerSettings(GroupName = "Trial")] - public class SubjectService( - IRepository _subjectRepository, + public class SubjectService(IRepository _subjectRepository, IRepository _trialRepository, - IRepository _subjectVisitRepository) : BaseService, ISubjectService + IRepository _subjectVisitRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ISubjectService { diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs index 00134e738..ee715ee3b 100644 --- a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs +++ b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs @@ -13,8 +13,7 @@ using Microsoft.Extensions.DependencyInjection; namespace IRaCIS.Core.Application.Services { [ApiExplorerSettings(GroupName = "Trial")] - public class SubjectVisitService( - IRepository _subjectVisitRepository, + public class SubjectVisitService(IRepository _subjectVisitRepository, IRepository _trialRepository, IRepository _dicomStudyRepository, IRepository _noneDicomStudyRepository, @@ -27,8 +26,7 @@ namespace IRaCIS.Core.Application.Services IRepository _taskStudyRepository, IServiceProvider _serviceProvider, IRepository _dicomSeriesRepository, - IRepository _trialReadingCriterionRepository - ) : BaseService, ISubjectVisitService + IRepository _trialReadingCriterionRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ISubjectVisitService { diff --git a/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs b/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs index b76d823f0..02798c988 100644 --- a/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs +++ b/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs @@ -9,14 +9,13 @@ using MiniExcelLibs; namespace IRaCIS.Core.Application.Service { [ApiExplorerSettings(GroupName = "Trial")] - public class VisitPlanService( - IRepository _visitStageRepository, + public class VisitPlanService(IRepository _visitStageRepository, IRepository _trialRepository, IRepository _subjectVisitRepository, IRepository _influnceRepository, IRepository _visitTaskRepository, IRepository _subjectRepository, - IRepository _visitPlanInfluenceStatRepository) : BaseService, IVisitPlanService + IRepository _visitPlanInfluenceStatRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IVisitPlanService { diff --git a/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs b/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs index 4fb28c933..69d8b3596 100644 --- a/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs +++ b/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs @@ -7,8 +7,7 @@ using System.Linq.Dynamic.Core; namespace IRaCIS.Core.Application.Service { [ApiExplorerSettings(GroupName = "Trial")] - public class DoctorWorkloadService( - IRepository _trialRepository, + public class DoctorWorkloadService(IRepository _trialRepository, IRepository _enrollRepository, IRepository _doctorRepository, IRepository _doctorWorkloadRepository, @@ -19,7 +18,7 @@ namespace IRaCIS.Core.Application.Service IRepository _trialRevenuesPriceVerificationRepository, IRepository _enrollReadingCriterionRepository, IRepository _visitTaskRepository, - IRepository _taskAllocationRuleRepository) : BaseService, IDoctorWorkloadService + IRepository _taskAllocationRuleRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IDoctorWorkloadService { diff --git a/IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs b/IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs index 23532a4be..392d3bf3d 100644 --- a/IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs +++ b/IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs @@ -7,8 +7,7 @@ using System.Text.RegularExpressions; namespace IRaCIS.Core.Application.Service { [ApiExplorerSettings(GroupName = "Enroll")] - public class EnrollService( - IRepository _trialRepository, + public class EnrollService(IRepository _trialRepository, IRepository _trialDetailRepository, IRepository _TrialPaymentPriceRepository, IRepository _enrollRepository, @@ -17,7 +16,7 @@ namespace IRaCIS.Core.Application.Service IRepository _workloadRepository, IRepository _userRepository, IRepository _trialUserRepository, - IMailVerificationService _mailVerificationService) : BaseService, IEnrollService + IMailVerificationService _mailVerificationService, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IEnrollService { diff --git a/IRaCIS.Core.Application/TestService.cs b/IRaCIS.Core.Application/TestService.cs index c038630d9..ea508a0b4 100644 --- a/IRaCIS.Core.Application/TestService.cs +++ b/IRaCIS.Core.Application/TestService.cs @@ -31,8 +31,7 @@ using Tea; namespace IRaCIS.Core.Application.Service { [ApiExplorerSettings(GroupName = "Institution")] - public class TestService( - IRepository _dicRepository, + public class TestService(IRepository _dicRepository, IRepository _trialRepository, IOptionsMonitor _systemEmailConfig, IOptionsMonitor _basicConfig, @@ -49,7 +48,7 @@ namespace IRaCIS.Core.Application.Service IRepository _userRepository, IRepository _trialBodyPartRepository, IDistributedLockProvider _distributedLockProvider, - ILogger _logger) : BaseService + ILogger _logger, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService { public static int IntValue = 100; /// diff --git a/IRaCIS.Core.Domain.Share/User/UserTypeGroup.cs b/IRaCIS.Core.Domain.Share/User/UserTypeGroup.cs index 916bf18ad..798401b9b 100644 --- a/IRaCIS.Core.Domain.Share/User/UserTypeGroup.cs +++ b/IRaCIS.Core.Domain.Share/User/UserTypeGroup.cs @@ -3,7 +3,7 @@ namespace IRaCIS.Core.Domain.Share { - public enum UserTypeGroup + public enum UserTypeGroupEnum { TrialUser = 1, diff --git a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs index 3614fc342..69d53d1a9 100644 --- a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs +++ b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs @@ -9,7 +9,6 @@ using System.Data; using System.Reflection; using System.Security.Cryptography; using System.Text; -using UserTypeGroup = IRaCIS.Core.Domain.Models.UserTypeGroup; namespace IRaCIS.Core.Infra.EFCore; diff --git a/IRaCIS.Core.Test/LiquidTemplate/EntityService.liquid b/IRaCIS.Core.Test/LiquidTemplate/EntityService.liquid index 420282f76..ce3910a23 100644 --- a/IRaCIS.Core.Test/LiquidTemplate/EntityService.liquid +++ b/IRaCIS.Core.Test/LiquidTemplate/EntityService.liquid @@ -14,7 +14,8 @@ using IRaCIS.Core.Infra.EFCore; namespace IRaCIS.Core.Application.Service; [ ApiExplorerSettings(GroupName = "Test")] -public class {{TableName}}Service(IRepository<{{TableName}}> {{LowercaseRepositoryName}}): BaseService, I{{TableName}}Service +public class {{TableName}}Service(IRepository<{{TableName}}> {{LowercaseRepositoryName}}, + IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer): BaseService, I{{TableName}}Service { {% if IsPaged %}