Merge branch 'master' into Main_App_Replacement

# Conflicts:
#	lib/core/app_state.dart

lib/core/utils/date_util.dart

@@ -28,21 +28,21 @@ class DateUtil {
       const end = "+0300)";
       final startIndex = date.indexOf(start);
       final endIndex = date.indexOf(end, startIndex + start.length);
-      if (projectId == 2 || projectId == 3) {
-        return DateTime.fromMillisecondsSinceEpoch(
-                int.parse(
-                  date.substring(startIndex + start.length, endIndex),
-                ),
-                isUtc: true)
-            .add(Duration(hours: 4));
-      } else {
-        return DateTime.fromMillisecondsSinceEpoch(
+      // if (projectId == 2 || projectId == 3 || projectId == 4) {
+      //   return DateTime.fromMillisecondsSinceEpoch(
+      //           int.parse(
+      //             date.substring(startIndex + start.length, endIndex),
+      //           ),
+      //           isUtc: true)
+      //       .add(Duration(hours: 4));
+      // } else {
+      return DateTime.fromMillisecondsSinceEpoch(
               int.parse(
                 date.substring(startIndex + start.length, endIndex),
               ),
               isUtc: true)
           .add(Duration(hours: 3));
-      }
+      // }
     } else {
       return DateTime.now();
     }

lib/features/lab/lab_view_model.dart

@@ -363,6 +363,7 @@ class LabViewModel extends ChangeNotifier {
             labOrder.doctorName = doctorName;
             labOrder.projectName = projectName;
             labOrder.orderDate = appointmentDate;
+            // labOrder.testDetails = apiResponse.data;
 
             currentlySelectedPatientOrder = labOrder;
 
@@ -881,8 +882,9 @@ class LabViewModel extends ChangeNotifier {
     List<Map<String, dynamic>> results = [];
     Map<String, dynamic> orderData = {"order_date": labOrder.orderDate ?? "", "clinic": labOrder.clinicDescription ?? "", "doctor": labOrder.doctorName ?? "", "results": []};
     List<Map<String, dynamic>> testResults = [];
-    if (labOrder.testDetails != null && labOrder.testDetails!.isNotEmpty) {
-      for (var testDetail in labOrder.testDetails!) {
+    // if (labOrder.testDetails != null && labOrder.testDetails!.isNotEmpty) {
+    //   for (var testDetail in labOrder.testDetails!) {
+      for (var testDetail in mainLabResultsByHospitalsList!) {
         LabResult? matchingResult =
             mainLabResultsByHospitalsList.firstWhere((labResult) => labResult.testCode == testDetail.testCode || labResult.description == testDetail.description, orElse: () => LabResult());
         testResults.add({
@@ -893,7 +895,7 @@ class LabViewModel extends ChangeNotifier {
           "flag": matchingResult.calculatedResultFlag ?? "N"
         });
       }
-    }
+    // }
     orderData["results"] = testResults;
     results.add(orderData);