utsab, rnjn | BDSHR-219 | Refactoring patient and encounter uploads