update 活检异常违纪

examcloud-core-oe-task-service/src/main/java/cn/com/qmth/examcloud/core/oe/task/service/impl/ExamRecordDataServiceImpl.java

@@ -183,31 +183,24 @@ public class ExamRecordDataServiceImpl implements ExamRecordDataService {
             CalcFaceBiopsyResultReq req = new CalcFaceBiopsyResultReq();
             req.setExamRecordDataId(examRecordData.getId());
             CalcFaceBiopsyResultResp faceBiopsyResult = examRecordDataCloudService.calcFaceBiopsyResult(req);
+
             if (null != faceBiopsyResult.getFaceVerifyResult()) {
                 examRecordData.setFaceVerifyResult(faceBiopsyResult.getFaceVerifyResult());
             }
 
-            //判断是否违纪
-            if (null != faceBiopsyResult.getFaceVerifyResult() &&
-                    IsSuccess.FAILED == faceBiopsyResult.getFaceVerifyResult()) {
-                examRecordData.setIsIllegality(true);//活检失败，直接判定为违纪
-            } else {
-                //人脸检测或活检中有一个判断为违纪，则为违纪
-                boolean isIllegality = (null != faceCheckResult.getIsIllegality() && faceCheckResult.getIsIllegality()) ||
-                        (null != faceBiopsyResult.getIsIllegality() && faceBiopsyResult.getIsIllegality());
-                examRecordData.setIsIllegality(isIllegality);
-            }
+            //人脸抓拍比对或人脸活体检测中有一个判为违纪，则为违纪
+            boolean isIllegality = (faceCheckResult.getIsIllegality() != null && faceCheckResult.getIsIllegality())
+                    || (faceBiopsyResult.getIsIllegality() != null && faceBiopsyResult.getIsIllegality());
+            examRecordData.setIsIllegality(isIllegality);
 
-            //判断数据是否异常
-            boolean isWarn = (null != faceCheckResult.getIsWarn() && faceCheckResult.getIsWarn()) ||
-                    (null != faceBiopsyResult.getIsWarn() && faceBiopsyResult.getIsWarn());
-            examRecordData.setIsWarn(isWarn);//人脸检测或活检中有一个判断为异常，则为异常数据
+            //脸抓拍比对或人脸活体检测中有一个判为异常，则为异常
+            boolean isWarn = (faceCheckResult.getIsWarn() != null && faceCheckResult.getIsWarn())
+                    || (faceBiopsyResult.getIsWarn() != null && faceBiopsyResult.getIsWarn());
+            examRecordData.setIsWarn(isWarn);
 
             // 违纪自动审核
-            Boolean isAudit = this.calcAutoAuditResult(faceCheckResult.getNoPhotoAndIllegality(),
-                    faceBiopsyResult.getFaceVerifyResult(), faceBiopsyResult.getIsIllegality());
-            if (null != isAudit) {
-                examRecordData.setIsAudit(isAudit);
+            if (isIllegality) {
+                examRecordData.setIsAudit(true);
             }
         }