diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 1cf7499c..36b1d789 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1,9 +1,8 @@
 PODS:
   - Alamofire (4.9.1)
-  - barcode_scan (0.0.1):
+  - barcode_scan_fix (0.0.1):
     - Flutter
     - MTBBarcodeScanner
-    - SwiftProtobuf
   - connectivity (0.0.1):
     - Flutter
     - Reachability
@@ -120,7 +119,6 @@ PODS:
   - speech_to_text (0.0.1):
     - Flutter
     - Try
-  - SwiftProtobuf (1.9.0)
   - Try (2.1.1)
   - url_launcher (0.0.1):
     - Flutter
@@ -143,7 +141,7 @@ PODS:
 
 DEPENDENCIES:
   - Alamofire
-  - barcode_scan (from `.symlinks/plugins/barcode_scan/ios`)
+  - barcode_scan_fix (from `.symlinks/plugins/barcode_scan_fix/ios`)
   - connectivity (from `.symlinks/plugins/connectivity/ios`)
   - connectivity_for_web (from `.symlinks/plugins/connectivity_for_web/ios`)
   - connectivity_macos (from `.symlinks/plugins/connectivity_macos/ios`)
@@ -197,12 +195,11 @@ SPEC REPOS:
     - PromisesObjC
     - Protobuf
     - Reachability
-    - SwiftProtobuf
     - Try
 
 EXTERNAL SOURCES:
-  barcode_scan:
-    :path: ".symlinks/plugins/barcode_scan/ios"
+  barcode_scan_fix:
+    :path: ".symlinks/plugins/barcode_scan_fix/ios"
   connectivity:
     :path: ".symlinks/plugins/connectivity/ios"
   connectivity_for_web:
@@ -274,7 +271,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Alamofire: 85e8a02c69d6020a0d734f6054870d7ecb75cf18
-  barcode_scan: a5c27959edfafaa0c771905bad0b29d6d39e4479
+  barcode_scan_fix: 80dd65de55f27eec6591dd077c8b85f2b79e31f1
   connectivity: c4130b2985d4ef6fd26f9702e886bd5260681467
   connectivity_for_web: 2b8584556930d4bd490d82b836bcf45067ce345b
   connectivity_macos: e2e9731b6b22dda39eb1b128f6969d574460e191
@@ -314,7 +311,6 @@ SPEC CHECKSUMS:
   shared_preferences_web: 141cce0c3ed1a1c5bf2a0e44f52d31eeb66e5ea9
   shared_preferences_windows: 36b76d6f54e76ead957e60b49e2f124b4cd3e6ae
   speech_to_text: b43a7d99aef037bd758ed8e45d79bbac035d2dfe
-  SwiftProtobuf: ecbec1be9036d15655f6b3443a1c4ea693c97932
   Try: 5ef669ae832617b3cee58cb2c6f99fb767a4ff96
   url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
   url_launcher_linux: ac237cb7a8058736e4aae38bdbcc748a4b394cc0
@@ -326,6 +322,6 @@ SPEC CHECKSUMS:
   wakelock: 0d4a70faf8950410735e3f61fb15d517c8a6efc4
   webview_flutter: d2b4d6c66968ad042ad94cbb791f5b72b4678a96
 
-PODFILE CHECKSUM: 649616dc336b3659ac6b2b25159d8e488e042b69
+PODFILE CHECKSUM: 5f91ea96209042b96bea7a44ccf0e6e790de38a2
 
-COCOAPODS: 1.10.0.rc.1
+COCOAPODS: 1.10.1
diff --git a/lib/config/config.dart b/lib/config/config.dart
index 0283577e..c8af8ad9 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -5,8 +5,8 @@ const ONLY_NUMBERS = "[0-9]";
 const ONLY_LETTERS = "[a-zA-Z &'\"]";
 const ONLY_DATE = "[0-9/]";
 const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/';
-// const BASE_URL = 'https://hmgwebservices.com/';
-const BASE_URL = 'https://uat.hmgwebservices.com/';
+const BASE_URL = 'https://hmgwebservices.com/';
+// const BASE_URL = 'https://uat.hmgwebservices.com/';
 const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region_enh";
 const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList";
 const PATIENT_PROGRESS_NOTE_URL = "Services/DoctorApplication.svc/REST/GetProgressNoteForInPatient";
diff --git a/lib/models/patient/patiant_info_model.dart b/lib/models/patient/patiant_info_model.dart
index 09282644..71d46dc9 100644
--- a/lib/models/patient/patiant_info_model.dart
+++ b/lib/models/patient/patiant_info_model.dart
@@ -224,11 +224,10 @@ class PatiantInformtion {
         isSigned: json['isSigned'],
         medicationOrders: json['medicationOrders'],
         nationality: json['nationality'] ?? json['NationalityNameN'],
-        patientMRN: json['patientMRN'] ?? json['PatientMRN']??json["PatientID"] != null
-            ? json["PatientID"] is String
-            ? int.parse(json["PatientID"])
-            : json["PatientID"]
-            : json["patientID"],
+        patientMRN: json['patientMRN'] ?? json['PatientMRN']?? (
+            json["PatientID"] != null ?
+        int.parse(json["PatientID"].toString())
+            : int.parse(json["patientID"].toString())),
         visitType: json['visitType'] ?? json['visitType'] ?? json['visitType'],
         nationalityFlagURL:
             json['NationalityFlagURL'] ?? json['NationalityFlagURL'],