diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index e8f3bde8c..64aa58613 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -1806,13 +1806,6 @@ - - - 修改与整个访视期间SOD最低点相比增加的值(mm) - - - - 修改最低方式点名称 @@ -1870,6 +1863,77 @@ + + + 与基线相比SPD变化的百分比 + + + + + + + 与基线相比脾肿大增加的百分比 + [(当前垂直径-130)-(基线垂直径-130)]/(基线垂直径-130) + + + + + + + 与最低点相比脾脏垂直径长度的增加值 + + + + + + + 脾肿垂直径最低点访视 + + + + + + + 获取脾脏评估 + + + + + + + 获取PET5PS评分 + + + + + + + 与基线相比摄取值变化 + + + + + + + FDG-PET总体评估结果 + + + + + + + 获取基线脾脏长度 + + + + + + + 与最低点相比脾脏垂直径长度的增加值 + + + + 获取靶病灶评估 @@ -1898,14 +1962,6 @@ - - - 枚举数组转字符串数组 方法名简短 - - - - - 删除病灶获取起始病灶序号 diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index 3b1b08c64..ea0444588 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -951,7 +951,7 @@ namespace IRaCIS.Core.Application.Image.QA break; case TrialQCProcess.DoubleAudit: - visitList = await _subjectVisitRepository.Where(x => x.TrialId == inDto.TrialId && (x.CurrentActionUserId == _userInfo.Id || (x.AuditState != AuditStateEnum.QCPassed))).Include(x => x.Subject).ToListAsync(); + visitList = await _subjectVisitRepository.Where(x => x.TrialId == inDto.TrialId && x.PreliminaryAuditUserId!= _userInfo.Id&&(x.CurrentActionUserId == _userInfo.Id || (x.AuditState != AuditStateEnum.QCPassed))).Include(x => x.Subject).ToListAsync(); if (subjectVisit != null) { return new GetNextIQCQualityOutDto() diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs index e933add62..9b7a765aa 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs @@ -1927,10 +1927,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate // }, // //ND/PD/CR/NE/PR/SD PMD PMD/CMR/PMR/NMR/NE PMD/PD // new CalculationDto(){ - // Column1=ReadingCommon.EnumToString(new List() { CTMRIOverallAssessment.ND }), - // Column2=ReadingCommon.EnumToString(new List() { FDGPETOverallAssessment.NE }), - // Column3=ReadingCommon.EnumToString(new List() { FDGPETOverallAssessment.NE}), - // Column4=ReadingCommon.EnumToString(new List() { ImagingOverallAssessment_Lugano.ND }), + // Column1=ReadingCommon.EnumToString(new List() { CTMRIOverallAssessment.ND, CTMRIOverallAssessment.PD,CTMRIOverallAssessment.CR,CTMRIOverallAssessment.NE,CTMRIOverallAssessment.PR,CTMRIOverallAssessment.SD}), + // Column2=ReadingCommon.EnumToString(new List() { FDGPETOverallAssessment.PMD, }), + // Column3=ReadingCommon.EnumToString(new List() {FDGPETOverallAssessment.PMD, FDGPETOverallAssessment.CMR,FDGPETOverallAssessment.PMR, FDGPETOverallAssessment.NMR, FDGPETOverallAssessment.NE }), + // Column4=ReadingCommon.EnumToString(new List() { ImagingOverallAssessment_Lugano.PMD }), // }, // //ND NE NE ND // new CalculationDto(){ @@ -1988,9 +1988,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate // Column3=ReadingCommon.EnumToString(new List() { FDGPETOverallAssessment.NE}), // Column4=ReadingCommon.EnumToString(new List() { ImagingOverallAssessment_Lugano.ND }), // }, - // } + // }; //} - + #endregion #region 获取基线脾脏长度