diff --git a/lib/config/config.dart b/lib/config/config.dart
index d1fbb48e..5ab2c668 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -20,13 +20,13 @@ var PACKAGES_ORDERS = '/api/orders';
 var PACKAGES_ORDER_HISTORY = '/api/orders/items';
 var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara';
  // var  BASE_URL = 'http://10.50.100.198:2018/';
- // var  BASE_URL = 'https://uat.hmgwebservices.com/';
+ var  BASE_URL = 'https://uat.hmgwebservices.com/';
 // var BASE_URL = 'https://hmgwebservices.com/';
 // var BASE_URL = 'https://orash.cloudsolutions.com.sa/';
 // var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/';
 // var BASE_URL = 'https://vidamergeuat.cloudsolutions.com.sa/';
 
-var BASE_URL = 'https://webservices.hmg.com/';
+// var BASE_URL = 'https://webservices.hmg.com/';
 
 // var BASE_URL = 'http://10.50.100.198:4422/';
 
diff --git a/lib/pages/BookAppointment/BookConfirm.dart b/lib/pages/BookAppointment/BookConfirm.dart
index 50dbc70f..42a12f5e 100644
--- a/lib/pages/BookAppointment/BookConfirm.dart
+++ b/lib/pages/BookAppointment/BookConfirm.dart
@@ -446,8 +446,9 @@ class _BookConfirmState extends State<BookConfirm> {
     widget.service.getPatientShare(appointmentNo, clinicID, projectID, context).then((res) {
       projectViewModel.selectedBodyPartList.clear();
       projectViewModel.laserSelectionDuration = 0;
-      print(res);
-      widget.patientShareResponse = new PatientShareResponse.fromJson(res['OnlineCheckInAppointments'][0]);
+      if(res['OnlineCheckInAppointments'].length != 0) {
+        widget.patientShareResponse = new PatientShareResponse.fromJson(res['OnlineCheckInAppointments'][0]);
+      }
 
       isInsured = res["IsInsured"];
       isEligible = res["IsEligible"];
diff --git a/lib/pages/BookAppointment/QRCode.dart b/lib/pages/BookAppointment/QRCode.dart
index ad676eff..e9d88d7b 100644
--- a/lib/pages/BookAppointment/QRCode.dart
+++ b/lib/pages/BookAppointment/QRCode.dart
@@ -3,6 +3,7 @@ import 'dart:typed_data';
 import 'package:barcode_scan2/barcode_scan2.dart';
 import 'package:diplomaticquarterapp/analytics/google-analytics.dart';
 import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
+import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
 import 'package:diplomaticquarterapp/locator.dart';
 import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart';
 import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart';
@@ -27,6 +28,7 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_nfc_kit/flutter_nfc_kit.dart';
 import 'package:flutter_svg/flutter_svg.dart';
+import 'package:provider/provider.dart';
 
 class QRCode extends StatefulWidget {
   PatientShareResponse patientShareResponse;
@@ -46,6 +48,8 @@ class _QRCodeState extends State<QRCode> {
   bool _supportsNFC = false;
   BuildContext _context;
 
+  ProjectViewModel projectViewModel;
+
   @override
   void initState() {
     // TODO: implement initState
@@ -88,6 +92,7 @@ class _QRCodeState extends State<QRCode> {
 
   @override
   Widget build(BuildContext context) {
+    projectViewModel = Provider.of(context);
     _context = context;
     List<Widget> checkInOptionsList = getCheckInOptionsList(context);
     return AppScaffold(
@@ -190,13 +195,15 @@ class _QRCodeState extends State<QRCode> {
     optionsList.add(
       InkWell(
         onTap: () {
-          startNFCScan();
+          if (projectViewModel.havePrivilege(80)) {
+            startNFCScan();
+          }
         },
         child: MedicalProfileItem(
           title: TranslationBase.of(context).scanNFC,
           imagePath: 'contactless.svg',
           subTitle: "",
-          isEnable: true,
+          isEnable: projectViewModel.havePrivilege(80),
           width: 80.0,
           height: 80.0,
         ),
@@ -206,13 +213,15 @@ class _QRCodeState extends State<QRCode> {
     optionsList.add(
       InkWell(
         onTap: () {
-          startQRCodeScan();
+          if (projectViewModel.havePrivilege(79)) {
+            startQRCodeScan();
+          }
         },
         child: MedicalProfileItem(
           title: TranslationBase.of(context).pharmaLiveCareScanQR,
           imagePath: 'qr_code.svg',
           subTitle: "",
-          isEnable: true,
+          isEnable: projectViewModel.havePrivilege(79),
           width: 80.0,
           height: 80.0,
         ),