diff --git a/lib/core/viewModels/AlHabibMedicalService/cmc_view_model.dart b/lib/core/viewModels/AlHabibMedicalService/cmc_view_model.dart
index 26f2fe85..0ec33532 100644
--- a/lib/core/viewModels/AlHabibMedicalService/cmc_view_model.dart
+++ b/lib/core/viewModels/AlHabibMedicalService/cmc_view_model.dart
@@ -32,6 +32,8 @@ class CMCViewModel extends BaseViewModel {
 
   PharmacyModuleService _pharmacyModuleService = locator<PharmacyModuleService>();
 
+  GetHHCAllPresOrdersResponseModel pendingOrder;
+
   bool get isOrderUpdated => _cMCService.isOrderUpdated;
 
   Future getCMCAllServices() async {
@@ -64,7 +66,7 @@ class CMCViewModel extends BaseViewModel {
       error = _cMCService.error;
       setState(ViewState.Error);
     } else {
-      var pendingOrder = _cMCService.cmcAllPresOrdersList.firstWhere((element) => element.status == 1 || element.status == 2, orElse: () => null);
+      pendingOrder = _cMCService.cmcAllPresOrdersList.firstWhere((element) => element.status == 1 || element.status == 2, orElse: () => null);
       if (pendingOrder != null) {
         await getOrderDetailByOrderID(pendingOrder);
         setState(ViewState.Idle);
diff --git a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_page.dart b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_page.dart
index 4b6b9b7f..859580ef 100644
--- a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_page.dart
+++ b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_page.dart
@@ -7,6 +7,7 @@ import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
 import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/Dialog/confirm_cancel_order_dialog.dart';
 import 'package:diplomaticquarterapp/uitl/app_toast.dart';
 import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
+import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/uitl/utils.dart';
 import 'package:diplomaticquarterapp/uitl/utils_new.dart';
@@ -35,6 +36,8 @@ class _NewCMCPageState extends State<NewCMCPage> with TickerProviderStateMixin {
 
   CMCInsertPresOrderRequestModel cMCInsertPresOrderRequestModel;
 
+  BuildContext _context;
+
   @override
   void initState() {
     super.initState();
@@ -79,6 +82,7 @@ class _NewCMCPageState extends State<NewCMCPage> with TickerProviderStateMixin {
 
   @override
   Widget build(BuildContext context) {
+    _context = context;
     ProjectViewModel projectViewModel = Provider.of(context);
 
     void showConfirmMessage(CMCViewModel model, GetOrderDetailByOrderIDResponseModel order) {
@@ -88,13 +92,18 @@ class _NewCMCPageState extends State<NewCMCPage> with TickerProviderStateMixin {
             model: model,
             onTap: () async {
               UpdatePresOrderRequestModel updatePresOrderRequestModel = UpdatePresOrderRequestModel(presOrderID: order.presOrderID, rejectionReason: "", presOrderStatus: 4, editedBy: 3);
-              await model.updateCmcPresOrder(updatePresOrderRequestModel);
-              if (model.state == ViewState.ErrorLocal) {
-                Utils.showErrorToast(model.error);
-              } else {
-                AppToast.showSuccessToast(message: TranslationBase.of(context).processDoneSuccessfully);
-                await model.getCmcAllPresOrders();
-              }
+              Future.delayed(new Duration(milliseconds: 300)).then((value) async {
+                GifLoaderDialogUtils.showMyDialog(_context);
+                await model.updateCmcPresOrder(updatePresOrderRequestModel);
+                if (model.state == ViewState.ErrorLocal) {
+                  Utils.showErrorToast(model.error);
+                  GifLoaderDialogUtils.hideDialog(_context);
+                } else {
+                  AppToast.showSuccessToast(message: TranslationBase.of(context).processDoneSuccessfully);
+                  await model.getCmcAllPresOrders();
+                  GifLoaderDialogUtils.hideDialog(_context);
+                }
+              });
             },
           ));
     }
@@ -102,7 +111,7 @@ class _NewCMCPageState extends State<NewCMCPage> with TickerProviderStateMixin {
     return Scaffold(
       body: SafeArea(
         child: Container(
-          child: widget.model.cmcAllOrderDetail.length != 0
+          child: widget.model.cmcAllOrderDetail.length != 0 && widget.model.pendingOrder != null
               ? Column(
                   children: [
                     Container(
@@ -138,9 +147,9 @@ class _NewCMCPageState extends State<NewCMCPage> with TickerProviderStateMixin {
                                   crossAxisAlignment: CrossAxisAlignment.start,
                                   children: [
                                     Text(
-                                      TranslationBase.of(context).OrderStatus +
-                                          ' ' +
-                                          (projectViewModel.isArabic ? widget.model.cmcAllOrderDetail[0].descriptionN : widget.model.cmcAllOrderDetail[0].description),
+                                      // TranslationBase.of(context).OrderStatus +
+                                      //     ' ' +
+                                          (projectViewModel.isArabic ? widget.model.pendingOrder.descriptionN : widget.model.pendingOrder.description),
                                       style: TextStyle(
                                         fontSize: 12,
                                         letterSpacing: -0.48,
@@ -150,7 +159,7 @@ class _NewCMCPageState extends State<NewCMCPage> with TickerProviderStateMixin {
                                     ),
                                     mHeight(12),
                                     Text(
-                                      TranslationBase.of(context).requestID + ' ' + widget.model.cmcAllOrderDetail[0].iD.toString(),
+                                      TranslationBase.of(context).requestID + ' ' + widget.model.pendingOrder.iD.toString(),
                                       style: TextStyle(
                                         fontSize: 16,
                                         letterSpacing: -0.48,
diff --git a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/orders_log_details_page.dart b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/orders_log_details_page.dart
index c88687c2..4de0e61d 100644
--- a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/orders_log_details_page.dart
+++ b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/orders_log_details_page.dart
@@ -5,6 +5,7 @@ import 'package:diplomaticquarterapp/core/viewModels/AlHabibMedicalService/cmc_v
 import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
 import 'package:diplomaticquarterapp/uitl/app_toast.dart';
 import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
+import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/uitl/utils.dart';
 import 'package:diplomaticquarterapp/uitl/utils_new.dart';
@@ -33,13 +34,25 @@ class OrdersLogDetailsPage extends StatelessWidget {
           model: model,
           onTap: () async {
             UpdatePresOrderRequestModel updatePresOrderRequestModel = UpdatePresOrderRequestModel(presOrderID: order.iD, rejectionReason: "", presOrderStatus: 4, editedBy: 3);
-            await model.updateCmcPresOrder(updatePresOrderRequestModel);
-            if (model.state == ViewState.ErrorLocal) {
-              Utils.showErrorToast(model.error);
-            } else {
-              AppToast.showSuccessToast(message: TranslationBase.of(context).processDoneSuccessfully);
-              await model.getCmcAllPresOrders();
-            }
+            Future.delayed(new Duration(milliseconds: 300)).then((value) async {
+              GifLoaderDialogUtils.showMyDialog(context);
+              await model.updateCmcPresOrder(updatePresOrderRequestModel);
+              if (model.state == ViewState.ErrorLocal) {
+                Utils.showErrorToast(model.error);
+                GifLoaderDialogUtils.hideDialog(context);
+              } else {
+                AppToast.showSuccessToast(message: TranslationBase.of(context).processDoneSuccessfully);
+                await model.getCmcAllPresOrders();
+                GifLoaderDialogUtils.hideDialog(context);
+              }
+            });
+            // await model.updateCmcPresOrder(updatePresOrderRequestModel);
+            // if (model.state == ViewState.ErrorLocal) {
+            //   Utils.showErrorToast(model.error);
+            // } else {
+            //   AppToast.showSuccessToast(message: TranslationBase.of(context).processDoneSuccessfully);
+            //   await model.getCmcAllPresOrders();
+            // }
           },
         ),
       );
@@ -120,7 +133,7 @@ class OrdersLogDetailsPage extends StatelessWidget {
                             crossAxisAlignment: CrossAxisAlignment.start,
                             children: [
                               Text(
-                                TranslationBase.of(context).serviceName + ": ",
+                                TranslationBase.of(context).hospital + ": ",
                                 style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff575757), letterSpacing: -0.4, height: 16 / 10),
                               ),
                               Expanded(
@@ -139,7 +152,7 @@ class OrdersLogDetailsPage extends StatelessWidget {
                       crossAxisAlignment: CrossAxisAlignment.end,
                       children: [
                         Text(
-                          DateUtil.formatDateToDate(DateUtil.convertStringToDate(order.createdOn), projectViewModel.isArabic),
+                          DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(order.createdOn)),
                           style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.4, height: 16 / 10),
                         ),
                         SizedBox(height: 12),