new feature fixed #172:
1.remove unnecessary function
2.add subtotal line
Merge branch 'master' of github.com:oscaremr/oscar