diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs index 5856d7d9d..2ec8f6157 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs @@ -974,6 +974,16 @@ namespace IRaCIS.Core.Application.Service }); break; case JudgeTypeEnum.DifferenceAbsoluteValue: + + var answer1 = taskAnswer1.IsNullOrEmptyReturnNull(); + var answer2 = taskAnswer2.IsNullOrEmptyReturnNull(); + + // 已经判断不相等了 所以只可能有一个为Null + if (answer1 == null || answer2 == null) + { + noteEqual = true; + } + var deffaultValue = taskAnswer1.IsNullOrEmptyReturn0() - taskAnswer2.IsNullOrEmptyReturn0(); if (deffaultValue < 0) { @@ -1000,6 +1010,17 @@ namespace IRaCIS.Core.Application.Service break; case JudgeTypeEnum.PercentageDifference: + + + var answer1P = taskAnswer1.IsNullOrEmptyReturnNull(); + var answer2P = taskAnswer2.IsNullOrEmptyReturnNull(); + + // 已经判断不相等了 所以只可能有一个为Null + if (answer1P == null || answer2P == null) + { + noteEqual = true; + } + var value1 = taskAnswer1.IsNullOrEmptyReturn0(); var value2 = taskAnswer2.IsNullOrEmptyReturn0(); if (value1 == 0 || value2 == 0) diff --git a/IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs b/IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs index 41196b603..8a835bc1f 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs @@ -225,7 +225,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common catch (Exception) { - return 0; + return null; } } @@ -253,6 +253,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common + /// /// 获取DisplayName ///