|
@@ -312,14 +312,18 @@ public class ExamRecordDataServiceImpl implements ExamRecordDataService {
|
|
|
boolean isFaceVerifyForceExit = examProperty != null && StringUtil.isTrue(examProperty.getValue());
|
|
|
|
|
|
if (examRecordData.getFaceVerifyResult() != null) {
|
|
|
- //如果活检结果不为空,且强制活检失败,则判定为违纪有警告
|
|
|
if (IsSuccess.SUCCESS == examRecordData.getFaceVerifyResult()) {
|
|
|
+ // 存在活体检测成功结果,则直接返回
|
|
|
return new CalcFaceBiopsyResultResp(IsSuccess.SUCCESS);
|
|
|
}
|
|
|
+
|
|
|
if (isFaceVerifyForceExit) {
|
|
|
+ //若 强制活检失败,则判定为异常、违纪
|
|
|
return new CalcFaceBiopsyResultResp(true, true, IsSuccess.FAILED);
|
|
|
}
|
|
|
- return new CalcFaceBiopsyResultResp();
|
|
|
+
|
|
|
+ //否则判定为异常、不违纪
|
|
|
+ return new CalcFaceBiopsyResultResp(true, false, IsSuccess.FAILED);
|
|
|
}
|
|
|
|
|
|
//如果考试记录中的活检记录为空,需要再次计算一次,并更新到考试记录中
|
|
@@ -362,10 +366,12 @@ public class ExamRecordDataServiceImpl implements ExamRecordDataService {
|
|
|
}
|
|
|
|
|
|
if (isFaceVerifyForceExit) {
|
|
|
+ //若 强制活检失败,则判定为异常、违纪
|
|
|
return new CalcFaceBiopsyResultResp(true, true, IsSuccess.FAILED);
|
|
|
}
|
|
|
|
|
|
- return new CalcFaceBiopsyResultResp();
|
|
|
+ //否则判定为异常、不违纪(包含未做活体情况)
|
|
|
+ return new CalcFaceBiopsyResultResp(true, false, IsSuccess.FAILED);
|
|
|
}
|
|
|
|
|
|
/**
|