Merge branch 'termLink0615' into test

src/components/autoTest/AutoKnowledgeMapRuleTest.vue

@@ -16,7 +16,11 @@
           <el-button size="mini" @click="exportData">导出规则中未涉及到的医院术语</el-button>
         </el-form-item>
         <el-form-item style="marginbottom: 0px">
-          <el-button size="mini" @click="handleAllTest" :disabled="!runningStatus || implement">所有规则测试</el-button>
+          <el-button
+            size="mini"
+            @click="handleAllTest"
+            :disabled="!runningStatus || implement"
+          >所有规则测试</el-button>
         </el-form-item>
       </el-form>
     </crumbs>
@@ -56,8 +60,9 @@
               :disabled="!runningStatus || implement"
             >
               {{
-              runningStatusArr[scope.row.caseId-1] === 1 || implement
+              runningStatusArr[scope.row.caseId-1] === 1
               ? '执行测试中'
+              :implement?'执行测试'
               : '执行测试'
               }}
             </el-button>
@@ -102,6 +107,7 @@ export default {
     this.zskgetDict();
     // this._getRunningStatus()   // 进入页面立即确认状态
     this.timer = setInterval(this._getRunningStatus, 20 * 1000);
+    this.timer = setInterval(this.getRunningState, 20 * 1000);
   },
   beforeDestroy() {
     clearInterval(this.timer);
@@ -121,7 +127,7 @@ export default {
         .getRunningState({ caseGroup: 1 })
         .then(res => {
           if (res.data.code == '0') {
-            this.implement = res.data.data
+            this.implement = res.data.data;
           }
         })
         .catch(error => {
@@ -170,11 +176,11 @@ export default {
               type: 'success'
             });
             this.getDataList(this.hospitalId); // 重新获取列表
-            this.getRunningState()
+            this.getRunningState();
           } else {
             this.$message.error(res.data.msg || '重置失败');
             this.getDataList(this.hospitalId); // 重新获取列表
-            this.getRunningState()
+            this.getRunningState();
           }
           this.runningStatusArr = statusTempArr;
         });

src/components/base/LtModal.vue

@@ -215,6 +215,7 @@ export default {
       this.form.formConceptId = this.data.formConceptId;
       this.form.form = this.data.form;
       this.form.source = this.data.source;
+      this.form.hisCode = this.data.hisCode;
       this.getTermMatching();
       this.getRelatedMapping();
     }

src/components/cdssManage/nursing/nursing.vue

@@ -94,6 +94,12 @@ export default {
     return {
       list: [],
       searched: false,
+      matchList: [
+        { id: '', name: '全部' },
+        { id: 1, name: '已匹配' },
+        { id: 0, name: '未匹配' },
+        { id: 2, name: '多项匹配' }
+      ],
       filter: {
         hisName: '', // 医院诊断名称
         uniqueName: '', //标准诊断名称

src/components/testManager/staticKnowledgeMap/StaticKnowledgeMapTest.vue

@@ -86,8 +86,9 @@
               :disabled="!runningStatus || implement"
               @click="handleTest(scope.row, scope.$index)"
               >{{
-                runningStatusArr[scope.$index] === 1 || implement
+                runningStatusArr[scope.$index] === 1
                   ? '执行测试中...'
+                  :implement?'执行测试'
                   : '执行测试'
               }}</el-button
             >
@@ -135,6 +136,7 @@ export default {
   created() {
     this._getHospitalInfoCDSS();
     this.timer = setInterval(this._getRunningStatus, 20 * 1000);
+    this.timer = setInterval(this.getRunningState, 20 * 1000);
   },
   beforeDestroy() {
     clearInterval(this.timer);