diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index d27f698c..231e7f9b 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -932,7 +932,7 @@ const Map> localizedValues = { "ar": "تقدم بطلب جديد للمختبر الأشعة" }, "addLabOrder": {"en": "Add Lab Order", "ar": "إضافة طلب معمل"}, - "addRadiologyOrder": {"en": "Add Radiology Order", "ar": "إضافة اشغة"}, + "addRadiologyOrder": {"en": "Add Radiology Order", "ar": "إضافة اشعة"}, "newRadiologyOrder": {"en": "New Radiology Order", "ar": "طلب الأشعة الجديد"}, "orderDate": {"en": "Order Date", "ar": "تاريخ الطلب"}, "examType": {"en": "Exam Type", "ar": "نوع الفحص"}, diff --git a/lib/screens/patients/profile/lab_result/laboratory_result_page.dart b/lib/screens/patients/profile/lab_result/laboratory_result_page.dart index 3aae6e69..5f79038f 100644 --- a/lib/screens/patients/profile/lab_result/laboratory_result_page.dart +++ b/lib/screens/patients/profile/lab_result/laboratory_result_page.dart @@ -14,13 +14,15 @@ class LaboratoryResultPage extends StatefulWidget { final PatiantInformtion patient; final String patientType; final String arrivalType; + final bool isInpatient; LaboratoryResultPage( {Key key, this.patientLabOrders, this.patient, this.patientType, - this.arrivalType}); + this.arrivalType, + this.isInpatient}); @override _LaboratoryResultPageState createState() => _LaboratoryResultPageState(); @@ -40,7 +42,7 @@ class _LaboratoryResultPageState extends State { onModelReady: (model) => model.getPatientLabResult( patientLabOrder: widget.patientLabOrders, patient: widget.patient, - isInpatient: widget.patientType =="1"), + isInpatient: true), builder: (_, model, w) => AppScaffold( isShowAppBar: true, appBar: PatientProfileHeaderWhitAppointmentAppBar( @@ -64,9 +66,9 @@ class _LaboratoryResultPageState extends State { LaboratoryResultWidget( onTap: () async {}, billNo: widget.patientLabOrders.invoiceNo, - details: model - .patientLabSpecialResult.length > 0 ? model - .patientLabSpecialResult[0].resultDataHTML : null, + details: model.patientLabSpecialResult.length > 0 + ? model.patientLabSpecialResult[0].resultDataHTML + : null, orderNo: widget.patientLabOrders.orderNo, patientLabOrder: widget.patientLabOrders, patient: widget.patient, diff --git a/lib/screens/patients/profile/lab_result/labs_home_page.dart b/lib/screens/patients/profile/lab_result/labs_home_page.dart index 1ebc4fd3..578e9f17 100644 --- a/lib/screens/patients/profile/lab_result/labs_home_page.dart +++ b/lib/screens/patients/profile/lab_result/labs_home_page.dart @@ -181,9 +181,9 @@ class _LabsHomePageState extends State { context, FadePage( page: LaboratoryResultPage( - patientLabOrders: - model.patientLabOrdersList[index], + patientLabOrders: model.patientLabOrdersList[index], patient: patient, + isInpatient:isInpatient, arrivalType: arrivalType, patientType: patientType, ), diff --git a/lib/screens/procedures/add_radiology_screen.dart b/lib/screens/procedures/add_radiology_screen.dart index ac21e7d9..26308553 100644 --- a/lib/screens/procedures/add_radiology_screen.dart +++ b/lib/screens/procedures/add_radiology_screen.dart @@ -77,7 +77,7 @@ class _AddRadiologyScreenState extends State mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ AppText( - TranslationBase.of(context).addLabOrder, + TranslationBase.of(context).addRadiologyOrder, fontWeight: FontWeight.w700, fontSize: 20, ), @@ -147,8 +147,8 @@ class _AddRadiologyScreenState extends State AddFavouriteProcedure( patient: patient, model: model, - addButtonTitle: TranslationBase.of(context).addLabOrder, - toolbarTitle: TranslationBase.of(context).applyForNewLabOrder, + addButtonTitle: TranslationBase.of(context).addRadiologyOrder, + toolbarTitle: TranslationBase.of(context).addRadiologyOrder, categoryID: "03", ), AddSelectedRadiologyOrder(