测试 忽略ignored
生命体征界面和时间查询按钮
Merge remote-tracking branch 'whl/master'
停医嘱点击
Merge branch 'master' of https://github.com/81813780/Hospital.git
再测试
Merge branch 'master' of https://github.com/81813780/Hospital.git

Conflicts:
	bin/Hospital.apk
	bin/classes.dex
	bin/resources.ap_