Browse Source

修改化验辅检下面公式是否用到规则判断(2250)

zhangxc 5 years ago
parent
commit
fa9e5b8aba
2 changed files with 4 additions and 4 deletions
  1. 2 2
      src/components/diagBase/AddDiagBase.vue
  2. 2 2
      vue.config.js

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

@@ -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) {

+ 2 - 2
vue.config.js

@@ -1,7 +1,7 @@
 const path = require('path');
 // const proxy_path = 'http://192.168.2.236:80';
-// const proxy_path = 'http://192.168.2.241:88';
-const proxy_path = 'http://192.168.2.236:88';
+const proxy_path = 'http://192.168.2.241:88';
+// const proxy_path = 'http://192.168.2.236:88';
 // const proxy_path = 'http://192.168.3.101:5050';
 // const proxy_path = 'http://192.168.3.117:5050';//周铁刚
 // const proxy_path = 'http://192.168.3.115:5050';