Signed-off-by: Truong Thi Thuy <thuy.truong@medisoft.vn>
Merge branch 'ThuyTruongDC1' of //172.168.1.10/Sharedata/Lap Trinh/Chung/Git/Medisoftchung.git into bvBinhphuoc
Merge branch 'bvBinhphuoc' of //dc1/sharedata/lap trinh/chung/git/Medisoftchung.git into ThuyTruongDC1