diff --git a/IRaCIS.Core.API/appsettings.json b/IRaCIS.Core.API/appsettings.json index 93fe21d06..a3e317b68 100644 --- a/IRaCIS.Core.API/appsettings.json +++ b/IRaCIS.Core.API/appsettings.json @@ -4,10 +4,10 @@ "Hangfire": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=Hangfire_IRaCIS;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true" }, "JwtSetting": { - "SecurityKey": "3e6dbfa227234a03977a2f421bdb7f4f", // ��Կ - "Issuer": "IRaCIS", // �䷢�� - "Audience": "ZhiZhun", // ������ - "TokenExpireDays": "7" // ����ʱ�䣨7day�� + "SecurityKey": "3e6dbfa227234a03977a2f421bdb7f4f", // 密钥 + "Issuer": "IRaCIS", // 颁发者 + "Audience": "ZhiZhun", // 接收者 + "TokenExpireDays": "7" // 过期时间(7day) }, "IpRateLimiting": { "EnableEndpointRateLimiting": true, //False: globally executed, true: executed for each @@ -86,7 +86,7 @@ "ImageShareExpireDays": 10 } - //��վ����ַ��Ϊ�˷����ļ� dicom ���ϴ����ĵ�... ʵ�ⷢ�ֲ��ý�����ƴ�ӷ��أ���������Զ����ϵ�ǰip�������˶໷����ȡ���������ļ� + //网站根地址,为了访问文件 dicom 和上传的文档... 实测发现不用将域名拼接返回,浏览器会自动加上当前ip,避免了多环境读取环境配置文件 diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 6d08c180f..bbfa787a4 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -1670,6 +1670,11 @@ 是否显示在Dicom阅片中 + + + 问题类型 + + 类型 @@ -5536,6 +5541,11 @@ IR阅片是否显示既往结果 + + + 阅片工具 + + 仲裁规则/对象 @@ -5791,6 +5801,11 @@ 项目ID + + + 阅片工具 + + 阅片平台 diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs index 332c66846..6c1340cef 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs @@ -676,10 +676,10 @@ namespace IRaCIS.Application.Services public async Task> GetReadingQuestionCriterionSystemList(ReadingQuestionCriterionSystemViewInDto inDto) { //await AddSystemQuestionCriterion(); - var query= _readingQuestionCriterionSystemRepository.AsQueryable() + var query = _readingQuestionCriterionSystemRepository.AsQueryable() .WhereIf(!inDto.CriterionName.IsNullOrEmpty(), x => x.CriterionName.Contains(inDto.CriterionName)) - .ProjectTo(_mapper.ConfigurationProvider) - .Where(x=>x.IsEnable); + .ProjectTo(_mapper.ConfigurationProvider); + return await query.ToPagedListAsync(inDto.PageIndex, inDto.PageSize, inDto.SortField.IsNullOrEmpty() ? nameof(ReadingQuestionCriterionSystemView.ShowOrder) : inDto.SortField, inDto.Asc); }