diff --git a/add_prescription.php b/add_prescription.php new file mode 100644 index 0000000..106e476 --- /dev/null +++ b/add_prescription.php @@ -0,0 +1,43 @@ + false, 'message' => 'An unknown error occurred.']; + +if ($_SERVER['REQUEST_METHOD'] === 'POST') { + $visit_id = $_POST['visit_id'] ?? null; + $patient_id = $_POST['patient_id'] ?? null; + $medication = $_POST['medication'] ?? null; + $dosage = $_POST['dosage'] ?? null; + $frequency = $_POST['frequency'] ?? null; + $notes = $_POST['notes'] ?? ''; + $doctor_id = $_SESSION['user_id'] ?? null; + + if ($visit_id && $patient_id && $doctor_id && $medication && $dosage && $frequency) { + try { + $pdo = db(); + $stmt = $pdo->prepare( + "INSERT INTO prescriptions (visit_id, patient_id, doctor_id, medication, dosage, frequency, notes) + VALUES (?, ?, ?, ?, ?, ?, ?)" + ); + $stmt->execute([$visit_id, $patient_id, $doctor_id, $medication, $dosage, $frequency, $notes]); + + $response['success'] = true; + $response['message'] = 'Prescription saved successfully.'; + + } catch (PDOException $e) { + // In a real app, log this error instead of echoing it. + $response['message'] = 'Database error: ' . $e->getMessage(); + } + } else { + $response['message'] = 'Invalid or missing data provided.'; + } +} else { + $response['message'] = 'Invalid request method.'; +} + +echo json_encode($response); +?> \ No newline at end of file diff --git a/alter_visits_table.php b/alter_visits_table.php new file mode 100644 index 0000000..dd3d163 --- /dev/null +++ b/alter_visits_table.php @@ -0,0 +1,12 @@ +exec($sql); + echo "Table 'patient_visits' altered successfully. Column 'id' renamed to 'visit_id'.\n"; +} catch (PDOException $e) { + die("Database error: " . $e->getMessage()); +} +?> \ No newline at end of file diff --git a/billing.php b/billing.php index fea00f0..315cf3d 100644 --- a/billing.php +++ b/billing.php @@ -5,13 +5,12 @@ require_once 'db/config.php'; // Handle status update if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action']) && $_POST['action'] === 'mark_paid') { - $patient_id_to_update = $_POST['patient_id'] ?? null; - if ($patient_id_to_update) { + $visit_id_to_update = $_POST['visit_id'] ?? null; + if ($visit_id_to_update) { try { $pdo = db(); - $stmt = $pdo->prepare("UPDATE patients SET payment_status = 'paid' WHERE id = ?"); - $stmt->execute([$patient_id_to_update]); - // Redirect to avoid form resubmission + $stmt = $pdo->prepare("UPDATE patient_visits SET payment_status = 'paid' WHERE visit_id = ?"); + $stmt->execute([$visit_id_to_update]); header("Location: billing.php"); exit; } catch (PDOException $e) { @@ -20,15 +19,31 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['action']) && $_POST[' } } -// Fetch unpaid patients +// Fetch unpaid visits and calculate total cost try { $pdo = db(); - $stmt = $pdo->prepare("SELECT p.*, u.username as doctor_name FROM patients p JOIN users u ON p.doctor_id = u.id WHERE p.status = 'Completed' AND p.payment_status = 'unpaid' ORDER BY p.updated_at DESC"); + $stmt = $pdo->prepare( + "SELECT + pv.visit_id, + pv.cost as consultation_fee, + p.patient_name, + p.id as patient_id, + u.username as doctor_name, + pv.service_rendered, + COALESCE((SELECT SUM(lt.cost) FROM ordered_tests ot JOIN lab_tests lt ON ot.test_id = lt.test_id WHERE ot.visit_id = pv.visit_id AND ot.test_type = 'lab'), 0) as lab_tests_cost, + COALESCE((SELECT SUM(it.cost) FROM ordered_tests ot JOIN imaging_tests it ON ot.test_id = it.test_id WHERE ot.visit_id = pv.visit_id AND ot.test_type = 'imaging'), 0) as imaging_tests_cost + FROM patient_visits pv + JOIN patients p ON pv.patient_id = p.id + JOIN users u ON pv.doctor_id = u.id + WHERE pv.status = 'Completed' AND pv.payment_status = 'unpaid' + ORDER BY pv.visit_time DESC" + ); $stmt->execute(); - $unpaid_patients = $stmt->fetchAll(PDO::FETCH_ASSOC); + $unpaid_visits = $stmt->fetchAll(PDO::FETCH_ASSOC); } catch (PDOException $e) { - $unpaid_patients = []; - // Log error + $unpaid_visits = []; + // You should log the error in a real application + // error_log($e->getMessage()); } ?> @@ -101,26 +116,27 @@ try { Patient Name Doctor Service Rendered - Cost + Total Bill Action - - - Dr. - - $ + + Dr. + + $
- +
- Invoice + Invoice @@ -141,4 +157,4 @@ try { - + \ No newline at end of file diff --git a/dispense.php b/dispense.php new file mode 100644 index 0000000..3ace9ac --- /dev/null +++ b/dispense.php @@ -0,0 +1,34 @@ + false, 'message' => 'Invalid request.']; + +if ($_SERVER['REQUEST_METHOD'] === 'POST') { + $prescription_id = $_POST['prescription_id'] ?? null; + $user_id = $_SESSION['user_id'] ?? null; + + if ($prescription_id && $user_id) { + try { + $pdo = db(); + $stmt = $pdo->prepare( + "UPDATE prescriptions SET status = 'Dispensed', dispensed_at = CURRENT_TIMESTAMP, dispensed_by = ? WHERE id = ?" + ); + + if ($stmt->execute([$user_id, $prescription_id])) { + $response = ['success' => true, 'message' => 'Prescription marked as dispensed.']; + } else { + $response['message'] = 'Failed to update prescription status.'; + } + } catch (PDOException $e) { + $response['message'] = 'Database error: ' . $e->getMessage(); + } + } else { + $response['message'] = 'Missing prescription ID or user not logged in.'; + } +} + +echo json_encode($response); +?> \ No newline at end of file diff --git a/doctor_dashboard.php b/doctor_dashboard.php index 84f1158..93901a9 100644 --- a/doctor_dashboard.php +++ b/doctor_dashboard.php @@ -4,17 +4,28 @@ require_role('doctor'); require_once 'db/config.php'; // Get doctor ID from session -$doctor_id = $_SESSION['user_id'] ?? 0; // Default to 0 if not set +$doctor_id = $_SESSION['user_id'] ?? 0; -// Fetch patients assigned to the doctor +// Fetch today's visits for the logged-in doctor try { $pdo = db(); - // Corrected to fetch patients for the logged-in doctor based on the user_id which corresponds to the doctor's ID in the `doctors` table - $stmt = $pdo->prepare("SELECT p.* FROM patients p JOIN users u ON p.doctor_id = u.id WHERE u.id = ? AND DATE(p.created_at) = CURDATE() ORDER BY p.created_at DESC"); + $stmt = $pdo->prepare( + "SELECT + pv.id as visit_id, + pv.status, + pv.notes, + p.id as patient_id, + p.patient_id as patient_system_id, + p.patient_name + FROM patient_visits pv + JOIN patients p ON pv.patient_id = p.id + WHERE pv.doctor_id = ? AND DATE(pv.visit_time) = CURDATE() + ORDER BY pv.visit_time DESC" + ); $stmt->execute([$doctor_id]); - $patients = $stmt->fetchAll(PDO::FETCH_ASSOC); + $visits = $stmt->fetchAll(PDO::FETCH_ASSOC); } catch (PDOException $e) { - $patients = []; + $visits = []; // In a real app, you'd want to log this error } @@ -60,6 +71,14 @@ try { Doctor + + + Lab Reports + + + + Pharmacy +
@@ -99,34 +118,34 @@ try { - - - + + - + - - - + + + - + -
+
- - + +
- - + +
- - + +
+ + + + + + + + + \ No newline at end of file diff --git a/order_tests.php b/order_tests.php new file mode 100644 index 0000000..a2745c8 --- /dev/null +++ b/order_tests.php @@ -0,0 +1,42 @@ + false, 'message' => 'Invalid request.']; + +if ($_SERVER['REQUEST_METHOD'] === 'POST') { + $visit_id = $_POST['visit_id'] ?? null; + $lab_tests = $_POST['lab_tests'] ?? []; + $imaging_tests = $_POST['imaging_tests'] ?? []; + + if ($visit_id && (!empty($lab_tests) || !empty($imaging_tests))) { + try { + $pdo = db(); + $pdo->beginTransaction(); + + $stmt = $pdo->prepare("INSERT INTO ordered_tests (visit_id, test_type, test_id) VALUES (?, ?, ?)"); + + foreach ($lab_tests as $test_id) { + $stmt->execute([$visit_id, 'lab', $test_id]); + } + + foreach ($imaging_tests as $test_id) { + $stmt->execute([$visit_id, 'imaging', $test_id]); + } + + $pdo->commit(); + $response = ['success' => true, 'message' => 'Tests ordered successfully.']; + + } catch (PDOException $e) { + $pdo->rollBack(); + $response['message'] = 'Database error: ' . $e->getMessage(); + } + } else { + $response['message'] = 'Missing visit ID or no tests selected.'; + } +} + +echo json_encode($response); +?> \ No newline at end of file diff --git a/patient_profile.php b/patient_profile.php index a801c78..5d6e338 100644 --- a/patient_profile.php +++ b/patient_profile.php @@ -19,16 +19,50 @@ if (!$patient) { die("Patient not found."); } -// Now, fetch all visits for this patient using their patient_id -$history_stmt = db()->prepare( - "SELECT p.*, d.username as doctor_name - FROM patients p - LEFT JOIN users d ON p.doctor_id = d.id - WHERE p.patient_id = ? - ORDER BY p.created_at DESC" +// Fetch all visits for this patient +$visit_history_stmt = db()->prepare( + "SELECT pv.*, u.username as doctor_name + FROM patient_visits pv + LEFT JOIN users u ON pv.doctor_id = u.id + WHERE pv.patient_id = ? + ORDER BY pv.visit_time DESC" ); -$history_stmt->execute([$patient['patient_id']]); -$visit_history = $history_stmt->fetchAll(PDO::FETCH_ASSOC); +$visit_history_stmt->execute([$patient_id]); +$visit_history = $visit_history_stmt->fetchAll(PDO::FETCH_ASSOC); + +// Fetch all prescriptions for this patient +$prescriptions_stmt = db()->prepare( + "SELECT pr.*, u.username as doctor_name + FROM prescriptions pr + LEFT JOIN users u ON pr.doctor_id = u.id + WHERE pr.patient_id = ? + ORDER BY pr.prescription_date DESC" +); +$prescriptions_stmt->execute([$patient_id]); +$prescriptions = $prescriptions_stmt->fetchAll(PDO::FETCH_ASSOC); + +// Fetch all ordered tests for this patient +$ordered_tests_stmt = db()->prepare( + "SELECT + ot.ordered_at, + ot.test_type, + ot.status, + ot.results, + CASE + WHEN ot.test_type = 'lab' THEN lt.test_name + WHEN ot.test_type = 'imaging' THEN it.test_name + END as test_name, + u.username as doctor_name + FROM ordered_tests ot + JOIN patient_visits pv ON ot.visit_id = pv.visit_id + JOIN users u ON pv.doctor_id = u.id + LEFT JOIN lab_tests lt ON ot.test_type = 'lab' AND ot.test_id = lt.test_id + LEFT JOIN imaging_tests it ON ot.test_type = 'imaging' AND ot.test_id = it.test_id + WHERE pv.patient_id = ? + ORDER BY ot.ordered_at DESC" +); +$ordered_tests_stmt->execute([$patient_id]); +$ordered_tests = $ordered_tests_stmt->fetchAll(PDO::FETCH_ASSOC); ?> @@ -44,36 +78,40 @@ $visit_history = $history_stmt->fetchAll(PDO::FETCH_ASSOC); -
+
-
- - - ClinicSystem - - -
-
-
+ +
+
+ + +
+
+ -
+

Patient Profile

@@ -91,16 +129,123 @@ $visit_history = $history_stmt->fetchAll(PDO::FETCH_ASSOC);
-
+
+

Patient ID:

+
+

Phone:

-
+

Address:

+ +
+
+
+ + Prescription History +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DateDoctorMedicationDosageFrequencyStatusAction
No prescription history found.
Dr. + + + + View/Print + +
+
+
+
+ + +
+
+
+ + Ordered Tests History +
+
+
+
+ + + + + + + + + + + + + + + + + + $test): ?> + + + + + + + + + + + +
Date OrderedTest NameTypeOrdered ByStatusResults
No tests have been ordered for this patient.
Dr. + + + + + + N/A + +
+
+
+
+
@@ -128,21 +273,10 @@ $visit_history = $history_stmt->fetchAll(PDO::FETCH_ASSOC); - - + + Dr. - - + @@ -154,9 +288,33 @@ $visit_history = $history_stmt->fetchAll(PDO::FETCH_ASSOC);
-
+
+ + + + + diff --git a/pharmacy.php b/pharmacy.php new file mode 100644 index 0000000..8bcb296 --- /dev/null +++ b/pharmacy.php @@ -0,0 +1,165 @@ +prepare( + "SELECT + pr.id as prescription_id, + pr.prescription_date, + pr.medication, + pr.dosage, + pr.frequency, + p.patient_name, + p.id as patient_id, + u.username as doctor_name + FROM prescriptions pr + JOIN patients p ON pr.patient_id = p.id + JOIN users u ON pr.doctor_id = u.id + WHERE pr.status = 'Prescribed' + ORDER BY pr.prescription_date ASC" +); +$pending_prescriptions_stmt->execute(); +$pending_prescriptions = $pending_prescriptions_stmt->fetchAll(PDO::FETCH_ASSOC); + +?> + + + + + + Pharmacy Dashboard + + + + + + + +
+ + + + +
+
+

Pharmacy - Pending Prescriptions

+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Date PrescribedPatientDoctorMedicationDosageFrequencyAction
No pending prescriptions found.
Dr. + +
+
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/prescription_view.php b/prescription_view.php new file mode 100644 index 0000000..9b3c6ec --- /dev/null +++ b/prescription_view.php @@ -0,0 +1,134 @@ +prepare( + "SELECT + pr.*, + p.patient_name, p.patient_id as patient_system_id, p.address, p.phone_number, + u.username as doctor_name + FROM prescriptions pr + JOIN patients p ON pr.patient_id = p.id + JOIN users u ON pr.doctor_id = u.id + WHERE pr.id = ?" +); +$stmt->execute([$prescription_id]); +$prescription = $stmt->fetch(PDO::FETCH_ASSOC); + +if (!$prescription) { + die("Prescription not found."); +} +?> + + + + + + Prescription for <?= htmlspecialchars($prescription['patient_name']) ?> + + + + + +
+
+

Prescription

+

Date:

+
+ +
+
+
Patient Details
+
+ Name:
+ Patient ID:
+ Address:
+
+
+
+
Prescribing Doctor
+
+ Dr.
+ ClinicFlow Medical Center
+
+
+
+ +
+

Rx

+ + + + + + + + + + + + + + + +
MedicationDosageFrequency
+ +
+ Notes: +

+
+ +
+ +
+

This is a computer-generated prescription and does not require a physical signature.

+
+ +
+ + Back to Profile +
+
+ + + diff --git a/reception.php b/reception.php index 13b4474..7598098 100644 --- a/reception.php +++ b/reception.php @@ -43,6 +43,18 @@ $total_revenue = $pdo->query("SELECT SUM(total_fee) FROM patients WHERE status = Billing + + + Test Config + + + + Lab Reports + + + + Pharmacy + Doctor diff --git a/update_patient_status.php b/update_patient_status.php index a74b189..4f68592 100644 --- a/update_patient_status.php +++ b/update_patient_status.php @@ -1,4 +1,6 @@ false, 'message' => 'Invalid request']; if ($_SERVER['REQUEST_METHOD'] === 'POST') { - $patient_id = $_POST['patient_id'] ?? null; + $visit_id = $_POST['visit_id'] ?? null; $status = $_POST['status'] ?? null; $notes = $_POST['notes'] ?? null; $service_rendered = $_POST['service_rendered'] ?? null; $cost = $_POST['cost'] ?? null; - if ($patient_id && $status) { + if ($visit_id && $status) { try { $pdo = db(); - $sql = "UPDATE patients SET status = ?"; + // All updates now go to the patient_visits table + $sql = "UPDATE patient_visits SET status = ?"; $params = [$status]; if ($notes !== null) { @@ -33,28 +36,28 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { $params[] = $cost; } - // When completing, set payment_status to unpaid + // When completing, set payment_status to unpaid for this specific visit if ($status === 'Completed') { $sql .= ", payment_status = 'unpaid'"; } - $sql .= " WHERE id = ?"; - $params[] = $patient_id; + $sql .= " WHERE visit_id = ?"; + $params[] = $visit_id; $stmt = $pdo->prepare($sql); if ($stmt->execute($params)) { $response['success'] = true; - $response['message'] = 'Patient status updated successfully.'; + $response['message'] = 'Visit status updated successfully.'; $response['status_class'] = get_status_badge_class($status); } else { - $response['message'] = 'Failed to update patient status.'; + $response['message'] = 'Failed to update visit status.'; } } catch (PDOException $e) { $response['message'] = 'Database error: ' . $e->getMessage(); } } else { - $response['message'] = 'Missing patient ID or status.'; + $response['message'] = 'Missing visit ID or status.'; } }