encounter performed discharge disposition moved to cda importer, tests added