sua database

chuyển  thuoc tính bhyt, so bhyt sang table phieukhambenh, sau này có BN
có thay the bhyt minh van luu cai cũ dc
Merge branch 'master' of https://github.com/herokes/Project_BV

Conflicts:
	QLBV_normal/QLBV_normal/MainForm.cs
	QLBV_normal/QLBV_normal/Program.cs
Merge code and fix conflict