Merge branch 'master' of zhouweihong/esb into master

src/main/webapp/WEB-INF/ehr/jsp/common/indexJs.jsp

@@ -119,8 +119,8 @@
                {id: 94, pid: 9, text: '菜单按钮配置', url: '${contextRoot}/menu/menuAction/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
                {id: 95, pid: 9, text: '数据源配置', url: '${contextRoot}/datasource/configSources', icon: '${staticRoot}/images/index/Ins_icon.png'},
                //质控规则管理
                {id: 8, text: '质控规则管理', icon: '${staticRoot}/images/index/menu5_icon.png'},
                {id: 81, pid: 8, text: '规则管理', url: '${contextRoot}/rule/initial'},
                {id: 8, text: '质控规则管理', icon: '${staticRoot}/images/index/menu05.png'},
                {id: 81, pid: 8, text: '规则管理', url: '${contextRoot}/rule/initial', icon: '${staticRoot}/images/index/Ins_icon.png'},
            ];
            if(userRole=="admin"){