diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 4b089d6e9..8a0f0bf29 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -481,6 +481,11 @@ 系统模板文档配置表 + + + 系统模板文档配置表 + + 项目参与人员导出 @@ -9950,6 +9955,11 @@ 是否是一致性分析产生 + + + 任务展示访视 读片任务显示是否顺序 + + TaskConsistentRuleQuery 列表查询参数模型 @@ -13339,6 +13349,11 @@ 数据字典-基础数据维护 + + + 数据字典-基础数据维护 + + 添加bool diff --git a/IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs b/IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs index 8e0f9aae2..478c42c8e 100644 --- a/IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs +++ b/IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs @@ -17,17 +17,9 @@ namespace IRaCIS.Core.Application.Service /// 系统模板文档配置表 /// [ApiExplorerSettings(GroupName = "Common")] - public class CommonDocumentService : BaseService, ICommonDocumentService + public class CommonDocumentService(IRepository _commonDocumentRepository) : BaseService, ICommonDocumentService { - private readonly IRepository _commonDocumentRepository; - - public CommonDocumentService(IRepository commonDocumentRepository) - { - _commonDocumentRepository = commonDocumentRepository; - } - - [HttpPost] public async Task> GetCommonDocumentList(CommonDocumentQuery queryCommonDocument) { diff --git a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs index f7e83abf2..5cc7a99ba 100644 --- a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs +++ b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs @@ -13,48 +13,21 @@ namespace IRaCIS.Application.Services /// [ApiExplorerSettings(GroupName = "Common")] - public class DictionaryService : BaseService, IDictionaryService + public class DictionaryService (IRepository _dicRepository, + IRepository _doctorDictionaryRepository, + IRepository _trialDictionaryRepository, + IRepository _doctorRepository, + IRepository _trialRepository, + IRepository _systemCriterionDictionaryCodeRepository, + IRepository _trialCriterionDictionaryCodeRepository, + IRepository _readingTrialCriterionDictionaryRepository, + IRepository _readingSystemCriterionDictionaryRepository, + IRepository _readingCriterionDictionaryRepository, + IRepository _readingQuestionCriterionSystem, + IRepository _readingQuestionCriterionTrial + ) : BaseService, IDictionaryService { - private readonly IRepository _dicRepository; - private readonly IRepository _doctorDictionaryRepository; - private readonly IRepository _trialDictionaryRepository; - private readonly IRepository _doctorRepository; - private readonly IRepository _trialRepository; - private readonly IRepository _systemCriterionDictionaryCodeRepository; - private readonly IRepository _trialCriterionDictionaryCodeRepository; - private readonly IRepository _readingTrialCriterionDictionaryRepository; - private readonly IRepository _readingSystemCriterionDictionaryRepository; - private readonly IRepository _readingCriterionDictionaryRepository; - private readonly IRepository _readingQuestionCriterionSystem; - private readonly IRepository _readingQuestionCriterionTrial; - public DictionaryService(IRepository sysDicRepository, IRepository doctorDictionaryRepository, IRepository trialDictionaryRepository, - IRepository doctorRepository, IRepository trialRepository, - - IRepository systemCriterionDictionaryCodeRepository, - IRepository trialCriterionDictionaryCodeRepository, - IRepository readingTrialCriterionDictionaryRepository, - IRepository readingSystemCriterionDictionaryRepository, - IRepository readingCriterionDictionaryRepository, - IRepository readingQuestionCriterionSystem, - IRepository readingQuestionCriterionTrial - - - ) - { - _dicRepository = sysDicRepository; - _doctorDictionaryRepository = doctorDictionaryRepository; - _trialDictionaryRepository = trialDictionaryRepository; - _doctorRepository = doctorRepository; - _trialRepository = trialRepository; - this._systemCriterionDictionaryCodeRepository = systemCriterionDictionaryCodeRepository; - this._trialCriterionDictionaryCodeRepository = trialCriterionDictionaryCodeRepository; - this._readingTrialCriterionDictionaryRepository = readingTrialCriterionDictionaryRepository; - this._readingSystemCriterionDictionaryRepository = readingSystemCriterionDictionaryRepository; - this._readingCriterionDictionaryRepository = readingCriterionDictionaryRepository; - this._readingQuestionCriterionSystem = readingQuestionCriterionSystem; - this._readingQuestionCriterionTrial = readingQuestionCriterionTrial; - } /// /// 添加bool diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs index ee251cdd8..810997566 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs @@ -878,8 +878,6 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc } } - - return result; } diff --git a/IRaCIS.Core.Test/TT_Template/IRaCIS .Core.ServiceAsync.tt b/IRaCIS.Core.Test/TT_Template/IRaCIS .Core.ServiceAsync.tt index ed77f287c..effdadf11 100644 --- a/IRaCIS.Core.Test/TT_Template/IRaCIS .Core.ServiceAsync.tt +++ b/IRaCIS.Core.Test/TT_Template/IRaCIS .Core.ServiceAsync.tt @@ -54,16 +54,9 @@ namespace IRaCIS.Core.Application.Service /// <#=tableName#>Service /// [ ApiExplorerSettings(GroupName = "Test")] - public class <#=tableName#>Service: BaseService, I<#=tableName#>Service + public class <#=tableName#>Service(IRepository<<#=tableName#>> _<#=char.ToLower(tableName[0]) + tableName.Substring(1)#>Repository): BaseService, I<#=tableName#>Service { - private readonly IRepository<<#=tableName#>> _<#=char.ToLower(tableName[0]) + tableName.Substring(1)#>Repository; - - public <#=tableName#>Service(IRepository<<#=tableName#>> <#=char.ToLower(tableName[0]) + tableName.Substring(1)#>Repository) - { - _<#=char.ToLower(tableName[0]) + tableName.Substring(1)#>Repository = <#=char.ToLower(tableName[0]) + tableName.Substring(1)#>Repository; - } - <# if(isPage){#> [HttpPost] public async TaskView>> Get<#=tableName#>List(<#=tableName#>Query inQuery)