合并小超分支并解决冲突

Squashed commit of the following:

commit 434236d1aba57d1ee7cd14349cf47c1816ff5fca
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Mon Apr 8 09:53:05 2019 +0800

    医学术语科室接口

commit 69b1a8e26a243d3234e931f5e725155a8fc3aa8d
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Mon Apr 8 09:45:53 2019 +0800

    修改医学术语维护接口地址

commit 540db5eac6f23111dfc7ff181f1448b4ef5fb990
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Apr 4 17:14:26 2019 +0800

    修改年龄为空判断条件

commit f05056016ca670cad4854747f9f9d4e5224d2bf3
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu Apr 4 16:51:27 2019 +0800

    修改的时候不调科室列表接口

# Conflicts:
#	src/api/icss.js

src/api/config.js

@@ -146,7 +146,7 @@ export default {
     'getVersionDetlInfo': 'api/icssman/versionDetail/getDetailById', //版本信息-版本说明列表获取
     'promptServer':'/api/icssman/file/uploadImage',    //静态知识
     /**************医学术语维护****************/
-	  'saveConceptInfo':'/api/knowledgeman/libraryDetail/addLibraryDetail',   //保存术语静态知识
+	'saveConceptInfo':'/api/knowledgeman/libraryDetail/addLibraryDetail',   //保存术语静态知识
     'delConceptInfo':'/api/knowledgeman/libraryDetail/removeLibraryDetail',   //删除术语静态知识
     'knowledgeName': 'api/knowledgeman/concept/getAllInformation', //医学术语-命名维护
     'knowledgeUpload': 'api/knowledgeman/concept/conceptInfoExcelIm', //医学术语-命名维护-导入
@@ -174,6 +174,8 @@ export default {
     'delLisMappingById': '/api/icssman/lisMapping/delLisMappingById',  //医学数据-化验大小项与公表项维护-单个删除
     'delLisMappingByIds': '/api/icssman/lisMapping/delLisMappingByIds', //医学数据-化验大小项与公表项维护-批量删除
     'modifyLisMapping': '/api/icssman/lisMapping/modifyLisMapping',  //医学数据-化验大小项与公表项维护-修改
+    'getTypeList': 'api/knowledgeman/lexicon/getLexiconList', //术语类型-列表
+    'addType': 'api/knowledgeman/lexicon/addLexicon', //术语类型-添加
 	},
 	menuIconList: { //菜单对应图标
 		'YH-KZT': 'el-icon-menu',

src/api/icss.js

@@ -276,6 +276,24 @@ export default {
     },
     getAllBodypart(param) {
         return axios.post(urls.getAllBodypart, param)
+    },
+    getAllDepts(param) {
+        return axios.post(urls.getAllDepts, param)
+    },
+    getLisMappingPage(param) {  //医学数据-化验大小项与公表项维护-列表
+        return axios.post(urls.getLisMappingPage, param)
+    },
+    addLisMapping(param) {  //医学数据-化验大小项与公表项维护-新增
+        return axios.post(urls.addLisMapping, param)
+    },
+    delLisMappingById(param) {  //医学数据-化验大小项与公表项维护-单个删除
+        return axios.post(urls.delLisMappingById, param)
+    },
+    delLisMappingByIds(param) {  //医学数据-化验大小项与公表项维护-批量删除
+        return axios.post(urls.delLisMappingByIds, param)
+    },
+    modifyLisMapping(param) {  //医学数据-化验大小项与公表项维护-修改
+        return axios.post(urls.modifyLisMapping, param)
     },
 	getTypeList(param) {//术语类型-列表
         return axios.post(urls.getTypeList, param)
@@ -283,4 +301,5 @@ export default {
     addType(param) {//术语类型-添加
         return axios.post(urls.addType, param)
     },
+
 }