修复一些Bug
修改部分bug
Merge branch 'master' of https://github.com/locrch/Healthe.git

Conflicts:
	res/layout/history_content.xml
更新