The federal government has struck a deal over public hospital funding with the states committing an extra $25 billion in federal spending over five years.