瀏覽代碼

修改公式中有化验和辅检,诊断特征化验辅检无结果时判断

zhangxc 5 年之前
父節點
當前提交
15d4c41859
共有 1 個文件被更改,包括 9 次插入2 次删除
  1. 9 2
      src/components/diagBase/AddDiagBase.vue

+ 9 - 2
src/components/diagBase/AddDiagBase.vue

@@ -387,16 +387,23 @@
                      const errStr = "第" + (i+ 1) +"行化验项数据填写不完整"
                     errStrList.push(errStr)
                 }
+               
                 if(disFeatureList[i].type == '3' && !disFeatureList[i].result ) { //化验项下面诊断公式如果有用到,判断是否填写结果项
-                    let hasError = disFormulaList.find(item => item.formula.indexOf(disFeatureList[i].code) > 1)
+                 const regex2 = new RegExp(`(?<=\\D)${disFeatureList[i].code}(?=\\D)`)
+                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 ) { //辅检项下面诊断公式如果有用到,判断是否填写结果项(辅检结果是填在关联词列)
-                    let hasError = disFormulaList.find(item => item.formula.indexOf(disFeatureList[i].code) > 1)
+                    const regex2 = new RegExp(`(?<=\\D)${disFeatureList[i].code}(?=\\D)`)
+                    let hasError = disFormulaList.find(item => {return regex2.test(item.formula)})
+                  
                     if(hasError) {
                         disFeatureList[i].verifyRelation = "数据异常"
                         const errStr = "第" + (i+ 1) +"行辅捡项数据异常"