[ORB-234] patient id consistency changes
Merge branch 'release/orbis-r2' of github.com:openeyes/OphCiPatientadmission into release/orbis-r2