Merge branch 'patient_app_services' into 'development'

Add new services to arrival patient

See merge request Cloud_Solution/doctor_app_flutter!376

lib/widgets/patients/profile/profile_medical_info_widget.dart

@@ -79,7 +79,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
             PatientProfileButton(
                 key: key,
                 patient: patient,
-                route: LAB_ORDERS,
+                route: LAB_RESULT,
                 nameLine1: TranslationBase.of(context).lab,
                 nameLine2: TranslationBase.of(context).result,
                 icon: 'patient/lab_results.png'),
@@ -104,7 +104,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
             PatientProfileButton(
                 key: key,
                 patient: patient,
-                route: PATIENT_ADMISSION_REQUEST,
+                route: PATIENT_INSURANCE_APPROVALS_NEW,
                 nameLine1: TranslationBase.of(context).admission,
                 nameLine2: TranslationBase.of(context).request,
                 icon: 'patient/admission_req.png'),
@@ -123,6 +123,13 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
                   nameLine1: TranslationBase.of(context).orders,
                   nameLine2: TranslationBase.of(context).prescription,
                   icon: 'patient/order_prescription.png'),
+          PatientProfileButton(
+              key: key,
+              patient: patient,
+              route: ORDER_PRESCRIPTION_NEW,
+              nameLine1: TranslationBase.of(context).orders,
+              nameLine2: TranslationBase.of(context).prescription,
+              icon: 'patient/order_prescription.png'),
           if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
             PatientProfileButton(
                 key: key,
@@ -159,7 +166,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
             PatientProfileButton(
                 key: key,
                 patient: patient,
-                route: RADIOLOGY,
+                route: RADIOLOGY_PATIENT,
                 nameLine1: TranslationBase.of(context).radiology,
                 nameLine2: TranslationBase.of(context).service,
                 icon: 'patient/health_summary.png'),
@@ -167,7 +174,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
             PatientProfileButton(
                 key: key,
                 patient: patient,
-                route: PATIENT_INSURANCE_APPROVALS,
+                route: PATIENT_INSURANCE_APPROVALS_NEW,
                 nameLine1: TranslationBase.of(context).insurance,
                 nameLine2: TranslationBase.of(context).service,
                 icon: 'patient/vital_signs.png'),

lib/widgets/patients/profile/profile_medical_info_widget_search.dart

@@ -45,7 +45,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
           PatientProfileButton(
               key: key,
               patient: patient,
-              route: LAB_ORDERS,
+              route: LAB_RESULT,
               nameLine1: TranslationBase.of(context).lab,
               nameLine2: TranslationBase.of(context).result,
               icon: 'patient/lab_results.png'),
@@ -69,14 +69,14 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
               ? PatientProfileButton(
                   key: key,
                   patient: patient,
-                  route: ORDER_PRESCRIPTION,
+                  route: ORDER_PRESCRIPTION_NEW,
                   nameLine1: TranslationBase.of(context).orders,
                   nameLine2: TranslationBase.of(context).prescription,
                   icon: 'patient/order_prescription.png')
               : PatientProfileButton(
                   key: key,
                   patient: patient,
-                  route: ORDER_PRESCRIPTION_HISTORY,
+                  route: ORDER_PRESCRIPTION_NEW,
                   nameLine1: TranslationBase.of(context).orders,
                   nameLine2: TranslationBase.of(context).prescription,
                   icon: 'patient/order_prescription.png'),