Browse Source

Revert "修改化验校验前清除上一次结果(2523)"

This reverts commit 636687fab3b7282ecb055e4d6fb93f9a28a9f5bc.
zhangxc 5 years ago
parent
commit
0ac3c625fe
1 changed files with 13 additions and 17 deletions
  1. 13 17
      src/components/diagBase/AddDiagBase.vue

+ 13 - 17
src/components/diagBase/AddDiagBase.vue

@@ -675,24 +675,20 @@
                 // }
                 // }
                 //导入后判断
                 //导入后判断
 
 
-                if(disFeatureList[i].type == '3') { 
-                    disFeatureList[i].verifyRelation = ""
-                    disFeatureList[i].verifyResult = ""
-                    if(!disFeatureList[i].midResult ) {//化验项下面诊断公式如果有用到,判断是否填写结果项
-                        const regex2 = new RegExp(`(?<=\\D|\\b)${disFeatureList[i].code.replace('.','\\.')}(?=\\D|\\b)`) //序号+前面是单词边界或者是非数字+后面是单词边界或者是非数字
-                        //  const regex2 = new RegExp(`、\\s*、{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)})
-                        if(hasError) {
-                            if(!disFeatureList[i].relation) {
-                                disFeatureList[i].verifyRelation = "数据异常"
-                            }
-                            disFeatureList[i].verifyResult = "数据异常"
-                            const errStr = "第" + (i+ 1) +"行化验项数据异常"
-                            errStrList.push(errStr)
-                    }
+
+                if(disFeatureList[i].type == '3' && !disFeatureList[i].midResult ) { //化验项下面诊断公式如果有用到,判断是否填写结果项
+                    const regex2 = new RegExp(`(?<=\\D|\\b)${disFeatureList[i].code.replace('.','\\.')}(?=\\D|\\b)`) //序号+前面是单词边界或者是非数字+后面是单词边界或者是非数字
+                    //  const regex2 = new RegExp(`、\\s*、{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)})
+                    if(hasError) {
+                        if(!disFeatureList[i].relation) {
+                            disFeatureList[i].verifyRelation = "数据异常"
+                        }
+                        disFeatureList[i].verifyResult = "数据异常"
+                        const errStr = "第" + (i+ 1) +"行化验项数据异常"
+                        errStrList.push(errStr)
                     }
                     }
-                  
                 }
                 }
                  if(disFeatureList[i].type == '4' && !disFeatureList[i].relation ) { //辅检项下面诊断公式如果有用到,判断是否填写结果项(辅检结果是填在关联词列)
                  if(disFeatureList[i].type == '4' && !disFeatureList[i].relation ) { //辅检项下面诊断公式如果有用到,判断是否填写结果项(辅检结果是填在关联词列)
                     const regex2 = new RegExp(`(?<=\\D|\\b)${disFeatureList[i].code.replace('.','\\.')}(?=\\D|\\b)`)
                     const regex2 = new RegExp(`(?<=\\D|\\b)${disFeatureList[i].code.replace('.','\\.')}(?=\\D|\\b)`)