Merge branch 'master' of https://github.com/fengye92/HospitalAssist

Conflicts:
	build/classes/struts.xml

structs

增加病人