fix 异物范围过滤

AlgorithmModule/src/ImageResultJudge.cpp

@@ -392,6 +392,8 @@ int ImageResultJudge::ResultJudge(std::shared_ptr<ImageAllResult> pImageResult)
 							{
 								nerrortype = 0;
 								result = true;
+								bNG_Status = false;
+								bYS_Status = false;
 							}
 							pQxLog->AddCheckstr(PrintLevel_4, DET_LOG_LEVEL_3, "PolCell_Area_Max", "%s -> %f %s %f ",
 											   BOOL_TO_STR(detArea > area_max), detArea, BOOL_TO_ThanLess(detArea > area_max), area_max);

AlgorithmModule/src/QX_Merge_Analysis.cpp

@@ -485,7 +485,7 @@ int QX_Merge_Analysis::Analysis_single_Config(QXAnalysis_Config *pconfig, QX_cha
 					fmaxLen = pqxList->qxList.at(i).length;
 				}
 				// 长度超过阈值
-				if (pqxList->qxList.at(i).length > pconfig->len)
+				if (pconfig->len > 0 && pqxList->qxList.at(i).length > pconfig->len)
 				{
 					blenerror = true;
 					pqxList->qxList.at(i).nqx_type = QX_ERROR_TYPE_Len;
@@ -593,7 +593,7 @@ int QX_Merge_Analysis::Analysis_single_Config(QXAnalysis_Config *pconfig, QX_cha
 				{
 
 					int minidx = -1;
-					bool bdis = true;
+					bool bdis = (pconfig->dis > 0);
 					double remindis = 0;
 					// 对距离有要求
 					if (pconfig->dis > 0)
@@ -612,6 +612,11 @@ int QX_Merge_Analysis::Analysis_single_Config(QXAnalysis_Config *pconfig, QX_cha
 								allmindis = pqxList->qxList.at(i).tem_dis;
 							}
 						}
+						else
+						{
+							// 无邻近缺陷，距离检查自动通过
+							bdis = false;
+						}
 
 						remindis = pqxList->qxList.at(i).tem_dis;
 					}