diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index fe888bd14..41ddec493 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -4553,32 +4553,32 @@ - + 获取阅片的计算数据 - + 获取Sod的值 - + 删除病灶获取起始病灶序号(RECIST1Point1 固定是1) - + 获取阅片报告 - + 测试计算 @@ -4586,21 +4586,21 @@ - + 计算任务 - + 获取报告验证的信息(这里每个标准可能不一样 返回用object) - + 自动计算 @@ -4608,35 +4608,35 @@ - + 获取报告整体整体评估 - + 获取报告是否存在疾病 - + 验证访视提交 - + 将上一次的访视病灶添加到这一次 - + 获取SOD @@ -4646,28 +4646,28 @@ - + 非淋巴结靶病灶长径之和 - + 与基线SOD相比变化量(mm) - + 与基线访视相比SOD变化百分比 - + 与整个访视期间SOD最低点相比增加的值(mm) @@ -4677,7 +4677,7 @@ - + 与整个访视期间SOD最低点相比增加的百分比 @@ -4687,7 +4687,7 @@ - + 整个访视期间SOD最低点访视名称 @@ -4697,48 +4697,48 @@ - + 是否存在非淋巴结靶病灶 - + 是否存在淋巴结靶病灶且该病灶比上一访视短径增加5MM以上 - + 获取存在淋巴结靶病灶且该病灶比上一访视短径增加5MM以上的病灶 - + 被评估为NE的单个靶病灶 - + 整体肿瘤评估 - + 测试肿瘤学评估 - + 计算整体肿瘤评估 【测试】 @@ -4766,28 +4766,28 @@ - + 是否存在疾病 - + 修改与整个访视期间SOD最低点相比增加的值(mm) - + 修改最低方式点名称 - + 修改所有访视任务的答案 @@ -4796,42 +4796,42 @@ - + 获取基线SOD - + 获取最低方式 - + 获取访视任务信息 - + 获取上一个访视任务Id - - + + 获取非靶病灶评估 - + 获取新病灶评估 diff --git a/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs b/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs index ac9294c72..afeb56916 100644 --- a/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs +++ b/IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs @@ -58,7 +58,6 @@ namespace IRaCIS.Core.Application.ViewModel public List? OptTypeList { get; set; } - public List OptTypeList { get; set; } = new List(); public string? IP { get; set; } diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs index f8c263e66..67b7efc07 100644 --- a/IRaCIS.Core.Application/Service/Management/UserService.cs +++ b/IRaCIS.Core.Application/Service/Management/UserService.cs @@ -856,7 +856,6 @@ namespace IRaCIS.Core.Application.Service var userLogQueryable = _userLogRepository.AsQueryable().IgnoreQueryFilters() - .WhereIf(inQuery.OptTypeList.Count()>0, t => inQuery.OptTypeList.Contains(t.OptType)) .WhereIf(inQuery.IdentityUserId != null, t => t.ActionIdentityUserId == inQuery.IdentityUserId) .WhereIf(inQuery.TargetIdentityUserId != null, t => t.TargetIdentityUserId == inQuery.TargetIdentityUserId) .WhereIf(inQuery.TrialId != null, t => t.ActionIdentityUser.UserTrialList.Any(c => c.TrialId == inQuery.TrialId) || t.TargetIdentityUser.UserTrialList.Any(c => c.TrialId == inQuery.TrialId)) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs index e89ddb4b8..ba1350ad0 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs @@ -33,7 +33,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate {CriterionType.IVUS,typeof(IVUSCalculateService) }, {CriterionType.OCT,typeof(OCTCalculateService) }, {CriterionType.MRIPDFF,typeof(MRIPDFFCalculateService) }, - {CriterionType.mRECISTHCC,typeof(MRECISTHCCCalculate) }, + {CriterionType.mRECISTHCC,typeof(MRECISTHCCCalculateService) }, }; diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs index e22735e3d..de8718e9a 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs @@ -11,7 +11,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { [ApiExplorerSettings(GroupName = "Reading")] - public class MRECISTHCCCalculate(IRepository _readingTableQuestionAnswerRepository, + public class MRECISTHCCCalculateService(IRepository _readingTableQuestionAnswerRepository, IRepository _visitTaskRepository, IRepository _readingQuestionCriterionTrialRepository, IRepository _readingTableQuestionTrialRepository,