diff --git a/lib/config/config.dart b/lib/config/config.dart index 5013e201..9e85e44b 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -21,8 +21,8 @@ var PACKAGES_ORDERS = '/api/orders'; var PACKAGES_ORDER_HISTORY = '/api/orders/items'; var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara'; // var BASE_URL = 'http://10.50.100.198:2018/'; - // var BASE_URL = 'https://uat.hmgwebservices.com/'; -var BASE_URL = 'https://hmgwebservices.com/'; + var BASE_URL = 'https://uat.hmgwebservices.com/'; +// var BASE_URL = 'https://hmgwebservices.com/'; // var BASE_URL = 'https://orash.cloudsolutions.com.sa/'; // var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/'; // var BASE_URL = 'https://vidamergeuat.cloudsolutions.com.sa/'; diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 741800a5..b62653f8 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -2118,4 +2118,5 @@ const Map localizedValues = { "لقد قرأت وفهمت وأوافق على الشروط والأحكام المبينة أعلاه وأوافق على الإلتزام بالمتطلبات المذكورة تجاه المستشفى ، لقد قرأت التفاصيل المبينة في نموذج التسجيل الخاص بي وأقر بأنها صحيحة. أنا الموقع ادناه أقر بأنه أتيحت لي الفرصة لطرح الأسئلة والتحفظات بشأن هذه الموافقة، وتلقيت إجابات مرضية على جميع إستفساراتي." }, "incorrectNationalId": {"en": "Incorrect National ID", "ar": "رقم الهوية غير صحيحة"}, + "labResultFlag": {"en": "Flag", "ar": "Flag"}, }; diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart index 0ec508a0..68593a1c 100644 --- a/lib/core/service/client/base_app_client.dart +++ b/lib/core/service/client/base_app_client.dart @@ -184,8 +184,8 @@ class BaseAppClient { // body['IdentificationNo'] = 1023854217; // body['MobileNo'] = "531940021"; //0560717232 - // body['PatientID'] = 1231755; //4609100 - // body['TokenID'] = "@dm!n"; + body['PatientID'] = 1231755; //4609100 + body['TokenID'] = "@dm!n"; // Patient ID: 3027574 // Mobile no.: 0502303285 diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index d9fec44b..c7d32011 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -3022,6 +3022,7 @@ class TranslationBase { String get generalConsentSubTitle => localizedValues["generalConsentSubTitle"][locale.languageCode]; String get incorrectNationalId => localizedValues["incorrectNationalId"][locale.languageCode]; String get resultStatus => localizedValues["resultStatus"][locale.languageCode]; + String get labResultFlag => localizedValues["labResultFlag"][locale.languageCode]; } class TranslationBaseDelegate extends LocalizationsDelegate { diff --git a/lib/widgets/data_display/medical/LabResult/LabResultWidget.dart b/lib/widgets/data_display/medical/LabResult/LabResultWidget.dart index 1bf7f045..019aafae 100644 --- a/lib/widgets/data_display/medical/LabResult/LabResultWidget.dart +++ b/lib/widgets/data_display/medical/LabResult/LabResultWidget.dart @@ -160,7 +160,8 @@ class LabResultWidget extends StatelessWidget { children: [ Utils.tableColumnTitle(TranslationBase.of(context).description, showDivider: false), Utils.tableColumnTitle(TranslationBase.of(context).value, showDivider: false), - Utils.tableColumnTitle(TranslationBase.of(context).unit, showDivider: false), + // Utils.tableColumnTitle(TranslationBase.of(context).unit, showDivider: false), + Utils.tableColumnTitle(TranslationBase.of(context).labResultFlag, showDivider: false), Utils.tableColumnTitle(TranslationBase.of(context).range, showDivider: false), ], ), @@ -187,7 +188,11 @@ class LabResultWidget extends StatelessWidget { ), Utils.tableColumnValue(labResultList[i].resultValue! + " " + labResultList[i].uOM!, isHighLow: (labResultList[i].resultValueFlag!.toLowerCase() == "h" || labResultList[i].resultValueFlag!.toLowerCase() == "l"), isLast: true, mProjectViewModel: projectViewModel), - Utils.tableColumnValue(labResultList[i].uOM!, isLast: true, isCapitable: false, mProjectViewModel: projectViewModel), + Utils.tableColumnValue(labResultList[i].resultValueFlag!, + isHighLow: (labResultList[i].resultValueFlag!.toLowerCase() == "h" || labResultList[i].resultValueFlag!.toLowerCase() == "l"), + isLast: true, + isCapitable: false, + mProjectViewModel: projectViewModel), !checkIfCovidLab(patientLabResultList!) ? InkWell( onTap: () { diff --git a/lib/widgets/data_display/medical/doctor_card.dart b/lib/widgets/data_display/medical/doctor_card.dart index 05cc66c6..ceddea82 100644 --- a/lib/widgets/data_display/medical/doctor_card.dart +++ b/lib/widgets/data_display/medical/doctor_card.dart @@ -245,8 +245,8 @@ class DoctorCard extends StatelessWidget { ), ], ), - if (isLabOrderResult) - MyRichText(TranslationBase.of(context).resultStatus, resultStatusDesc ?? "", projectViewModel.isArabic, valueColor: getResultStatusColor(resultStatus!)), + // if (isLabOrderResult) + // MyRichText(TranslationBase.of(context).resultStatus, resultStatusDesc ?? "", projectViewModel.isArabic, valueColor: getResultStatusColor(resultStatus!)), ], ), ),