Depends how you count it,
and there are different approaches to this matter tho.
Main thing it to know what to play when someone ask you for a chord,
it doesn't matter a lot the way you're explaining it to yourself,
as long as it's working of course.
For me it;s easy to go like this when it comes to 7th,
minor 7th,major 7th,b7 would be diminished and #7 is sharp one of course.
But this is just when talking about pure intervals,
inside of chords it doesn't look like this,b7 means minor 7th etc.