Merge branch 'master' of http://git.ht-atia.cn/qinyanlei/inspect

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java

@@ -100,8 +100,10 @@ public class ResultAnalysisUtils {
             resultAnalysis.setPointStatus("0");
             resultAnalysis.setResultType("2");
             resultAnalysis.setResStatus("0");
-            if ("meter".equals(algType) || "infrared".equals(algType)) {
-                //defaultDesc = messageUtils.get("与样本有差异");
+            if ("meter".equals(algType)) {
+                resultAnalysis.setResultType("0");
+                defaultDesc = messageUtils.get("读数失败");
+            } else if ("infrared".equals(algType)) {
                 defaultDesc = messageUtils.get("读数失败");
             } else {
                 defaultDesc = messageUtils.get("算法内部异常");