|
|
|
@ -538,9 +538,14 @@ namespace Shentun.Peis.DiagnosisFunctions |
|
|
|
//老系统 拆分结果后,每个结果如果匹配到了结果模板,就不继续诊断匹配
|
|
|
|
//新系统 匹配到底
|
|
|
|
|
|
|
|
var resultAry = GetResultArry(item.Result); |
|
|
|
List<string> templateResultList = new List<string>(); |
|
|
|
for (int i = 0; i < resultAry.Length; i++) |
|
|
|
{ |
|
|
|
templateResultList.Add(Regex.Replace(resultAry[0], @"\d+(\.\d+)?", "$")); |
|
|
|
} |
|
|
|
|
|
|
|
List<string> templateResultList = new List<string>(GetResultArry(item.Result)); |
|
|
|
|
|
|
|
// List<string> templateResultList = new List<string>(GetResultArry(item.Result));
|
|
|
|
|
|
|
|
var summaryResultMatchIsOld = await _sysParmValueManager.GetSysParmValueAsync(Guid.Empty, "summary_result_match_isold"); |
|
|
|
|
|
|
|
@ -556,7 +561,6 @@ namespace Shentun.Peis.DiagnosisFunctions |
|
|
|
|
|
|
|
foreach (var itemResult in templateResultList) |
|
|
|
{ |
|
|
|
|
|
|
|
List<string> tempDiagnosisList = new List<string>(); |
|
|
|
|
|
|
|
if (string.IsNullOrWhiteSpace(itemResult) || itemResult.StartsWith("余未见异常")) |
|
|
|
|