updates & fixes

lib/config/config.dart

@@ -7,11 +7,11 @@ const ONLY_DATE = "[0-9/]";
 const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/';
 const DOCTOR_ROTATION = 'https://doctorrota.hmg.com/';
 // const BASE_URL_LIVE_CARE = 'https://livecareuat.hmg.com/';
-// const BASE_URL = 'https://hmgwebservices.com/';
+const BASE_URL = 'https://hmgwebservices.com/';
 
 // const BASE_URL = 'https://uat.hmgwebservices.com/';
 
-const BASE_URL = 'https://webservices.hmg.com/';
+// const BASE_URL = 'https://webservices.hmg.com/';
 
 // const BASE_URL = 'https://vidauat.cloudsolutions.com.sa/'; //Vida Plus URL
 

lib/core/model/radiology/final_radiology.dart

@@ -45,7 +45,7 @@ class FinalRadiology {
   bool? isRadMedicalReport;
   bool? isLiveCareAppodynamicment;
   bool? isRecordFromVidaPlus;
-  String? invoiceType;
+  dynamic invoiceType;
 
   FinalRadiology(
       {this.setupID,
@@ -105,7 +105,7 @@ class FinalRadiology {
       doctorID = json['DoctorID'];
       clinicID = json['ClinicID'];
       orderDate = AppDateUtils.convertStringToDate(json['OrderDate']);
-      reportDate = AppDateUtils.convertStringToDate(json['ReportDate']);
+      reportDate = AppDateUtils.convertStringToDate(json['ReadOn']);
       reportData = json['ReportData'];
       imageURL = json['ImageURL'];
       procedureID = json['ProcedureID'];

lib/screens/patients/insurance_approval_screen_patient.dart

@@ -185,6 +185,7 @@ class _InsuranceApprovalScreenNewState
                                           '',
                                       branch2: model
                                           .insuranceApproval[index].projectName!,
+                                      onTap: (){},
                                     ),
                                   ),
                                 ),

lib/screens/patients/profile/diagnosis/diagnosis_screen.dart

@@ -34,7 +34,7 @@ class _ProgressNoteState extends State<DiagnosisScreen> {
       {bool isLocalBusy = false}) async {
     final routeArgs = ModalRoute.of(context)!.settings.arguments as Map;
     PatiantInformtion patient = routeArgs['patient'];
-    String type = await sharedPref.getString(SLECTED_PATIENT_TYPE);
+    String type = await sharedPref.getString(SLECTED_PATIENT_TYPE) == '0' ? "2" : "1";
 
     print(type);
     GetDiagnosisForInPatientRequestModel getDiagnosisForInPatientRequestModel =

lib/screens/patients/profile/lab_result/labs_home_page.dart

@@ -182,7 +182,7 @@ class _LabsHomePageState extends State<LabsHomePage> {
                     ),
                   ),
                 ),
-                if (model.patientLabOrdersList.isEmpty && (patient!.patientStatusType != 43 && patient!.patientStatusType !=null))
+                if (model.patientLabOrdersList.isEmpty && patient!.patientStatusType != 43)
                   Center(
                       child: ErrorMessage(
                     error: TranslationBase.of(context).noDataAvailable,

lib/screens/prescription/new_prescriptions_page.dart

@@ -28,7 +28,7 @@ class NewPrescriptionsPage extends StatelessWidget {
     return BaseView<PrescriptionViewModel>(
       onModelReady: (model) async {
        await model.getPrescriptionListNew(
-            mrn: patient.patientMRN, appNo: patient.appointmentNo);
+            mrn: patient.patientMRN, appNo: patient.appointmentNo == null ? 0 : patient.appointmentNo);
        await model.isPrincipalCovered(patient: patient);
       },
       builder: (_, model, w) => AppScaffold(

lib/widgets/shared/loader/gif_loader_container.dart

@@ -14,8 +14,7 @@ class _GifLoaderContainerState extends State<GifLoaderContainer> with TickerProv
     controller1 = GifController(vsync: this);
 
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      //   controller1.repeat(
-      //       min: 0, max: 11, period: Duration(milliseconds: 750), reverse: true);
+        controller1.repeat(period: Duration(milliseconds: 750), reverse: true);
     });
     super.initState();
   }

pubspec.yaml

@@ -80,7 +80,7 @@ dependencies:
 
   #GIF image
   #  flutter_gifimage: ^1.0.1
-  flutter_gif: ^0.0.4
+#  flutter_gif: ^0.0.4
   gif: ^2.3.0
   #Autocomplete TextField
   autocomplete_textfield: ^2.0.1
@@ -130,8 +130,8 @@ dependencies:
 
   flutter_math_fork: ^0.7.2
 
-  flutter_zoom_videosdk: ^1.10.11
-  dart_jsonwebtoken: ^2.14.0
+#  flutter_zoom_videosdk: ^1.10.11
+#  dart_jsonwebtoken: ^2.14.0
 
 
 dependency_overrides: