Merge remote-tracking branch 'origin/master' into referMaster

# Conflicts:
#	src/api/cdss.js
#	src/api/config.js

src/api/cdss.js

@@ -3,7 +3,7 @@ import config from '@api/config.js';
 const urls = config.urls;
 function request(config) {
   const instance = axios.create({
-    baseURL: "http://192.168.2.122:7010",
+    //baseURL: "http://192.168.2.121:7010",
     timeout: 500000,
     headers: {
       'Content-Type': "application/json;charset=utf-8"

src/api/config.js

@@ -442,7 +442,7 @@ export default {
     'exportDeptModuleCDSS': '/api/cdssman/tran/deptConfig/exportExcelModule',   //科室-数据导入模板导出
     'precDeptDataMatch': '/api/cdssman/tran/deptConfig/precDataMatch',
     'dataDeptVerify': '/api/cdssman/tran/deptConfig/dataVerify',
-
+    
     'getNursePage': '/api/cdssman/tran/nurseConfig/getPage',   //护理列表
     'nurseIsExistRecord': '/api/cdssman/tran/nurseConfig/isExistRecord',   //护理-映射关系是否已存在
     'saveOrUpdateRecord': '/api/cdssman/tran/nurseConfig/saveOrUpdateRecord',   //护理列表添加
@@ -453,6 +453,28 @@ export default {
     'precNurseDataMatch': '/api/cdssman/tran/nurseConfig/precDataMatch',
     'dataNurseVerify': '/api/cdssman/tran/nurseConfig/dataVerify',
 
+
+    'getTcmdiseasePage': '/api/cdssman/tran/tcmdiseaseConfig/getPage',   //中医疾病列表
+    'tcmIsExistRecord': '/api/cdssman/tran/tcmdiseaseConfig/isExistRecord',   //中医疾病-映射关系是否已存在
+    'saveOrUpdateRecordTcm': '/api/cdssman//tran/tcmdiseaseConfig/saveOrUpdateRecord',   //护理列表添加
+    'deleteTcmRecord': '/api/cdssman/tran/tcmdiseaseConfig/deleteRecord',   //中医疾病-删除映射关系
+    'exportTcmRecord': '/api/cdssman/tran/tcmdiseaseConfig/exportExcel',   //中医疾病-数据导出
+    'importTcmRecord': '/api/cdssman/tran/tcmdiseaseConfig/importExcel',   //检验-数据导入
+    'exportTcmModule': '/api/cdssman/tran/tcmdiseaseConfig/exportExcelModule',   //护理-数据导入模板导出
+    'precTcmDataMatch': '/api/cdssman/tran/tcmdiseaseConfig/precDataMatch',
+    'dataTcmVerify': '/api/cdssman/tran/tcmdiseaseConfig/dataVerify',
+
+    'getTcmsyndromePage': '/api/cdssman/tran/tcmsyndromeConfig/getPage',   //中医证候列表
+    'tcmdromeIsExistRecord': '/api/cdssman/tran/tcmsyndromeConfig/isExistRecord',   //中医证候-映射关系是否已存在
+    'saveOrUpdateRecordTcmdrome': '/api/cdssman//tran/tcmsyndromeConfig/saveOrUpdateRecord',   //中医证候列表添加
+    'deleteTcmdromeRecord': '/api/cdssman/tran/tcmsyndromeConfig/deleteRecord',
+    'exportTcmdromeRecord': '/api/cdssman/tran/tcmsyndromeConfig/exportExcel',   //中医证候-数据导出
+    'importTcmdromeRecord': '/api/cdssman/tran/tcmsyndromeConfig/importExcel',   //中医证候-数据导入
+    'exportTcmdromeModule': '/api/cdssman/tran/tcmsyndromeConfig/exportExcelModule',   //中医证候-数据导入模板导出
+    'precTcmdromeDataMatch': '/api/cdssman/tran/tcmsyndromeConfig/precDataMatch',
+    'dataTcmdromeVerify': '/api/cdssman/tran/tcmsyndromeConfig/dataVerify',
+
+
     // 'saveHospitalInfoRecordCDSS': '/api/cdssman/tran/hospitalInfo/saveRecord',   //医院信息——修改医院信息
 
     'modifyConnectStatusCDSS': '/api/cdssman/hospitalInfo/modifyConnectStatus',   //医院信息——修改医院信息 
@@ -504,11 +526,11 @@ export default {
     'getKlmEnumsDataCDSS': '/api/cdssman/getKlmEnumsData',   //枚举数据获取
 
 
-    'getCaseResultList': '/api/cdssman/test/rule/getCaseResultList',
-    'billRuleTest': '/api/cdssman/test/rule/billRuleTest',
-    'getResultBillPage': '/api/cdssman/test/rule/getResultBillPage',
-    'exportRuleExcel': '/api/cdssman/test/rule/exportExcel',
-    'ruleAllTest': '/api/cdssman/test/rule/ruleTest',
+    'getCaseResultList': '/api/cdssman/test/rule/getCaseResultList', 
+    'billRuleTest': '/api/cdssman/test/rule/billRuleTest',   
+    'getResultBillPage': '/api/cdssman/test/rule/getResultBillPage', 
+    'exportRuleExcel': '/api/cdssman/test/rule/exportExcel', 
+    'ruleAllTest': '/api/cdssman/test/rule/ruleTest', 
     'getResultCriticalPage': '/api/cdssman/test/rule/getResultCriticalPage',   //危急值测试列表
     'criticalRuleTest': '/api/cdssman/test/rule/criticalRuleTest',   //危急值规则测试
     'getResultHighriskDrugPage': '/api/cdssman/test/rule/getResultHighriskDrugPage',   //高危药品测试列表
@@ -518,7 +540,7 @@ export default {
     'getResultOtherPacsPage': '/api/cdssman/test/rule/getResultOtherPacsPage',   //其他值提醒（辅检）测试列表
     'getResultOtherTransfusionPage': '/api/cdssman/test/rule/getResultOtherTransfusionPage',   //其他值提醒（输血）测试列表
     'otherRuleTest': '/api/cdssman/test/rule/otherRuleTest',   //其他值提醒规则测试
-
+    
     'billExportExcel': '/api/cdssman/test/rule/billExportExcel',   //开单合理性规则测试结果导出
     'criticalExportExcel': '/api/cdssman/test/rule/criticalExportExcel',   //危急值规则测试结果导出
     'highriskDrugExportExcel': '/api/cdssman/test/rule/highriskDrugExportExcel',   //高危药品规则测试结果导出
@@ -534,47 +556,50 @@ export default {
     'getStaticCaseResultList': '/api/cdssman/test/staticKnowledge/getCaseResultList',   //静态知识测试总览列表
     'getStaticPage': '/api/cdssman/test/staticKnowledge/getPage',   //静态知识测试结果明细列表
     'staticKnowledgeTest': '/api/cdssman/test/staticKnowledge/staticKnowledgeTest',   //静态知识测试
+    'getRunningState': '/api/cdssman/test/running/getRunningStatus',   //自动化测试执行状态
     'getRunningStatus': '/api/cdssman/test/running/getStatus',   //查看测试用例运行状态
     'getRunningStatusByHospitalId': '/api/cdssman/test/running/getStatusByHospitalId',   //查拉面所有测试用例运行状态
     'updateRunningStatus': '/api/cdssman/test/running/updateStatus',   //更新测试用例运行状态
-      //知识库规则维护
-      'zskRuleList':'/api/cdssman/klRule/getKlRuleInfoPage',//规则列表
-      'zskAddRule':'/api/cdssman//klRule/saveRuleInfo',//添加规则
-      'zskActiveRule':'/api/cdssman/klRule/startRuleInfo',//启用规则
-      'zskDisableRule':'/api/cdssman/klRule/disableRuleInfo',//禁用规则
-      'zskDelRule':'/api/cdssman/klRule/clearRuleInfo',//删除规则
-      'zskRuleDetail':'/api/cdssman/klRule/getByIdRuleInfo',//规则详情
-      'zskTypeList':'/api/cdssman/klRulePlan/getMenu',//类型列表
-      'zskSearchConcept':'/api/cdssman/klDisease/searchConcept',//知识库搜索术语
-      'zskUpdateAll':'/api/cdssman/cache/clearRuleAll',//更新数据
-      'zskgetDict':'/api/cdssman/kl/dictionary/getDictionarys',//
+    //知识库规则维护
+    'zskRuleList': '/api/cdssman/klRule/getKlRuleInfoPage',//规则列表
+    'zskAddRule': '/api/cdssman//klRule/saveRuleInfo',//添加规则
+    'zskActiveRule': '/api/cdssman/klRule/startRuleInfo',//启用规则
+    'zskDisableRule': '/api/cdssman/klRule/disableRuleInfo',//禁用规则
+    'zskDelRule': '/api/cdssman/klRule/clearRuleInfo',//删除规则
+    'zskRuleDetail': '/api/cdssman/klRule/getByIdRuleInfo',//规则详情
+    'zskTypeList': '/api/cdssman/klRulePlan/getMenu',//类型列表
+    'zskSearchConcept': '/api/cdssman/klDisease/searchConcept',//知识库搜索术语
+    'zskUpdateAll': '/api/cdssman/cache/clearRuleAll',//更新数据
+    'zskgetDict': '/api/cdssman/kl/dictionary/getDictionarys',//
     //知识库树形图
-    'getTree':'/api/cdssman/multContact/getTree',//获取当前type数据
-    'searchTreeItem':'/api/cdssman/multContact/getAllForRelation',//检索树元素
-    'addTreeRelation':'/api/cdssman/multContact/addRelation',//保存树元素
+    'getTree': '/api/cdssman/multContact/getTree',//获取当前type数据
+    'searchTreeItem': '/api/cdssman/multContact/getAllForRelation',//检索树元素
+    'addTreeRelation': '/api/cdssman/multContact/addRelation',//保存树元素
     //知识库基础维护
-    'getBaseConceptInfoPage':'/api/cdssman/graph/klConcept/getConceptInfoPage',
-    'startConcept':'/api/cdssman/graph/klConcept/startConcept',
-    'disableConcept':'/api/cdssman/graph/klConcept/disableConcept',
-    'baseTypeGetPage':'/api/cdssman/kl/lexicon/getPage',
-    'baseRelationTypeGetPage':'/api/cdssman/kl/lexiconRelationship/getPage',
-    'clearStandRuleDrug':'/api/cdssman/cache/clearStandRuleDrug',
-    'saveBaseConceptInfo':'/api/cdssman/graph/klConcept/saveConceptInfo',
-    'getBaseConceptAll':'/api/cdssman/graph/klConcept/getConceptAll',
-    'clearConceptInfo':'/api/cdssman/graph/klConcept/clearConceptInfo',
+    'getBaseConceptInfoPage': '/api/cdssman/graph/klConcept/getConceptInfoPage',
+    'startConcept': '/api/cdssman/graph/klConcept/startConcept',
+    'disableConcept': '/api/cdssman/graph/klConcept/disableConcept',
+    'baseTypeGetPage': '/api/cdssman/kl/lexicon/getPage',
+    'baseRelationTypeGetPage': '/api/cdssman/kl/lexiconRelationship/getPage',
+    'clearStandRuleDrug': '/api/cdssman/cache/clearStandRuleDrug',
+    'saveBaseConceptInfo': '/api/cdssman/graph/klConcept/saveConceptInfo',
+    'getBaseConceptAll': '/api/cdssman/graph/klConcept/getConceptAll',
+    'clearConceptInfo': '/api/cdssman/graph/klConcept/clearConceptInfo',
     //疾病相关维护
-    'getDiseasePage':'/api/cdssman/klDisease/getDiseasePage',
-    'diseaseDelete':'/api/cdssman/klDisease/delete',
-    'getBaseDetail':'/api/cdssman/klDisease/getDetail',
-    'searchConcept':'/api/cdssman/klDisease/searchConcept',
-    'findDisName':'/api/cdssman/klDisease/findDisName',
-    'diseaseBaseSave':'/api/cdssman/klDisease/save',
+    'getDiseasePage': '/api/cdssman/klDisease/getDiseasePage',
+    'diseaseDelete': '/api/cdssman/klDisease/delete',
+    'getBaseDetail': '/api/cdssman/klDisease/getDetail',
+    'searchConcept': '/api/cdssman/klDisease/searchConcept',
+    'findDisName': '/api/cdssman/klDisease/findDisName',
+    'diseaseBaseSave': '/api/cdssman/klDisease/save',
+    'exportExcelTemplates': '/api/cdssman/importConcept/exportExcelTemplates',
+    'exportTermExcel': '/api/cdssman/importConcept/exportTermExcel',
     //静态知识术语
-    'staticBaseKnowledge':'/api/cdssman/kl/conceptInfo/getPage',
-    'changeBaseStatus':'/api/cdssman/kl/conceptInfo/changeStatus',
-    'getBaseRecordById':'/api/cdssman/kl/conceptInfo/getRecordById',
-    'saveBaseOrUpdateRecord':'/api/cdssman/kl/conceptInfo/saveOrUpdateRecord',
-    'staticKnowledgeBaseInfo':'/api/cdssman/kl/conceptInfo/staticKnowledgeIndexWithoutInfo',
+    'staticBaseKnowledge': '/api/cdssman/kl/conceptInfo/getPage',
+    'changeBaseStatus': '/api/cdssman/kl/conceptInfo/changeStatus',
+    'getBaseRecordById': '/api/cdssman/kl/conceptInfo/getRecordById',
+    'saveBaseOrUpdateRecord': '/api/cdssman/kl/conceptInfo/saveOrUpdateRecord',
+    'staticKnowledgeBaseInfo': '/api/cdssman/kl/conceptInfo/staticKnowledgeIndexWithoutInfo',
     //规则测试相关
     'allRuleTest':'/api/cdssman/test/rule/allRuleTest',
     'autoGetCaseResultList':'/api/cdssman/test/rule/getCaseResultList',
@@ -583,6 +608,14 @@ export default {
     'ruleExportExcel':'/api/cdssman/test/rule/ruleExportExcel',
     'autoRuleTest':'/api/cdssman/test/rule/ruleTest',
     'clearDrug':'/api/cdssman/cache/clearDrug',
+    //药品维护
+    'getPageList': '/api/cdssman/klDrugRegister/getPage',
+    'getsearchDrug': '/api/cdssman/klDrugRegister/searchDrug',
+    'saveOrUpdate': '/api/cdssman/klDrugRegister/saveOrUpdate',
+    'getByParam': '/api/cdssman/klDrugRegister/getByParam',
+    'paramDelete': '/api/cdssman/klDrugRegister/delete',
+    'klRegulation': '/api/cdssman/klRegulation/index'
+
   },
   menuIconList: { //菜单对应图标
     'YH-KZT': 'el-icon-menu',

src/components/cdssManage/disease/Disease.vue

@@ -15,16 +15,6 @@
     <div class="searchBar">
       <div class="searchContent">
         <el-form :inline="true" class="demo-form-inline">
-          <el-form-item label="" class="selectMedicine">
-            <el-select size="mini" v-model="filter.match" placeholder="请选择" clearable>
-              <el-option
-                      v-for="item in matchList"
-                      :label="item.name"
-                      :value="item.name"
-                      :key="item.id"
-              ></el-option>
-            </el-select>
-          </el-form-item>
           <el-form-item label="医院诊断名称：">
             <el-input size="mini" v-model="filter.hisName" placeholder="请输入" clearable></el-input>
           </el-form-item>
@@ -71,9 +61,6 @@
         ></el-pagination>
       </div>
     </div>
-    <LtModal v-if="modalVisiable" :disabled="saveDisable" @confirm="submitForm" @close="closeModal">
-      <LinkContent :form="form" ref="relationForm" labelName="诊断名称" termType="4" valName="diseaseNames"/>
-    </LtModal>
   </div>
 </template>
 
@@ -81,14 +68,11 @@
 import api from '@api/cdss.js';
 import config from '@api/config.js';
 import utils from '@api/utils.js';
-import LtModal from '@base/LtModal';
-import LinkContent from '@base/LinkContent';
 
 export default {
   name: 'Disease', //化验大小项和公表维护
   data: function() {
     return {
-      matchList:[{id:-1,name:'全部'},{id:1,name:'已匹配'},{id:2,name:'未匹配'},{id:3,name:'多项匹配'}],
       list: [],
       searched: false,
       filter: {
@@ -102,19 +86,10 @@ export default {
       total: 0,
       uploadInfo: '导入',
       title: '诊断关联维护 | ',
-      modalVisiable:false,  //弹窗显示状态
-      saveDisable:false,    //确定按钮禁用状态
-      form:{
-          searchText: '', //搜索字段
-          hisName: '',
-          icdCode: ''
-      }
+      hospitaiName: '',
+      hospitalId: ''
     };
   },
-  components:{
-      LtModal,
-      LinkContent
-  },
   created() {
     const { data } = this.$route.params;
     this.hospitaiName = (data && data.name) || '';
@@ -257,15 +232,14 @@ export default {
             filter: this.filter
           }
         : { currentPage: this.currentPage, pageSize: this.pageSize };
-      this.showModal()
-      /*this.$router.push({
+      this.$router.push({
         name: 'AddDisease',
         params: Object.assign(pam, {
           isEdit: false,
           data: { hospitalId: this.hospitalId },
           hospitaiName: this.hospitaiName
         })
-      });*/
+      });
     },
     // 修改诊断关联-跳转至编辑页面
     modifyRelation(row) {
@@ -277,15 +251,14 @@ export default {
             filter: this.filter
           }
         : { currentPage: this.currentPage, pageSize: this.pageSize };
-      /*this.$router.push({
+      this.$router.push({
         name: 'AddDisease',
         params: Object.assign(pam, {
           isEdit: true,
           data: { ...item, hospitalId: this.hospitalId },
           hospitaiName: this.hospitaiName
         })
-      });*/
-      this.showModal();
+      });
     },
     currentChange(next) {
       this.currentPage = next;
@@ -465,84 +438,16 @@ export default {
       //解决上传相同文件不触发change
       let inp = document.getElementById('upFile');
       inp.value = '';
-    },
-    showModal(){
-        this.modalVisiable=true
-    },
-    closeModal(){
-        this.modalVisiable=false
-    },
-    // 建立关联-参数处理
-    submitForm() {
-        console.log(this.$refs)
-        this.$refs.relationForm.$refs.innerForm.validate(valid => {
-            if (valid) {
-                const { searchText, hisName, icdCode } = this.form;
-                let params = {
-                    hisName: hisName,
-                    uniqueName: searchText,
-                    icdCode: icdCode,
-                    hospitalId: this.hospitalId
-                };
-                this.showSaveDialog(params);
-            } else {
-                console.log('error submit!!');
-                return false;
-            }
-        });
-    },
-      // 建立关联-映射关系是否已存在
-      showSaveDialog(params) {
-          this.saveDisable = true; //提交保存按钮不可点击，返回结果时才可点击，防止频繁发送请求
-          api
-              .diseaseIsExistRecord(params)
-              .then(res => {
-                  if (!res.data.data) {
-                      // 不存在,创建新的关联
-                      // 如果是编辑时,需要携带id
-                      if (this.isEdit) {
-                          params = { ...params, id: this.editId };
-                      }
-                      this.saveLisMapping(params, '保存成功', 'success');
-                  } else {
-                      // 已存在,提示修改
-                      this.warning('该条关联已存在，无法添加');
-                      this.saveDisable = false;
-                  }
-              })
-              .catch(err => {
-                  if (err.code === '900010001') {
-                      return false;
-                  }
-                  this.warning(err);
-              });
-      },
-
-      // 映射关系不存在-建立关联
-      saveLisMapping(params, msg, type) {
-          api.saveOrUpdateDiseaseRecord(params).then(res => {
-              if (res.data.code === '0') {
-                  this.warning(res.data.msg || msg, type);
-                  this.initForm();
-                  this.$router.push({
-                      name: 'Disease',
-                      params: Object.assign({}, this.$route.params, {
-                          currentPage: 1
-                      })
-                  });
-              } else {
-                  this.warning(res.data.msg);
-              }
-              this.saveDisable = false;
-          });
-      },
+    }
   }
 };
 </script>
 
-<style lang="less" scoped>
+<style lang="less">
 @import '../../../less/admin.less';
+</style>
 
+<style lang="less" scoped>
 .delete {
   color: red;
 }

src/components/cdssManage/drug/DrugManage.vue

@@ -61,9 +61,6 @@
         ></el-pagination>
       </div>
     </div>
-    <LtModal v-if="modalVisiable" :disabled="saveDisable" @confirm="submitForm" @close="closeModal">
-      <LinkContent :form="form" ref="relationForm" labelName="药品名称" termType="5" valName="drugNames"/>
-    </LtModal>
   </div>
 </template>
 
@@ -71,15 +68,9 @@
 import api from '@api/cdss.js';
 import config from '@api/config.js';
 import utils from '@api/utils.js';
-import LtModal from '@base/LtModal';
-import LinkContent from '@base/LinkContent';
 
 export default {
   name: 'DrugManage', //化验大小项和公表维护
-  components:{
-      LtModal,
-      LinkContent
-  },
   data: function() {
     return {
       list: [],
@@ -96,14 +87,7 @@ export default {
       uploadInfo: '导入',
       title: '药品关联维护 | ',
       hospitaiName: '',
-      hospitalId: '',
-      modalVisiable:false,  //弹窗显示状态
-      saveDisable:false,    //确定按钮禁用状态
-      form:{
-          searchText: '', //搜索字段
-          hisName: '',
-          icdCode: ''
-      }
+      hospitalId: ''
     };
   },
   created() {
@@ -249,7 +233,14 @@ export default {
             filter: this.filter
           }
         : { currentPage: this.currentPage, pageSize: this.pageSize };
-        this.showModal()
+      this.$router.push({
+        name: 'AddDrug',
+        params: Object.assign(pam, {
+          isEdit: false,
+          data: { hospitalId: this.hospitalId },
+          hospitaiName: this.hospitaiName
+        })
+      });
     },
     // 修改诊断关联-跳转至编辑页面
     modifyRelation(row) {
@@ -261,7 +252,14 @@ export default {
             filter: this.filter
           }
         : { currentPage: this.currentPage, pageSize: this.pageSize };
-        this.showModal()
+      this.$router.push({
+        name: 'AddDrug',
+        params: Object.assign(pam, {
+          isEdit: true,
+          data: { ...item, hospitalId: this.hospitalId },
+          hospitaiName: this.hospitaiName
+        })
+      });
     },
     currentChange(next) {
       this.currentPage = next;
@@ -457,76 +455,7 @@ export default {
       //解决上传相同文件不触发change
       let inp = document.getElementById('upFile');
       inp.value = '';
-    },
-    showModal(){
-        this.modalVisiable=true
-    },
-    closeModal(){
-        this.modalVisiable=false
-    },
-    // 建立关联-参数处理
-    submitForm() {
-        this.$refs.relationForm.$refs.innerForm.validate(valid => {
-            if (valid) {
-                const { searchText, hisName, form } = this.form;
-                let params = {
-                    hisName: hisName,
-                    uniqueName: searchText,
-                    form: form,
-                    hospitalId: this.hospitalId
-                };
-                this.showSaveDialog(params);
-            } else {
-                console.log('error submit!!');
-                return false;
-            }
-        });
-    },
-    // 建立关联-映射关系是否已存在
-    showSaveDialog(params) {
-        this.saveDisable = true; //提交保存按钮不可点击，返回结果时才可点击，防止频繁发送请求
-        api
-            .drugIsExistRecord(params)
-            .then(res => {
-                if (!res.data.data) {
-                    // 不存在,创建新的关联
-                    // 如果是编辑时,需要携带id
-                    if (this.isEdit) {
-                        params = { ...params, id: this.editId };
-                    }
-                    this.saveLisMapping(params, '保存成功', 'success');
-                } else {
-                    // 已存在,提示修改
-                    this.warning('该条关联已存在，无法添加');
-                    this.saveDisable = false;
-                }
-            })
-            .catch(err => {
-                if (err.code === '900010001') {
-                    return false;
-                }
-                this.warning(err);
-            });
-    },
-
-    // 映射关系不存在-建立关联
-    saveLisMapping(params, msg, type) {
-        api.saveOrUpdateDrugRecord(params).then(res => {
-            if (res.data.code === '0') {
-                this.warning(res.data.msg || msg, type);
-                this.initForm();
-                this.$router.push({
-                    name: 'DrugManage',
-                    params: Object.assign({}, this.$route.params, {
-                        currentPage: 1
-                    })
-                });
-            } else {
-                this.warning(res.data.msg);
-            }
-            this.saveDisable = false;
-        });
-    },
+    }
   }
 };
 </script>