构造函数优化

2024-08-22 21:37:56 +08:00
parent 47ec4a5e7e
commit 22b1a839ba
102 changed files with 1111 additions and 2866 deletions
@@ -17,107 +17,15 @@ using System.Linq.Dynamic.Core;
 namespace IRaCIS.Core.Application
 {
    [ApiExplorerSettings(GroupName = "Trial")]
-    public class PersonalWorkstation : BaseService
+    public class PersonalWorkstation(
+        IRepository<Trial> _trialRepository,
+        IRepository<TrialDocument> _trialDocumentRepository,
+        IRepository<SystemDocument> _systemDocumentRepository,
+        IClinicalAnswerService _clinicalAnswerService,
+        IRepository<SystemNotice> _systemNoticeRepository) : BaseService
    {
-        private readonly IRepository<Trial> _trialRepository;
-        private readonly IRepository<TrialUser> _trialUserRepository;
-        private readonly IRepository<TrialDocument> _trialDocumentRepository;
-        private readonly IRepository<SystemDocument> _systemDocumentRepository;
-        private readonly IRepository<ReadModule> _readModuleRepository;
-        private readonly IClinicalAnswerService _clinicalAnswerService;
-        private readonly IRepository<SystemNotice> _systemNoticeRepository;
+      

-        public PersonalWorkstation(IRepository<Trial> trialRepository, IRepository<TrialUser> trialUserRepository, IRepository<TrialDocument> trialDocumentRepository,
-            IRepository<SystemDocument> systemDocumentRepository,
-             IRepository<ReadModule> readModuleRepository,
-             IClinicalAnswerService clinicalAnswerService,
-            IRepository<SystemNotice> systemNoticeRepository)
-        {
-            _trialRepository = trialRepository;
-            _trialUserRepository = trialUserRepository;
-            _trialDocumentRepository = trialDocumentRepository;
-            _systemDocumentRepository = systemDocumentRepository;
-            this._readModuleRepository = readModuleRepository;
-            this._clinicalAnswerService = clinicalAnswerService;
-            _systemNoticeRepository = systemNoticeRepository;
-        }
-
-        ///// <summary>
-        ///// 个人面板 统计值
-        ///// </summary>
-        ///// <returns></returns>
-        //public async Task<PersonalStataDTO> GetBasicStat()
-        //{
-
-        //    return new PersonalStataDTO()
-        //    {
-        //        //正参与的数量
-        //        TrialCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin
-        //            ? await _trialRepository.CountAsync()
-        //            : await _trialUserRepository.Where(t => t.UserId == _userInfo.Id && t.Trial.IsDeleted == false).CountAsync(),
-
-        //        DeletedCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin
-        //            ? await _trialRepository.AsQueryable(true).CountAsync(t => t.IsDeleted)
-        //            : await _trialUserRepository.AsQueryable(true).Where(t => t.UserId == _userInfo.Id && t.Trial.IsDeleted)
-        //                .CountAsync(),
-
-
-        //        TotalNeedSignTrialDocCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin
-        //            ? 0
-        //            : await _trialDocumentRepository.AsQueryable(true).Where(t => t.Trial.TrialStatusStr != StaticData.TrialState.TrialStopped)
-        //                .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
-        //                .Where(t => t.IsDeleted == false || (t.IsDeleted == true && t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id && t.ConfirmTime != null)))
-
-        //                .SelectMany(t => t.NeedConfirmedUserTypeList)
-        //                .CountAsync(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId),
-
-        //        HaveSignedTrialDocCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin
-        //            ? 0
-        //            //废除了 已经签署了也要算进去
-        //            : await _trialDocumentRepository.AsQueryable(true).Where(t => t.Trial.TrialStatusStr != StaticData.TrialState.TrialStopped)
-        //                .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
-        //                .Where(t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId))
-        //                .SelectMany(t => t.TrialDocConfirmedUserList)
-        //                .CountAsync(t => t.ConfirmUserId == _userInfo.Id && t.ConfirmTime != null),
-
-        //        TotalNeedSignSystemDocCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin
-        //            ? 0
-        //            : await _systemDocumentRepository
-        //                .Where(t => t.IsDeleted == false || (t.IsDeleted == true && t.SystemDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id && t.ConfirmTime != null)))
-        //                .SelectMany(t => t.NeedConfirmedUserTypeList)
-        //                .CountAsync(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId),
-
-
-        //        HaveSignedSystemDocCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin
-        //            ? 0
-        //            : await _systemDocumentRepository
-        //                .Where(t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId))
-        //                .SelectMany(t => t.SystemDocConfirmedUserList)
-        //                .CountAsync(t => t.ConfirmUserId == _userInfo.Id && t.ConfirmTime != null),
-
-        //        TotalApprovalRequiredCount =
-        //            _userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.APM ?
-        //            _trialRepository.Where(t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id)).SelectMany(t => t.TrialSiteSurveyList).Where(t => t.State == TrialSiteSurveyEnum.SPMApproved).Count()
-        //            : _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CPM || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SPM
-        //            ? _trialRepository.Where(t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id)).SelectMany(t => t.TrialSiteSurveyList).Where(t => t.State == TrialSiteSurveyEnum.CRCSubmitted).Count()
-        //            : 0,
-
-
-        //        TotalSystemNoticeCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin
-        //            ? 0 : await _systemNoticeRepository.Where(t => t.NoticeUserTypeList.Any(t => t.UserTypeId == _userInfo.UserTypeId) && t.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished)
-
-        //            .CountAsync(),
-
-        //        NeedReadSystemNoticeCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin
-        //            ? 0 : await _systemNoticeRepository.Where(t => t.NoticeUserTypeList.Any(t => t.UserTypeId == _userInfo.UserTypeId) && t.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished
-        //             && !t.NoticeUserReadList.Any(t => t.CreateUserId == _userInfo.Id))
-        //            .Where(t => t.EndDate == null || t.EndDate != null && t.EndDate > DateTime.Now)
-        //            .CountAsync(),
-
-
-        //    };
-
-        //}


        /// <summary>
@@ -29,78 +29,27 @@ using ZiggyCreatures.Caching.Fusion;
 namespace IRaCIS.Core.Application
 {
    [ApiExplorerSettings(GroupName = "Trial")]
-    public class TrialConfigService : BaseService, ITrialConfigService
+    public class TrialConfigService(
+        IRepository<Trial> _trialRepository,
+        IRepository<TrialQCQuestion> _trialQCQuestionRepository,
+        IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
+        IRepository<ReadingQuestionTrial> _readingQuestionTrialRepository,
+        IRepository<TrialCriterionDictionaryCode> _trialCriterionDictionaryCode,
+        IRepository<SystemCriterionDictionaryCode> _systemCriterionDictionaryCode,
+        IRepository<ReadingQuestionCriterionSystem> _readingQuestionCriterionSystemRepository,
+        IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository,
+        IRepository<ReadingCriterionPage> _readingCriterionPageRepository,
+        IOrganInfoService _iOrganInfoService,
+        IRepository<ReadingSystemCriterionDictionary> _readingCriterionDictionaryRepository,
+        IRepository<ReadingTrialCriterionDictionary> _readingTrialCriterionDictionaryRepository,
+        IReadingQuestionService iReadingQuestionService,
+        IRepository<TrialCriterionAdditionalAssessmentType> _trialCriterionAdditionalAssessmentTypeRepository,
+        IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswer,
+        IRepository<ReadingTableQuestionAnswer> _readingTableQuestionAnswerRepository,
+        IRepository<ReadingTableAnswerRowInfo> _readingTableAnswerRowInfoRepository,
+        IRepository<ReadingTableQuestionTrial> _readingTableQuestionTrialRepository) : BaseService, ITrialConfigService
    {
-        private readonly IRepository<Trial> _trialRepository;
-        private readonly IRepository<TrialQCQuestion> _trialQCQuestionRepository;
-        private readonly IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository;
-        private readonly IRepository<ReadingQuestionTrial> _readingQuestionTrialRepository;
-        private readonly IRepository<TrialCriterionDictionaryCode> _trialCriterionDictionaryCode;
-        private readonly IRepository<SystemCriterionDictionaryCode> _systemCriterionDictionaryCode;
-        private readonly IRepository<ReadingQuestionCriterionSystem> _readingQuestionCriterionSystemRepository;
-        private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository;
-        private readonly IRepository<ReadingCriterionPage> _readingCriterionPageRepository;
-        private readonly IOrganInfoService _iOrganInfoService;
-        private readonly IRepository<TaskAllocationRule> _taskAllocationRuleRepository;
-        private readonly IRepository<ReadingSystemCriterionDictionary> _readingCriterionDictionaryRepository;
-        private readonly IRepository<ReadingTrialCriterionDictionary> _readingTrialCriterionDictionaryRepository;
-        private readonly IReadingQuestionService iReadingQuestionService;
-        private readonly IRepository<TrialCriterionAdditionalAssessmentType> _trialCriterionAdditionalAssessmentTypeRepository;
-
-        private readonly IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswer;
-
-        private readonly IRepository<VisitTask> _visitTaskRepository;
-        private readonly IRepository<ReadingTableQuestionAnswer> _readingTableQuestionAnswerRepository;
-        private readonly IRepository<ReadingTableAnswerRowInfo> _readingTableAnswerRowInfoRepository;
-
-        private readonly IRepository<ReadingTableQuestionTrial> _readingTableQuestionTrialRepository;
-
-        public TrialConfigService(IRepository<Trial> trialRepository,
-            IRepository<TrialQCQuestion> trialQCQuestionRepository,
-            IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrialRepository,
-            IRepository<ReadingQuestionTrial> readingQuestionTrialRepository,
-            IRepository<TrialCriterionDictionaryCode> trialCriterionDictionaryCode,
-            IRepository<SystemCriterionDictionaryCode> systemCriterionDictionaryCode,
-            IRepository<ReadingQuestionCriterionSystem> readingQuestionCriterionSystemRepository,
-            IRepository<ClinicalDataTrialSet> clinicalDataTrialSetRepository,
-            IRepository<ReadingCriterionPage> readingCriterionPageRepository,
-            IRepository<TaskAllocationRule> taskAllocationRuleRepository,
-            IRepository<ReadingSystemCriterionDictionary> readingCriterionDictionaryRepository,
-            IRepository<ReadingTrialCriterionDictionary> readingTrialCriterionDictionaryRepository,
-            IReadingQuestionService iReadingQuestionService,
-            IOrganInfoService iOrganInfoService,
-            IRepository<TrialCriterionAdditionalAssessmentType> trialCriterionAdditionalAssessmentTypeRepository,
-            IRepository<VisitTask> visitTaskRepository,
-            IRepository<ReadingTableQuestionTrial> readingTableQuestionTrialRepository,
-            IRepository<ReadingTableQuestionAnswer> readingTableQuestionAnswerRepository,
-            IRepository<ReadingTableAnswerRowInfo> readingTableAnswerRowInfoRepository,
-            IRepository<ReadingTaskQuestionAnswer> readingTaskQuestionAnswer
-
-            )
-        {
-            _trialCriterionAdditionalAssessmentTypeRepository = trialCriterionAdditionalAssessmentTypeRepository;
-            _trialRepository = trialRepository;
-            _taskAllocationRuleRepository = taskAllocationRuleRepository;
-            this._readingCriterionDictionaryRepository = readingCriterionDictionaryRepository;
-            this._readingTrialCriterionDictionaryRepository = readingTrialCriterionDictionaryRepository;
-            this.iReadingQuestionService = iReadingQuestionService;
-            this._trialQCQuestionRepository = trialQCQuestionRepository;
-            this._readingQuestionCriterionTrialRepository = readingQuestionCriterionTrialRepository;
-            this._readingQuestionTrialRepository = readingQuestionTrialRepository;
-            this._trialCriterionDictionaryCode = trialCriterionDictionaryCode;
-            this._systemCriterionDictionaryCode = systemCriterionDictionaryCode;
-            this._readingQuestionCriterionSystemRepository = readingQuestionCriterionSystemRepository;
-            this._clinicalDataTrialSetRepository = clinicalDataTrialSetRepository;
-            this._iOrganInfoService = iOrganInfoService;
-            this._readingTableQuestionTrialRepository = readingTableQuestionTrialRepository;
-            this._readingCriterionPageRepository = readingCriterionPageRepository;
-
-            this._visitTaskRepository = visitTaskRepository;
-            this._readingTableQuestionAnswerRepository = readingTableQuestionAnswerRepository;
-            this._readingTableAnswerRowInfoRepository = readingTableAnswerRowInfoRepository;
-            this._readingTaskQuestionAnswer = readingTaskQuestionAnswer;
-        }
-
+        

        /// <summary>
        /// 阅片信息签名验证接口
@@ -19,18 +19,12 @@ namespace IRaCIS.Core.Application.Service
    /// DicomAEService
    /// </summary>	
    [ApiExplorerSettings(GroupName = "Trial")]
-    public class TrialDicomAEService : BaseService, IDicomAEService
+    public class TrialDicomAEService(
+        IRepository<TrialDicomAE> _dicomAERepository,
+        IRepository<Trial> _trialRepository) : BaseService, IDicomAEService
    {

-        private readonly IRepository<TrialDicomAE> _dicomAERepository;
-        private readonly IRepository<Trial> _trialRepository;
-
-        public TrialDicomAEService(IRepository<TrialDicomAE> dicomAERepository, IRepository<Trial> trialRepository)
-        {
-            _trialRepository = trialRepository;
-            _dicomAERepository = dicomAERepository;
-        }
-        
+       
        [HttpPost]
        public async Task<IResponseOutput<PageOutput<DicomAEView>>> GetDicomAEList(DicomAEQuery inQuery)
        {
@@ -24,29 +24,14 @@ namespace IRaCIS.Core.Application.Service
    /// 项目外部人员  录入流程相关
    /// </summary>	
    [ApiExplorerSettings(GroupName = "Trial")]
-    public class TrialExternalUserService : BaseService, ITrialExternalUserService
+    public class TrialExternalUserService(
+        IRepository<TrialExternalUser> _trialExternalUseRepository,
+        IRepository<User> _userRepository,
+        IRepository<TrialUser> _trialUserRepository,
+        IMailVerificationService _mailVerificationService,
+        IDistributedLockProvider _distributedLockProvider) : BaseService, ITrialExternalUserService
    {
-        private readonly IRepository<TrialExternalUser> _trialExternalUseRepository;
-        private readonly IRepository<User> _userRepository;
-        private readonly IRepository<TrialUser> _trialUserRepository;
-        private readonly IRepository<TrialSiteUserSurvey> _trialSiteSurveyUserRepository;
-        private readonly IRepository<TrialSiteUser> _trialSiteUserRepository;
-        private readonly IMailVerificationService _mailVerificationService;
-        private readonly IDistributedLockProvider _distributedLockProvider;
-
-        public TrialExternalUserService(IRepository<TrialExternalUser> trialExternalUseRepository, IRepository<User> userRepository, IRepository<TrialUser> trialUserRepository,
-            IRepository<TrialSiteUserSurvey> trialSiteSurveyUserRepository, IRepository<TrialSiteUser> trialSiteUserRepository,
-          IMailVerificationService mailVerificationService, IDistributedLockProvider distributedLockProvider)
-        {
-            _trialExternalUseRepository = trialExternalUseRepository;
-            _userRepository = userRepository;
-            _trialUserRepository = trialUserRepository;
-            _trialSiteSurveyUserRepository = trialSiteSurveyUserRepository;
-            _trialSiteUserRepository = trialSiteUserRepository;
-
-            _mailVerificationService = mailVerificationService;
-            _distributedLockProvider = distributedLockProvider;
-        }
+       



@@ -14,19 +14,11 @@ using DocumentFormat.OpenXml.Office2010.ExcelAc;
 namespace IRaCIS.Application.Services
 {
    [ApiExplorerSettings(GroupName = "Trial")]
-    public class TrialMaintenanceService : BaseService, ITrialMaintenanceService
+    public class TrialMaintenanceService(
+        IRepository<TrialUser> _trialUseRepository,
+        IRepository<Trial> _trialRepository) : BaseService, ITrialMaintenanceService
    {
-        private readonly IRepository<TrialUser> _trialUseRepository;
-        private readonly IRepository<Trial> _trialRepository;
-
-
-        public TrialMaintenanceService(IRepository<TrialUser> trialUseRepository, IRepository<Trial> trialRepository)
-        {
-            _trialUseRepository = trialUseRepository;
-            _trialRepository = trialRepository;
-        }
-
-
+       
        #region 移动废弃

        ///// <summary>
@@ -20,24 +20,17 @@ namespace IRaCIS.Application.Services

    [ApiExplorerSettings(GroupName = "Trial")]

-    public class TrialService : BaseService, ITrialService
+    public class TrialService(
+        IRepository<Trial> _trialRepository,
+        IRepository<TrialUser> _trialUserRepository,
+        IOptionsMonitor<ServiceVerifyConfigOption> _verifyConfig) : BaseService, ITrialService
    {

-        private readonly IRepository<Trial> _trialRepository;
-        private readonly IRepository<TrialUser> _trialUserRepository;
-        private readonly IOptionsMonitor<ServiceVerifyConfigOption> _verifyConfig;
+       

        public bool TrialExpeditedChange { get; set; } = false;


-        public TrialService(IRepository<Trial> trialRepository,
-            IRepository<TrialUser> trialUserRepository, IOptionsMonitor<ServiceVerifyConfigOption> verifyConfig
-            )
-        {
-            _verifyConfig = verifyConfig;
-            _trialRepository = trialRepository;
-            this._trialUserRepository = trialUserRepository;
-        }

        /// <summary>
        /// 分页获取临床项目列表  默认后台加急状态为3 查所有的   
@@ -14,15 +14,10 @@ namespace IRaCIS.Core.Application.Service
    /// TrialSiteDicomAEService
    /// </summary>	
    [ApiExplorerSettings(GroupName = "Trial")]
-    public class TrialSiteDicomAEService : BaseService, ITrialSiteDicomAEService
+    public class TrialSiteDicomAEService(IRepository<TrialSiteDicomAE> _trialSiteDicomAERepository) : BaseService, ITrialSiteDicomAEService
    {

-        private readonly IRepository<TrialSiteDicomAE> _trialSiteDicomAERepository;
-
-        public TrialSiteDicomAEService(IRepository<TrialSiteDicomAE> trialSiteDicomAERepository)
-        {
-            _trialSiteDicomAERepository = trialSiteDicomAERepository;
-        }
+       

        [HttpPost]
        public async Task<List<TrialSiteDicomAEView>> GetTrialSiteDicomAEList(TrialSiteDicomAEQuery inQuery)
@@ -14,21 +14,13 @@ using System.Linq;
 namespace IRaCIS.Core.Application.Services
 {
    [ApiExplorerSettings(GroupName = "Trial")]
-    public class TrialMaintenanceService : BaseService, ITrialSiteService
+    public class TrialMaintenanceService(
+        IRepository<TrialSite> _trialSiteRepository,
+        IRepository<TrialSiteUser> _trialSiteUserRepository,
+        IRepository<Site> _siteRepository,
+        IRepository<Trial> _trialRepository) : BaseService, ITrialSiteService
    {
-        private readonly IRepository<TrialSite> _trialSiteRepository;
-        private readonly IRepository<TrialSiteUser> _trialSiteUserRepository;
-        private readonly IRepository<Site> _siteRepository;
-        private readonly IRepository<Trial> _trialRepository;
-
-        public TrialMaintenanceService(IRepository<TrialSite> trialSiteRepository, IRepository<TrialSiteUser> trialSiteUserRepository
-            , IRepository<Site> siteRepository, IRepository<Trial> trialRepository)
-        {
-            _trialSiteRepository = trialSiteRepository;
-            _trialSiteUserRepository = trialSiteUserRepository;
-            _siteRepository = siteRepository;
-            _trialRepository = trialRepository;
-        }
+