Yeah, if you publish Ah, you should also publish voltage. Then it's just Ah * V = Wh.

…just remember V is a rather complicated function of many parameters instead of some fixed value.