整合代码
Merge branch 'master' of https://github.com/zhouda-genee/project

Conflicts:
	GeneeWebFrameWork/WebContent/WEB-INF/jsp/statistics/result/search-result.jsp
	GeneeWebFrameWork/WebContent/js/statistics/eqindex-table.js