|
@@ -677,7 +677,7 @@
|
|
|
|
|
|
|
|
|
|
if(disFeatureList[i].type == '3' && !disFeatureList[i].midResult ) { //化验项下面诊断公式如果有用到,判断是否填写结果项
|
|
if(disFeatureList[i].type == '3' && !disFeatureList[i].midResult ) { //化验项下面诊断公式如果有用到,判断是否填写结果项
|
|
- const regex2 = new RegExp(`(?<=\\D|\\s?)${disFeatureList[i].code.replace('.','\\.')}(?=\\D|\\s?)`)
|
|
|
|
|
|
+ const regex2 = new RegExp(`(?<=\\D|\\b)${disFeatureList[i].code.replace('.','\\.')}(?=\\D|\\b)`) //序号+前面是单词边界或者是非数字+后面是单词边界或者是非数字
|
|
// const regex2 = new RegExp(`、\\s*、{1,}`)
|
|
// const regex2 = new RegExp(`、\\s*、{1,}`)
|
|
// const regex2 = new RegExp(`([^0-9]|\\s{0,1})${disFeatureList[i].code}([^0-9]|\\s{0,1})`)
|
|
// const regex2 = new RegExp(`([^0-9]|\\s{0,1})${disFeatureList[i].code}([^0-9]|\\s{0,1})`)
|
|
let hasError = disFormulaList.find(item => {return regex2.test(item.formula)})
|
|
let hasError = disFormulaList.find(item => {return regex2.test(item.formula)})
|
|
@@ -691,7 +691,7 @@
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if(disFeatureList[i].type == '4' && !disFeatureList[i].relation ) { //辅检项下面诊断公式如果有用到,判断是否填写结果项(辅检结果是填在关联词列)
|
|
if(disFeatureList[i].type == '4' && !disFeatureList[i].relation ) { //辅检项下面诊断公式如果有用到,判断是否填写结果项(辅检结果是填在关联词列)
|
|
- const regex2 = new RegExp(`(?<=\\D|\\s?)${disFeatureList[i].code.replace('.','\\.')}(?=\\D|\\s?)`)
|
|
|
|
|
|
+ const regex2 = new RegExp(`(?<=\\D|\\b)${disFeatureList[i].code.replace('.','\\.')}(?=\\D|\\b)`)
|
|
let hasError = disFormulaList.find(item => {return regex2.test(item.formula)})
|
|
let hasError = disFormulaList.find(item => {return regex2.test(item.formula)})
|
|
if(hasError) {
|
|
if(hasError) {
|
|
disFeatureList[i].verifyRelation = "数据异常"
|
|
disFeatureList[i].verifyRelation = "数据异常"
|