Generalizing Hartree-Fock theory for nonrelativistic atomic ions to yield a ground-state electron density satisfying cusp and asymptotic conditions