Merge branch 'dev' into test

src/api/config.js

@@ -176,12 +176,10 @@ export default {
     'getAllConcept':'/api/knowledgeman/conceptDetail/index',   //医学术语--获取所有概念（标准术语）
     'getAllBodypart': '/api/knowledgeman/bodypart/getAllBodypart',  //医学术语--获取所有部位
     'getAllDepts': '/api/knowledgeman/medical/getAllDepts',  //医学术语--获取所有科室
-    'getLisMappingPage': '/api/icssman/lisMapping/getLisMappingPage', //医学数据-化验大小项与公表项维护-列表
-    'saveLisMapping': '/api/icssman/lisMapping/saveLisMapping',  //医学数据-化验大小项与公表项维护-新增
-    'delLisMappingById': '/api/icssman/lisMapping/delLisMappingById',  //医学数据-化验大小项与公表项维护-单个删除
-    'delLisMappingByIds': '/api/icssman/lisMapping/delLisMappingByIds', //医学数据-化验大小项与公表项维护-批量删除
-    'modifyLisMapping': '/api/icssman/lisMapping/modifyLisMapping',  //医学数据-化验大小项与公表项维护-修改
-    'hasLisMapping': '/api/icssman/lisMapping/hasLisMapping',  //医学数据-化验大小项与公表项维护-化验公表项映射是否已存在
+    'getLisMappingPage': '/api/knowledgeman/lisMapping/getLisMappingPage', //医学数据-化验大小项与公表项维护-列表
+    'saveLisMapping': '/api/knowledgeman/lisMapping/saveLisMapping',  //医学数据-化验大小项与公表项维护-新增
+    'delLisMappingById': '/api/knowledgeman/lisMapping/delLisMappingById',  //医学数据-化验大小项与公表项维护-单个删除
+    'hasLisMapping': '/api/knowledgeman/lisMapping/hasLisMapping',  //医学数据-化验大小项与公表项维护-化验公表项映射是否已存在
     'getTypeList': 'api/knowledgeman/lexicon/getLexiconList', //术语类型-列表
     'addType': 'api/knowledgeman/lexicon/addLexicon', //术语类型-添加
     'getAllLisConcept':'api/knowledgeman/concept/getAllLisConcept',  //医学数据-化验大小项与公表项维护-获取所有化验公表项

src/api/icss.js

@@ -319,12 +319,6 @@ export default {
     delLisMappingById(param) {  //医学数据-化验大小项与公表项维护-单个删除
         return axios.post(urls.delLisMappingById, param)
     },
-    delLisMappingByIds(param) {  //医学数据-化验大小项与公表项维护-批量删除
-        return axios.post(urls.delLisMappingByIds, param)
-    },
-    modifyLisMapping(param) {  //医学数据-化验大小项与公表项维护-修改
-        return axios.post(urls.modifyLisMapping, param)
-    },
     hasLisMapping(param) {  //医学数据-化验大小项与公表项维护-化验公表项映射是否已存在
         return axios.post(urls.hasLisMapping, param)
     },

src/components/icss/AddChemicalAndCommonMapping.vue

@@ -126,8 +126,11 @@ export default {
             showUniqueNameList: false,
             form: {
                 mealName: '', //大项名称
+                mealId: '', //大项Id
                 itemName: '',   //小项名称
+                itemId: '',     //小项Id
                 uniqueName: '',    //公表名称，必填
+                uniqueId:'' //公表项Id
             },
             saveDisable: false  //保存按钮禁止点击
             
@@ -169,6 +172,9 @@ export default {
                 param.tagType = [1]
                 param.type = 5
             }
+            if(!param.name) {
+                return
+            }
             api.searchTagList(param).then((res) => {
                 if (res.data.code === '0') {
                      if (type == 1) {
@@ -187,6 +193,9 @@ export default {
             const param = {
                 conceptName: this.uniqueText
             }
+            if(!param.conceptName) {
+                return
+            }
             api.getAllLisConcept(param).then((res) => {
                 if(res.data.code === '0') {
                     this.uniqueNameList = res.data.data
@@ -211,29 +220,35 @@ export default {
         },
         selectMealName(item) {
             this.form.mealName = item.name
+            this.form.mealId = item.id
             // this.$refs['mealNameList'].style.display='none'
             this.mealText = ''
             this.mealNameList = []
         },
         selectItemName(item) {
              this.form.itemName = item.name
-            // this.$refs['itemNameList'].style.display='none'
+             this.form.itemId = item.id
             this.itemText = ''
             this.itemNameList = []
         },
         selectUniqueName(item) {
             this.form.uniqueName = item.conceptName
-            let nameArr = item.conceptName.split('--');
-            this.form.mealName = nameArr[0]
-            this.form.itemName = nameArr[1]
+            this.form.uniqueId = item.conceptId
+            //搜索公表项自动填充大小项（目前暂时不需要）
+            // let nameArr = item.conceptName.split('--');
+            // this.form.mealName = nameArr[0]
+            // this.form.itemName = nameArr[1]
             // this.$refs['uniqueNameList'].style.display='none'
             this.uniqueText = ''
             this.uniqueNameList = []
         },
         initForm() {
             this.form.mealName = ''
+            this.form.mealId = ''
             this.form.itemName = ''
+            this.form.itemId = ''
             this.form.uniqueName = ''
+            this.form.uniqueId = ''
         },
         submitForm() {
         const { mealName, itemName, uniqueName } = this.form