From 092cfbc891c8da8d415f01099f08faf5ad431246 Mon Sep 17 00:00:00 2001
From: Elham Rababh <elham.a.rababah@gmail.com>
Date: Thu, 28 Apr 2022 11:24:03 +0300
Subject: [PATCH] fix some issue in prescription

---
 lib/client/base_app_client.dart                              | 2 +-
 .../medical_report/PatientMedicalReportService.dart          | 5 -----
 .../prescription/prescription_service.dart                   | 1 -
 .../prescriptions_items/prescription_items_out_patient.dart  | 1 +
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/client/base_app_client.dart b/lib/client/base_app_client.dart
index 94e7ca41..0218507f 100644
--- a/lib/client/base_app_client.dart
+++ b/lib/client/base_app_client.dart
@@ -231,7 +231,7 @@ class BaseAppClient {
                   : PATIENT_TYPE_ID
           : PATIENT_TYPE_ID;
 
-      body['TokenID'] = body.containsKey('TokenID') ? body['TokenID'] : token;
+      body['TokenID'] = body.containsKey('TokenID') ? body['TokenID']??token : token;
       body['PatientID'] = body['PatientID'] != null
           ? body['PatientID']
           : patient.patientId ?? patient.patientMRN;
diff --git a/lib/core/service/patient_medical_file/medical_report/PatientMedicalReportService.dart b/lib/core/service/patient_medical_file/medical_report/PatientMedicalReportService.dart
index f36959f1..b3bdd149 100644
--- a/lib/core/service/patient_medical_file/medical_report/PatientMedicalReportService.dart
+++ b/lib/core/service/patient_medical_file/medical_report/PatientMedicalReportService.dart
@@ -33,7 +33,6 @@ class PatientMedicalReportService extends BaseService {
   Future getMedicalReportTemplate() async {
     hasError = false;
     Map<String, dynamic> body = Map();
-    body['TokenID'] = "@dm!n";
     body['SetupID'] = "91877";
     body['TemplateID'] = 43;
 
@@ -54,7 +53,6 @@ class PatientMedicalReportService extends BaseService {
   Future insertMedicalReport(PatiantInformtion patient, String htmlText) async {
     hasError = false;
     Map<String, dynamic> body = Map();
-    // body['TokenID'] = "@dm!n";
     body['SetupID'] = "91877";
     body['AdmissionNo'] = patient.admissionNo;
     body['MedicalReportHTML'] = htmlText;
@@ -71,7 +69,6 @@ class PatientMedicalReportService extends BaseService {
       PatiantInformtion patient, MedicalReportModel medicalReport) async {
     hasError = false;
     Map<String, dynamic> body = Map();
-    body['TokenID'] = "@dm!n";
     body['SetupID'] = "91877";
     body['AdmissionNo'] = patient.admissionNo;
     body['InvoiceNo'] = medicalReport.invoiceNo;
@@ -92,7 +89,6 @@ class PatientMedicalReportService extends BaseService {
   Future addMedicalReport(PatiantInformtion patient, String htmlText) async {
     hasError = false;
     Map<String, dynamic> body = Map();
-    // body['TokenID'] = "@dm!n";
     body['SetupID'] = body.containsKey('SetupID')
         ? body['SetupID'] != null
             ? body['SetupID']
@@ -117,7 +113,6 @@ class PatientMedicalReportService extends BaseService {
       int limitNumber, String invoiceNumber) async {
     hasError = false;
     Map<String, dynamic> body = Map();
-    // body['TokenID'] = "@dm!n";
 
     body['LineItemNo'] = limitNumber;
     body['InvoiceNo'] = invoiceNumber;
diff --git a/lib/core/service/patient_medical_file/prescription/prescription_service.dart b/lib/core/service/patient_medical_file/prescription/prescription_service.dart
index 1b084ada..bda8907d 100644
--- a/lib/core/service/patient_medical_file/prescription/prescription_service.dart
+++ b/lib/core/service/patient_medical_file/prescription/prescription_service.dart
@@ -427,7 +427,6 @@ class PrescriptionService extends LookupService {
         GetMedicationForInPatientRequestModel(
           isDentalAllowedBackend: false,
           admissionNo: int.parse(patient.admissionNo),
-          tokenID: "@dm!n",
           projectID: patient.projectId,
         );
     await baseAppClient.postPatient(GET_MEDICATION_FOR_IN_PATIENT,
diff --git a/lib/screens/prescription/prescriptions_items/prescription_items_out_patient.dart b/lib/screens/prescription/prescriptions_items/prescription_items_out_patient.dart
index 7efcf940..a695b4d8 100644
--- a/lib/screens/prescription/prescriptions_items/prescription_items_out_patient.dart
+++ b/lib/screens/prescription/prescriptions_items/prescription_items_out_patient.dart
@@ -46,6 +46,7 @@ class PrescriptionItemsPage extends StatelessWidget {
         ),
         body: SingleChildScrollView(
           child: Container(
+            height: MediaQuery.of(context).size.height * .9,
             child: Column(
               children: [
                 ListView.builder(