State Senate agrees to House substitute bill on medical cannabis oil