diff --git a/lib/client/base_app_client.dart b/lib/client/base_app_client.dart
index 13ab8182..9ac88f57 100755
--- a/lib/client/base_app_client.dart
+++ b/lib/client/base_app_client.dart
@@ -125,7 +125,7 @@ class BaseAppClient {
       // body['ProjectID'] = 12;
 
       // body['DoctorID'] = 1002; //3844083
-      // body['TokenID'] = "@dm!n";
+      // body?['TokenID'] = "@dm!n";
 
       // print("ProjectID :");
       // print(body['ProjectID']);
diff --git a/lib/config/config.dart b/lib/config/config.dart
index d9aa00ce..3de81f76 100755
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -9,13 +9,13 @@ const ONLY_DATE = "[0-9/]";
 
 const DOCTOR_ROTATION = 'https://doctorrota.hmg.com/';
 
-const BASE_URL = 'https://hmgwebservices.com/';
+// const BASE_URL = 'https://hmgwebservices.com/';
 // const BASE_URL = 'http://10.20.200.111:1010/';
 // const BASE_URL = 'https://uat.hmgwebservices.com/';
 
 // const BASE_URL = 'https://hmgwebservices.com/';
 
-// const BASE_URL = 'https://uat.hmgwebservices.com/';
+const BASE_URL = 'https://uat.hmgwebservices.com/';
 
 // const BASE_URL = 'https://webservices.hmg.com/';
 //
diff --git a/lib/screens/prescription/new_prescriptions_page.dart b/lib/screens/prescription/new_prescriptions_page.dart
index c69d50f6..de1eaac0 100644
--- a/lib/screens/prescription/new_prescriptions_page.dart
+++ b/lib/screens/prescription/new_prescriptions_page.dart
@@ -114,7 +114,7 @@ class NewPrescriptionsPage extends StatelessWidget {
                                     ),
                                     CustomRow(
                                       label: TranslationBase.of(context).orderTypeDescription + ': ', //"Order Type Description :",
-                                      value: model.prescriptionListNew[index].orderTypeDescription,
+                                      value: model.prescriptionListNew[index].orderTypeDescription ?? "",
                                     ),
                                     CustomRow(
                                       label: TranslationBase.of(context).status + ': ',
diff --git a/pubspec.yaml b/pubspec.yaml
index 0ea3a0c8..b1cd01fa 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -11,7 +11,7 @@ description: A new Flutter project.
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.4.26+1
+version: 1.4.28+39
 
 
 environment: