Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services

lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart

@@ -24,6 +24,8 @@ class VitalSignDetailsScreen extends StatelessWidget {
   Widget build(BuildContext context) {
     final routeArgs = ModalRoute.of(context).settings.arguments as Map;
     PatiantInformtion patient = routeArgs['patient'];
+    String patientType = routeArgs['patientType'];
+    String arrivalType = routeArgs['arrivalType'];
     String from = routeArgs['from'];
     String to = routeArgs['to'];
     String imageBasePath = 'assets/images/';

lib/widgets/patients/profile/PatientProfileButton.dart

@@ -12,7 +12,7 @@ class PatientProfileButton extends StatelessWidget {
   final dynamic route;
   final PatiantInformtion patient;
   final String patientType;
-  final String arrivalType;
+  String arrivalType;
   String from;
   String to;
   final String url = "assets/images/";
@@ -116,12 +116,15 @@ class PatientProfileButton extends StatelessWidget {
     if (to == null) {
       to = DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd');
     }
+    if(arrivalType == null){
+      arrivalType = "0";
+    }
     Navigator.of(context).pushNamed(route, arguments: {
       'patient': patient,
       'from': from,
       'to': to,
-      'patient-type': patientType,
-      'arrival-type': arrivalType
+      'patientType': patientType,
+      'arrivalType': arrivalType
     });
   }
 }

lib/widgets/patients/profile/profile_medical_info_widget.dart

@@ -120,7 +120,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
                 patient: patient,
                 patientType: patientType,
                 arrivalType: arrivalType,
-                route: PATIENT_INSURANCE_APPROVALS_NEW,
+                route: PATIENT_ADMISSION_REQUEST,
                 nameLine1: TranslationBase.of(context).admission,
                 nameLine2: TranslationBase.of(context).request,
                 icon: 'patient/admission_req.png'),