An improved evaluation of the neutron background in the PandaX-II experiment