Are you using Google Chrome? My S7 battery life fell dramatically and I found this solution worked https://productforums.google.com/forum/#!topic/chrome/EJSiLeWiN7Q
I disabled Chrome and switched to Samsung's built-in browser and have had no problems since.