These are two closely related disciplines. Qi Gong is gentler and focuses more on health than on martial arts.