#3102 Saving note in encounter screen reverts appointment status
 #3392 Labs displaying incorrect results

finally fixed!
Merge " #3102 Saving note in encounter screen reverts appointment status" into RELEASE_12_1
Merge " #3392 Labs displaying incorrect results" into RELEASE_12_1
 #3435 Lab link produces 505 Error for unmatched patient

switch to use demographicDao.getDemographicById, and check that it's a proper integer