Revert "be refactering mapHinshi?"

This reverts commit cb1cb76edcd3f24fb17cccf2be31f98076c1ce0e.