|
@@ -389,7 +389,7 @@
|
|
|
}
|
|
|
|
|
|
if(disFeatureList[i].type == '3' && !disFeatureList[i].result ) { //化验项下面诊断公式如果有用到,判断是否填写结果项
|
|
|
- const regex2 = new RegExp(`(?<=\\D)${disFeatureList[i].code}(?=\\D)`)
|
|
|
+ const regex2 = new RegExp(`(?<=\\D|\\s?)${disFeatureList[i].code}(?=\\D|\\s?)`)
|
|
|
let hasError = disFormulaList.find(item => {return regex2.test(item.formula)})
|
|
|
if(hasError) {
|
|
|
if(!disFeatureList[i].relation) {
|
|
@@ -401,7 +401,7 @@
|
|
|
}
|
|
|
}
|
|
|
if(disFeatureList[i].type == '4' && !disFeatureList[i].relation ) { //辅检项下面诊断公式如果有用到,判断是否填写结果项(辅检结果是填在关联词列)
|
|
|
- const regex2 = new RegExp(`(?<=\\D)${disFeatureList[i].code}(?=\\D)`)
|
|
|
+ const regex2 = new RegExp(`(?<=\\D|\\s?)${disFeatureList[i].code}(?=\\D|\\s?)`)
|
|
|
let hasError = disFormulaList.find(item => {return regex2.test(item.formula)})
|
|
|
|
|
|
if(hasError) {
|