Merge branch 'soap_update' into 'development'

hot fix

See merge request Cloud_Solution/doctor_app_flutter!226

lib/widgets/patients/profile/soap_update/subjective/update_allergies_widget.dart

@@ -171,13 +171,13 @@ class _UpdateAllergiesWidgetState extends State<UpdateAllergiesWidget> {
                       mySelectedAllergy.selectedAllergySeverity;
                   allergy.first.remark = mySelectedAllergy.remark;
                   allergy.first.isChecked = mySelectedAllergy.isChecked;
+                  Navigator.of(context).pop();
 
                   // helpers.showErrorToast(TranslationBase
                   //     .of(context)
                   //     .itemExist);
                 }
 
-                Navigator.of(context).pop();
               });
             },);
         });