选择部门
Merge branch 'master' of github.com:hezejiang/EHR

Conflicts:
	DALFactory/obj/Debug/DALFactory.csproj.FileListAbsolute.txt
	IDAL/obj/Debug/IDAL.csproj.FileListAbsolute.txt
	SQLServerDAL/obj/Debug/SQLServerDAL.csproj.FileListAbsolute.txt
	Web/Manager/Log/20130608AppErrorLog.txt
	Web/Web.csproj
	Web/obj/Debug/Web.csproj.FileListAbsolute.txt