增加添加病人页面，datatimepicker有严重问题，暂时手动输入
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/pages/common/header.jsp