merge with abdala changes
1.auto management bug(updatePatientData)