hot fixes

lib/config/config.dart

@@ -4,8 +4,8 @@ const MAX_SMALL_SCREEN = 660;
 const ONLY_NUMBERS = "[0-9]";
 const ONLY_LETTERS = "[a-zA-Z &'\"]";
 const ONLY_DATE = "[0-9/]";
-// 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 =

lib/core/service/patient-vital-signs-service.dart

@@ -42,7 +42,7 @@ class VitalSignsService extends BaseService {
     hasError = false;
     Map<String, dynamic> body = Map();
     body['PatientMRN'] = patient.patientId; // patient.patientMRN
-    body['AppointmentNo'] = patient.appointmentNo;
+   // body['AppointmentNo'] = patient.appointmentNo;
     // body['EpisodeID'] = patient.episodeNo;
     body['PatientTypeID'] = 1;
     body['PatientType'] = 1;

lib/screens/patients/insurance_approval_screen_patient.dart

@@ -1,6 +1,7 @@
 import 'package:doctor_app_flutter/config/size_config.dart';
 import 'package:doctor_app_flutter/core/viewModel/InsuranceViewModel.dart';
 import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
+import 'package:doctor_app_flutter/util/date-utils.dart';
 import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
 import 'package:doctor_app_flutter/widgets/shared/Text.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
@@ -236,7 +237,7 @@ class _InsuranceApprovalScreenNewState extends State<InsuranceApprovalScreenNew>
 
                                             ),
                                             Texts(
-                                              convertDateFormat(model.insuranceApproval[index].rceiptOn),
+                                              DateUtils.getDateTimeFromServerFormat(model.insuranceApproval[index].rceiptOn).toString(),
                                               fontSize: 17.5,
                                               fontWeight: FontWeight.w600,
 
@@ -257,7 +258,7 @@ class _InsuranceApprovalScreenNewState extends State<InsuranceApprovalScreenNew>
 
                                             ),
                                             Texts(
-                                              convertDateFormat(model.insuranceApproval[index].expiryDate),
+                                              DateUtils.getDateTimeFromServerFormat(model.insuranceApproval[index].expiryDate).toString(),
                                               fontSize: 17.5,
                                               fontWeight: FontWeight.w600,
 

lib/screens/patients/profile/radiology/radiology_details_page.dart

@@ -56,15 +56,16 @@ class RadiologyDetailsPage extends StatelessWidget {
           bottomSheet: Container(
             width: double.infinity,
             height: MediaQuery.of(context).size.height * 0.14,
-            color: Colors.grey[100],
+          //  color: Colors.grey[100],
             child: Column(
               mainAxisSize: MainAxisSize.min,
               children: <Widget>[
                 Divider(),
-                if (finalRadiology.dIAPACSURL != "")
+                if (model.radImageURL.isNotEmpty)
                   Container(
                     width: MediaQuery.of(context).size.width * 0.8,
                     child: Button(
+
                       onTap: () {
                         launch(model.radImageURL);
                       },

lib/util/date-utils.dart

@@ -19,16 +19,21 @@ class DateUtils {
   }
 
   static DateTime getDateTimeFromServerFormat(String str) {
-    const start = "/Date(";
+    DateTime date= DateTime.now();
+    if (str!=null) {
+      const start = "/Date(";
 
-    const end = "+0300)";
+      const end = "+0300)";
 
-    final startIndex = str.indexOf(start);
+      final startIndex = str.indexOf(start);
 
-    final endIndex = str.indexOf(end, startIndex + start.length);
+      final endIndex = str.indexOf(end, startIndex + start.length);
 
-    var date = new DateTime.fromMillisecondsSinceEpoch(
-        int.parse(str.substring(startIndex + start.length, endIndex)));
+       date = new DateTime.fromMillisecondsSinceEpoch(
+              int.parse(str.substring(startIndex + start.length, endIndex)));
+    } else {
+   date = DateTime.now();
+    }
 
     return date;
   }