|
@@ -317,12 +317,12 @@ public class FaceBiopsyServiceImpl implements FaceBiopsyService {
|
|
|
private String getErrorMsg(List<FaceBiopsyStepInfo> verifySteps) {
|
|
|
for (FaceBiopsyStepInfo stepInfo : verifySteps) {
|
|
|
//如果当前步骤为超时,则直接跳出循环
|
|
|
- if ((stepInfo.getTimeout() != null && stepInfo.getTimeout())) {
|
|
|
+ if ((null != stepInfo.getTimeout() && stepInfo.getTimeout())) {
|
|
|
return "超时未完成";
|
|
|
}
|
|
|
|
|
|
//整个检测步骤中只要有一次失败,则认为整个活检失败
|
|
|
- if (!stepInfo.getResult()) {
|
|
|
+ if (null!= stepInfo.getResult() && !stepInfo.getResult()) {
|
|
|
return stepInfo.getErrorMsg();
|
|
|
}
|
|
|
}
|