diff --git a/public/locale/en.json b/public/locale/en.json
index 1418c94c8ec..3f7908f90d3 100644
--- a/public/locale/en.json
+++ b/public/locale/en.json
@@ -1445,6 +1445,7 @@
   "no_log_update_delta": "No changes since previous log update",
   "no_log_updates": "No log updates found",
   "no_medical_history_available": "No Medical History Available",
+  "no_medication_recorded": "No Medication Recorded",
   "no_medications_found_for_this_encounter": "No medications found for this encounter.",
   "no_medications_to_administer": "No medications to administer",
   "no_notices_for_you": "No notices for you.",
diff --git a/src/Routers/routes/ConsultationRoutes.tsx b/src/Routers/routes/ConsultationRoutes.tsx
index 119ac148aa9..080b90a0a54 100644
--- a/src/Routers/routes/ConsultationRoutes.tsx
+++ b/src/Routers/routes/ConsultationRoutes.tsx
@@ -16,8 +16,12 @@ const consultationRoutes: AppRoutes = {
       />
     ),
   "/facility/:facilityId/patient/:patientId/encounter/:encounterId/treatment_summary":
-    ({ facilityId, encounterId }) => (
-      <TreatmentSummary facilityId={facilityId} encounterId={encounterId} />
+    ({ facilityId, encounterId, patientId }) => (
+      <TreatmentSummary
+        facilityId={facilityId}
+        encounterId={encounterId}
+        patientId={patientId}
+      />
     ),
   "/facility/:facilityId/patient/:patientId/encounter/:encounterId/questionnaire":
     ({ facilityId, encounterId, patientId }) => (
diff --git a/src/components/Common/PrintTable.tsx b/src/components/Common/PrintTable.tsx
new file mode 100644
index 00000000000..e7c57133774
--- /dev/null
+++ b/src/components/Common/PrintTable.tsx
@@ -0,0 +1,65 @@
+import { cn } from "@/lib/utils";
+
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableHeader,
+  TableRow,
+} from "@/components/ui/table";
+
+type HeaderRow = {
+  title: string;
+  key: string;
+  width?: number;
+};
+
+type tableRowType = Record<string, string | undefined>;
+interface GenericTableProps {
+  headers: HeaderRow[];
+  rows: tableRowType[] | undefined;
+}
+
+export default function PrintTable({ headers, rows }: GenericTableProps) {
+  return (
+    <div className="overflow-hidden rounded-lg border border-gray">
+      <Table className="w-full">
+        <TableHeader>
+          <TableRow className="bg-transparent hover:bg-transparent divide-x divide-gray border-b-gray">
+            {headers.map(({ key, title, width }, index) => (
+              <TableHead
+                className={cn(
+                  index == 0 && "first:rounded-l-md",
+                  "h-auto py-1 pl-2 pr-2 text-black text-center ",
+                  width && `w-${width}`,
+                )}
+                key={key}
+              >
+                {title}
+              </TableHead>
+            ))}
+          </TableRow>
+        </TableHeader>
+        <TableBody>
+          {!!rows &&
+            rows.map((row, index) => (
+              <TableRow
+                key={index}
+                className="bg-transparent hover:bg-transparent divide-x divide-gray"
+              >
+                {headers.map(({ key }) => (
+                  <TableCell
+                    className="break-words whitespace-normal text-center"
+                    key={key}
+                  >
+                    {row[key] || "-"}
+                  </TableCell>
+                ))}
+              </TableRow>
+            ))}
+        </TableBody>
+      </Table>
+    </div>
+  );
+}
diff --git a/src/components/Facility/ConsultationDetails/QuestionnaireResponsesList.tsx b/src/components/Facility/ConsultationDetails/QuestionnaireResponsesList.tsx
index 2514c7bbdfe..c6fc5667222 100644
--- a/src/components/Facility/ConsultationDetails/QuestionnaireResponsesList.tsx
+++ b/src/components/Facility/ConsultationDetails/QuestionnaireResponsesList.tsx
@@ -197,12 +197,23 @@ function StructuredResponseBadge({
   );
 }
 
-function ResponseCard({ item }: { item: QuestionnaireResponse }) {
+function ResponseCard({
+  item,
+  isPrintPreview,
+}: {
+  item: QuestionnaireResponse;
+  isPrintPreview?: boolean;
+}) {
   const isStructured = !item.questionnaire;
   const structuredType = Object.keys(item.structured_responses || {})[0];
 
   return (
-    <Card className="flex flex-col py-3 px-4 transition-colors hover:bg-muted/50">
+    <Card
+      className={cn(
+        "flex flex-col py-3 px-4 transition-colors hover:bg-muted/50",
+        isPrintPreview && "shadow-none",
+      )}
+    >
       <div className="flex items-start justify-between">
         <div className="space-y-1">
           <div className="flex items-center gap-2 text-xs text-gray-500">
@@ -317,7 +328,12 @@ export default function QuestionnaireResponsesList({
         ) : (
           <div>
             {questionnarieResponses?.results?.length === 0 ? (
-              <Card className="p-6">
+              <Card
+                className={cn(
+                  "p-6",
+                  isPrintPreview && "shadow-none border-gray",
+                )}
+              >
                 <div className="text-lg font-medium text-gray-500">
                   {t("no_questionnaire_responses")}
                 </div>
@@ -327,7 +343,11 @@ export default function QuestionnaireResponsesList({
                 {questionnarieResponses?.results?.map(
                   (item: QuestionnaireResponse) => (
                     <li key={item.id} className="w-full">
-                      <ResponseCard key={item.id} item={item} />
+                      <ResponseCard
+                        key={item.id}
+                        item={item}
+                        isPrintPreview={isPrintPreview}
+                      />
                     </li>
                   ),
                 )}
diff --git a/src/components/Medicine/MedicationsTable.tsx b/src/components/Medicine/MedicationsTable.tsx
index 1fee30a06fe..13d94abb8fa 100644
--- a/src/components/Medicine/MedicationsTable.tsx
+++ b/src/components/Medicine/MedicationsTable.tsx
@@ -1,6 +1,7 @@
 import { useQuery } from "@tanstack/react-query";
 import { useTranslation } from "react-i18next";
 
+import { CardContent } from "@/components/ui/card";
 import { Skeleton } from "@/components/ui/skeleton";
 import {
   Table,
@@ -60,6 +61,14 @@ export const MedicationsTable = ({
       </div>
     );
   }
+  if (!medications?.results.length) {
+    return (
+      <CardContent className="p-2">
+        <p className="text-gray-500">{t("no_medication_recorded")}</p>
+      </CardContent>
+    );
+  }
+
   return (
     <div className="border rounded-lg overflow-hidden">
       <Table>
diff --git a/src/components/Patient/MedicationStatementList.tsx b/src/components/Patient/MedicationStatementList.tsx
index 112c42414a4..606c00962d7 100644
--- a/src/components/Patient/MedicationStatementList.tsx
+++ b/src/components/Patient/MedicationStatementList.tsx
@@ -1,4 +1,5 @@
 import { useQuery } from "@tanstack/react-query";
+import { t } from "i18next";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 
@@ -35,20 +36,14 @@ import medicationStatementApi from "@/types/emr/medicationStatement/medicationSt
 interface MedicationStatementListProps {
   patientId: string;
   className?: string;
-  isPrintPreview?: boolean;
 }
 
 interface MedicationRowProps {
   statement: MedicationStatementRead;
   isEnteredInError?: boolean;
-  isPrintPreview?: boolean;
 }
 
-function MedicationRow({
-  statement,
-  isEnteredInError,
-  isPrintPreview = false,
-}: MedicationRowProps) {
+function MedicationRow({ statement, isEnteredInError }: MedicationRowProps) {
   const { t } = useTranslation();
 
   return (
@@ -80,26 +75,22 @@ function MedicationRow({
       <TableCell className="max-w-[200px]">
         {statement.note ? (
           <div className="flex items-center gap-2">
-            {isPrintPreview ? (
-              <span className="text-gray-950">{statement.note}</span>
-            ) : (
-              <Popover>
-                <PopoverTrigger asChild>
-                  <Button
-                    variant="outline"
-                    size="sm"
-                    className="h-7 text-xs shrink-0"
-                  >
-                    {t("see_note")}
-                  </Button>
-                </PopoverTrigger>
-                <PopoverContent className="w-80 p-4">
-                  <p className="text-sm text-gray-700 whitespace-pre-wrap">
-                    {statement.note}
-                  </p>
-                </PopoverContent>
-              </Popover>
-            )}
+            <Popover>
+              <PopoverTrigger asChild>
+                <Button
+                  variant="outline"
+                  size="sm"
+                  className="h-7 text-xs shrink-0"
+                >
+                  {t("see_note")}
+                </Button>
+              </PopoverTrigger>
+              <PopoverContent className="w-80 p-4">
+                <p className="text-sm text-gray-700 whitespace-pre-wrap">
+                  {statement.note}
+                </p>
+              </PopoverContent>
+            </Popover>
           </div>
         ) : (
           "-"
@@ -121,11 +112,10 @@ function MedicationRow({
 
 export function MedicationStatementList({
   patientId,
-  className,
-  isPrintPreview = false,
+  className = "",
 }: MedicationStatementListProps) {
   const { t } = useTranslation();
-  const [showEnteredInError, setShowEnteredInError] = useState(isPrintPreview);
+  const [showEnteredInError, setShowEnteredInError] = useState(false);
 
   const { data: medications, isLoading } = useQuery({
     queryKey: ["medication_statements", patientId],
@@ -136,16 +126,9 @@ export function MedicationStatementList({
 
   if (isLoading) {
     return (
-      <Card className={cn("border-none rounded-sm", className)}>
-        <CardHeader
-          className={cn("px-4 pt-4 pb-2", isPrintPreview && "px-0 py-2")}
-        >
-          <CardTitle>{t("ongoing_medications")}</CardTitle>
-        </CardHeader>
-        <CardContent className="px-2 pb-2">
-          <Skeleton className="h-[100px] w-full" />
-        </CardContent>
-      </Card>
+      <MedicationStatementListLayout className={className}>
+        <Skeleton className="h-[100px] w-full" />
+      </MedicationStatementListLayout>
     );
   }
 
@@ -160,31 +143,18 @@ export function MedicationStatementList({
 
   if (!filteredMedications?.length) {
     return (
-      <Card className={cn("border-none rounded-sm", className)}>
-        <CardHeader
-          className={cn("px-4 pt-4 pb-2", isPrintPreview && "px-0 py-2")}
-        >
-          <CardTitle>{t("ongoing_medications")}</CardTitle>
-        </CardHeader>
-        <CardContent
-          className={cn("px-2 pb-3 pt-2", isPrintPreview && "px-0 py-0")}
-        >
-          <p className="text-gray-500">{t("no_ongoing_medications")}</p>
-        </CardContent>
-      </Card>
+      <MedicationStatementListLayout className={className}>
+        <p className="text-gray-500">{t("no_ongoing_medications")}</p>
+      </MedicationStatementListLayout>
     );
   }
 
   return (
-    <Card className={cn("border-none rounded-sm", className)}>
-      <CardHeader
-        className={cn("px-4 pt-4 pb-2", isPrintPreview && "px-0 py-2")}
-      >
-        <CardTitle>
-          {t("ongoing_medications")} ({filteredMedications.length})
-        </CardTitle>
-      </CardHeader>
-      <CardContent className={cn("px-2 pb-2", isPrintPreview && "px-0 py-0")}>
+    <MedicationStatementListLayout
+      medicationsCount={filteredMedications.length}
+      className={className}
+    >
+      <>
         <Table className="border-separate border-spacing-y-0.5">
           <TableHeader>
             <TableRow className="rounded-md overflow-hidden bg-gray-100">
@@ -226,7 +196,6 @@ export function MedicationStatementList({
                 key={statement.id}
                 statement={statement}
                 isEnteredInError={statement.status === "entered_in_error"}
-                isPrintPreview={isPrintPreview}
               />
             ))}
           </TableBody>
@@ -246,7 +215,29 @@ export function MedicationStatementList({
             </div>
           </>
         )}
-      </CardContent>
-    </Card>
+      </>
+    </MedicationStatementListLayout>
   );
 }
+
+const MedicationStatementListLayout = ({
+  children,
+  className,
+  medicationsCount,
+}: {
+  children: React.ReactNode;
+  className?: string;
+  medicationsCount?: number | undefined;
+}) => {
+  return (
+    <Card className={cn("rounded-sm ", className)}>
+      <CardHeader className="px-4 pt-4 pb-2">
+        <CardTitle>
+          {t("ongoing_medications")}{" "}
+          {medicationsCount ? `(${medicationsCount})` : ""}
+        </CardTitle>
+      </CardHeader>
+      <CardContent className="px-2 pb-2">{children}</CardContent>
+    </Card>
+  );
+};
diff --git a/src/components/Patient/TreatmentSummary.tsx b/src/components/Patient/TreatmentSummary.tsx
index ad87eee91a6..01c3757b21f 100644
--- a/src/components/Patient/TreatmentSummary.tsx
+++ b/src/components/Patient/TreatmentSummary.tsx
@@ -2,29 +2,62 @@ import careConfig from "@careConfig";
 import { useQuery } from "@tanstack/react-query";
 import { format } from "date-fns";
 import { t } from "i18next";
+import { Loader } from "lucide-react";
 
 import PrintPreview from "@/CAREUI/misc/PrintPreview";
 
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+
+import PrintTable from "@/components/Common/PrintTable";
 import QuestionnaireResponsesList from "@/components/Facility/ConsultationDetails/QuestionnaireResponsesList";
-import { MedicationsTable } from "@/components/Medicine/MedicationsTable";
-import { AllergyList } from "@/components/Patient/allergy/list";
-import { DiagnosisList } from "@/components/Patient/diagnosis/list";
-import { SymptomsList } from "@/components/Patient/symptoms/list";
+import { getFrequencyDisplay } from "@/components/Medicine/MedicationsTable";
+import { formatDosage, formatSig } from "@/components/Medicine/utils";
 
 import api from "@/Utils/request/api";
 import query from "@/Utils/request/query";
-import { formatName, formatPatientAge } from "@/Utils/utils";
-
-import { MedicationStatementList } from "./MedicationStatementList";
+import { formatDateTime, formatName, formatPatientAge } from "@/Utils/utils";
+import allergyIntoleranceApi from "@/types/emr/allergyIntolerance/allergyIntoleranceApi";
+import diagnosisApi from "@/types/emr/diagnosis/diagnosisApi";
+import { completedEncounterStatus } from "@/types/emr/encounter";
+import medicationRequestApi from "@/types/emr/medicationRequest/medicationRequestApi";
+import medicationStatementApi from "@/types/emr/medicationStatement/medicationStatementApi";
+import symptomApi from "@/types/emr/symptom/symptomApi";
 
 interface TreatmentSummaryProps {
   facilityId: string;
   encounterId: string;
+
+  patientId: string;
 }
 
+const SectionLayout = ({
+  children,
+  title,
+}: {
+  title: string;
+  children: React.ReactNode;
+}) => {
+  return (
+    <Card className="rounded-sm shadow-none border-none">
+      <CardHeader className="flex justify-between flex-row px-0 py-2 ">
+        <CardTitle>{title}</CardTitle>
+      </CardHeader>
+      <CardContent className="px-0 py-0">{children}</CardContent>
+    </Card>
+  );
+};
+
+const EmptyState = ({ message }: { message: string }) => {
+  return (
+    <CardContent className="px-2 pb-3 pt-2">
+      <p className="text-gray-500">{message}</p>
+    </CardContent>
+  );
+};
 export default function TreatmentSummary({
   facilityId,
   encounterId,
+  patientId,
 }: TreatmentSummaryProps) {
   const { data: encounter } = useQuery({
     queryKey: ["encounter", encounterId],
@@ -34,6 +67,53 @@ export default function TreatmentSummary({
     }),
   });
 
+  const { data: allergies, isLoading: allergiesLoading } = useQuery({
+    queryKey: ["allergies", patientId, encounterId],
+    queryFn: query(allergyIntoleranceApi.getAllergy, {
+      pathParams: { patientId },
+      queryParams: {
+        encounter: (
+          encounter?.status
+            ? completedEncounterStatus.includes(encounter.status)
+            : false
+        )
+          ? encounterId
+          : undefined,
+      },
+    }),
+  });
+
+  const { data: symptoms, isLoading: symptomsLoading } = useQuery({
+    queryKey: ["symptoms", patientId, encounterId],
+    queryFn: query(symptomApi.listSymptoms, {
+      pathParams: { patientId },
+      queryParams: encounterId ? { encounter: encounterId } : undefined,
+    }),
+  });
+
+  const { data: diagnoses, isLoading: diagnosesLoading } = useQuery({
+    queryKey: ["diagnosis", patientId, encounterId],
+    queryFn: query(diagnosisApi.listDiagnosis, {
+      pathParams: { patientId },
+      queryParams: encounterId ? { encounter: encounterId } : undefined,
+    }),
+  });
+
+  const { data: medications, isLoading: medicationsLoading } = useQuery({
+    queryKey: ["medication_requests", patientId, encounterId],
+    queryFn: query(medicationRequestApi.list, {
+      pathParams: { patientId },
+      queryParams: { encounter: encounterId, limit: 50, offset: 0 },
+    }),
+  });
+  const { data: medicationStatement, isLoading: medicationStatementLoading } =
+    useQuery({
+      queryKey: ["medication_statements", patientId],
+      queryFn: query(medicationStatementApi.list, {
+        pathParams: { patientId },
+      }),
+    });
+
   if (!encounter) {
     return (
       <div className="flex h-[200px] items-center justify-center rounded-lg border-2 border-dashed p-4 text-gray-500">
@@ -42,11 +122,30 @@ export default function TreatmentSummary({
     );
   }
 
+  const isLoading =
+    allergiesLoading ||
+    diagnosesLoading ||
+    symptomsLoading ||
+    medicationsLoading ||
+    medicationStatementLoading;
+
+  if (isLoading) {
+    return (
+      <PrintPreview
+        title={`${t("treatment_summary")} - ${encounter.patient.name}`}
+      >
+        <div className="flex items-center justify-center h-full">
+          <Loader />
+        </div>
+      </PrintPreview>
+    );
+  }
+
   return (
     <PrintPreview
       title={`${t("treatment_summary")} - ${encounter.patient.name}`}
     >
-      <div className="min-h-screen bg-white py-2 max-w-4xl mx-auto">
+      <div className="min-h-screen py-2 max-w-4xl mx-auto">
         <div className="space-y-6">
           {/* Header */}
           <div className="flex justify-between items-start pb-2 border-b">
@@ -68,36 +167,39 @@ export default function TreatmentSummary({
           </div>
 
           {/* Patient Details */}
-          <div className="grid grid-cols-2 gap-x-12 gap-y-6">
+          <div className="grid grid-cols-1 md:grid-cols-2 gap-x-6 gap-y-6">
             <div className="space-y-3">
-              <div className="grid grid-cols-[8rem,0.25rem,1fr] items-center">
+              <div className="grid grid-cols-[10rem,auto,1fr] md:grid-cols-[8rem,auto,1fr] items-center">
                 <span className="text-gray-600">{t("patient")}</span>
                 <span className="text-gray-600">:</span>
-                <span className="font-semibold">{encounter.patient.name}</span>
+                <span className="font-semibold break-words">
+                  {encounter.patient.name}
+                </span>
               </div>
-              <div className="grid grid-cols-[8rem,0.25rem,1fr] items-center">
+              <div className="grid grid-cols-[10rem,auto,1fr] md:grid-cols-[8rem,auto,1fr] items-center">
                 <span className="text-gray-600">{`${t("age")} / ${t("sex")}`}</span>
                 <span className="text-gray-600">:</span>
-                <span className="font-semibold">
+                <span className="font-semibold break-words">
                   {`${formatPatientAge(encounter.patient, true)}, ${t(`GENDER__${encounter.patient.gender}`)}`}
                 </span>
               </div>
-              <div className="grid grid-cols-[8rem,0.25rem,1fr] items-center">
+              <div className="grid grid-cols-[10rem,auto,1fr] md:grid-cols-[8rem,auto,1fr] items-center">
                 <span className="text-gray-600">{t("encounter_class")}</span>
                 <span className="text-gray-600">:</span>
                 <span className="font-semibold">
                   {t(`encounter_class__${encounter.encounter_class}`)}
                 </span>
               </div>
-              <div className="grid grid-cols-[8rem,0.25rem,1fr] items-center">
+              <div className="grid grid-cols-[10rem,auto,1fr] md:grid-cols-[8rem,auto,1fr] items-center">
                 <span className="text-gray-600">{t("priority")}</span>
                 <span className="text-gray-600">:</span>
                 <span className="font-semibold">
                   {t(`encounter_priority__${encounter.priority}`)}
                 </span>
               </div>
+
               {encounter.hospitalization?.admit_source && (
-                <div className="grid grid-cols-[8rem,0.25rem,1fr] items-center">
+                <div className="grid grid-cols-[10rem,auto,1fr] md:grid-cols-[8rem,auto,1fr] items-center">
                   <span className="text-gray-600">{t("admission_source")}</span>
                   <span className="text-gray-600">:</span>
                   <span className="font-semibold">
@@ -108,14 +210,14 @@ export default function TreatmentSummary({
                 </div>
               )}
               {encounter.hospitalization?.re_admission && (
-                <div className="grid grid-cols-[8rem,0.25rem,1fr] items-center">
+                <div className="grid grid-cols-[10rem,auto,1fr] md:grid-cols-[8rem,auto,1fr] items-center">
                   <span className="text-gray-600">{t("readmission")}</span>
                   <span className="text-gray-600">:</span>
                   <span className="font-semibold">{t("yes")}</span>
                 </div>
               )}
               {encounter.hospitalization?.diet_preference && (
-                <div className="grid grid-cols-[8rem,0.25rem,1fr] items-center">
+                <div className="grid grid-cols-[10rem,auto,1fr] md:grid-cols-[8rem,auto,1fr] items-center">
                   <span className="text-gray-600">{t("diet_preference")}</span>
                   <span className="text-gray-600">:</span>
                   <span className="font-semibold">
@@ -126,16 +228,19 @@ export default function TreatmentSummary({
                 </div>
               )}
             </div>
+
+            {/* Right Column */}
             <div className="space-y-3">
-              <div className="grid grid-cols-[8rem,0.25rem,1fr] items-center">
+              <div className="grid grid-cols-[10rem,auto,1fr] md:grid-cols-[8rem,auto,1fr] items-center">
                 <span className="text-gray-600">{t("mobile_number")}</span>
                 <span className="text-gray-600">:</span>
-                <span className="font-semibold">
+                <span className="font-semibold break-words">
                   {encounter.patient.phone_number}
                 </span>
               </div>
+
               {encounter.period?.start && (
-                <div className="grid grid-cols-[8rem,0.25rem,1fr] items-center">
+                <div className="grid grid-cols-[10rem,auto,1fr] md:grid-cols-[8rem,auto,1fr] items-center">
                   <span className="text-gray-600">{t("encounter_date")}</span>
                   <span className="text-gray-600">:</span>
                   <span className="font-semibold">
@@ -146,22 +251,25 @@ export default function TreatmentSummary({
                   </span>
                 </div>
               )}
-              <div className="grid grid-cols-[8rem,0.25rem,1fr] items-center">
+
+              <div className="grid grid-cols-[10rem,auto,1fr] md:grid-cols-[8rem,auto,1fr] items-center">
                 <span className="text-gray-600">{t("status")}</span>
                 <span className="text-gray-600">:</span>
                 <span className="font-semibold">
                   {t(`encounter_status__${encounter.status}`)}
                 </span>
               </div>
-              <div className="grid grid-cols-[8rem,0.25rem,1fr] items-center">
+
+              <div className="grid grid-cols-[10rem,auto,1fr] md:grid-cols-[8rem,auto,1fr] items-center">
                 <span className="text-gray-600">{t("consulting_doctor")}</span>
                 <span className="text-gray-600">:</span>
                 <span className="font-semibold">
                   {formatName(encounter.created_by)}
                 </span>
               </div>
+
               {encounter.external_identifier && (
-                <div className="grid grid-cols-[8rem,0.25rem,1fr] items-center">
+                <div className="grid grid-cols-[10rem,auto,1fr] md:grid-cols-[8rem,auto,1fr] items-center">
                   <span className="text-gray-600">{t("external_id")}</span>
                   <span className="text-gray-600">:</span>
                   <span className="font-semibold">
@@ -169,8 +277,9 @@ export default function TreatmentSummary({
                   </span>
                 </div>
               )}
+
               {encounter.hospitalization?.discharge_disposition && (
-                <div className="grid grid-cols-[8rem,0.25rem,1fr] items-center">
+                <div className="grid grid-cols-[10rem,auto,1fr] md:grid-cols-[8rem,auto,1fr] items-center">
                   <span className="text-gray-600">
                     {t("discharge_disposition")}
                   </span>
@@ -184,51 +293,172 @@ export default function TreatmentSummary({
               )}
             </div>
           </div>
-
           {/* Medical Information */}
           <div className="space-y-6">
             {/* Allergies */}
-            <AllergyList
-              patientId={encounter.patient.id}
-              encounterId={encounterId}
-              className="border-none shadow-none"
-              isPrintPreview={true}
-            />
+            <SectionLayout title={t("allergies")}>
+              {allergies?.count ? (
+                <PrintTable
+                  headers={[
+                    { key: "allergen", title: t("allergen") },
+                    { key: "status", title: t("status") },
+                    { key: "criticality", title: t("criticality") },
+                    { key: "verification", title: t("verification") },
+                    { key: "notes", title: t("notes") },
+                    { key: "logged_by", title: t("logged_by") },
+                  ]}
+                  rows={allergies?.results.map((allergy) => ({
+                    allergen: allergy.code.display,
+                    status: t(allergy.clinical_status),
+                    criticality: t(allergy.criticality),
+                    verification: t(allergy.verification_status),
+                    notes: allergy.note,
+                    logged_by: formatName(allergy.created_by),
+                  }))}
+                />
+              ) : (
+                <EmptyState message={t("no_allergies_recorded")} />
+              )}
+            </SectionLayout>
 
             {/* Symptoms */}
-            <SymptomsList
-              patientId={encounter.patient.id}
-              encounterId={encounterId}
-              className="border-none shadow-none"
-              isPrintPreview={true}
-            />
+
+            <SectionLayout title={t("symptoms")}>
+              {symptoms?.count ? (
+                <PrintTable
+                  headers={[
+                    { key: "symptom", title: t("symptom") },
+                    { key: "severity", title: t("severity") },
+                    { key: "status", title: t("status") },
+                    { key: "verification", title: t("verification") },
+                    { key: "notes", title: t("notes") },
+                    { key: "logged_by", title: t("logged_by") },
+                  ]}
+                  rows={symptoms?.results?.map((symptom) => ({
+                    symptom: symptom.code.display,
+                    severity: t(symptom.severity),
+                    status: t(symptom.clinical_status),
+                    verification: t(symptom.verification_status),
+                    notes: symptom.note,
+                    logged_by: formatName(symptom.created_by),
+                  }))}
+                />
+              ) : (
+                <EmptyState message={t("no_symptoms_recorded")} />
+              )}
+            </SectionLayout>
 
             {/* Diagnoses */}
-            <DiagnosisList
-              patientId={encounter.patient.id}
-              encounterId={encounterId}
-              className="border-none shadow-none"
-              isPrintPreview={true}
-            />
+            <SectionLayout title={t("diagnoses")}>
+              {diagnoses?.count ? (
+                <PrintTable
+                  headers={[
+                    { key: "diagnosis", title: t("diagnosis") },
+
+                    { key: "status", title: t("status") },
+                    { key: "verification", title: t("verification") },
+                    { key: "onset", title: t("onset") },
+                    { key: "notes", title: t("notes") },
+                    { key: "logged_by", title: t("logged_by") },
+                  ]}
+                  rows={diagnoses?.results.map((diagnosis) => ({
+                    diagnosis: diagnosis.code.display,
+                    status: t(diagnosis.clinical_status),
+                    verification: t(diagnosis.verification_status),
+                    onset: diagnosis.onset?.onset_datetime
+                      ? new Date(
+                          diagnosis.onset.onset_datetime,
+                        ).toLocaleDateString()
+                      : undefined,
+                    notes: diagnosis.note,
+                    logged_by: formatName(diagnosis.created_by),
+                  }))}
+                />
+              ) : (
+                <EmptyState message={t("no_diagnoses_recorded")} />
+              )}
+            </SectionLayout>
 
             {/* Medications */}
-            <div className="border-none shadow-none space-y-2">
-              <p className="text-sm font-semibold text-gray-950">
-                {t("medications")}
-              </p>
-              <MedicationsTable
-                patientId={encounter.patient.id}
-                encounterId={encounterId}
-              />
-            </div>
-          </div>
+            <SectionLayout title={t("medications")}>
+              {medications?.results.length ? (
+                <PrintTable
+                  headers={[
+                    { key: "medicine", title: t("medicine") },
+                    { key: "status", title: t("status") },
+                    { key: "dosage", title: t("dosage") },
+                    { key: "frequency", title: t("frequency") },
+                    { key: "duration", title: t("duration") },
+                    { key: "instructions", title: t("instructions") },
+                  ]}
+                  rows={medications?.results.map((medication) => {
+                    const instruction = medication.dosage_instruction[0];
+                    const frequency = getFrequencyDisplay(instruction?.timing);
+                    const dosage = formatDosage(instruction);
+                    const duration =
+                      instruction?.timing?.repeat?.bounds_duration;
+                    const remarks = formatSig(instruction);
+                    const notes = medication.note;
+                    return {
+                      medicine: medication.medication?.display,
+                      status: t(medication.status),
+                      dosage: dosage,
+                      frequency: instruction?.as_needed_boolean
+                        ? `${t("as_needed_prn")} (${instruction?.as_needed_for?.display ?? "-"})`
+                        : (frequency?.meaning ?? "-") +
+                          (instruction?.additional_instruction?.[0]?.display
+                            ? `, ${instruction.additional_instruction[0].display}`
+                            : ""),
+                      duration: duration
+                        ? `${duration.value} ${duration.unit}`
+                        : "-",
+                      instructions: `${remarks || "-"}${notes ? ` (${t("note")}: ${notes})` : ""}`,
+                    };
+                  })}
+                />
+              ) : (
+                <EmptyState message={t("no_medication_recorded")} />
+              )}
+            </SectionLayout>
 
-          {/* Medication Statements */}
-          <MedicationStatementList
-            patientId={encounter.patient.id}
-            className="border-none shadow-none"
-            isPrintPreview={true}
-          />
+            {/* Medication Statements */}
+            <SectionLayout title={t("ongoing_medications")}>
+              {medicationStatement?.results.length ? (
+                <PrintTable
+                  headers={[
+                    { key: "medication", title: t("medication") },
+                    { key: "dosage", title: t("dosage") },
+                    { key: "status", title: t("status") },
+                    {
+                      key: "medication_taken_between",
+                      title: t("medication_taken_between"),
+                    },
+                    { key: "reason", title: t("reason") },
+                    { key: "notes", title: t("notes") },
+                    { key: "logged_by", title: t("logged_by") },
+                  ]}
+                  rows={medicationStatement?.results.map((medication) => ({
+                    medication:
+                      medication.medication.display ??
+                      medication.medication.code,
+                    dosage: medication.dosage_text,
+                    status: medication.status,
+                    medication_taken_between: [
+                      medication.effective_period?.start,
+                      medication.effective_period?.end,
+                    ]
+                      .map((date) => formatDateTime(date))
+                      .join(" - "),
+                    reason: medication.reason,
+                    notes: medication.note,
+                    logged_by: formatName(medication.created_by),
+                  }))}
+                />
+              ) : (
+                <EmptyState message={t("no_ongoing_medications")} />
+              )}
+            </SectionLayout>
+          </div>
 
           {/* Questionnaire Responses Section */}
           <div>
diff --git a/src/components/Patient/allergy/list.tsx b/src/components/Patient/allergy/list.tsx
index 62695fe02e8..4e4fe877a90 100644
--- a/src/components/Patient/allergy/list.tsx
+++ b/src/components/Patient/allergy/list.tsx
@@ -50,7 +50,7 @@ interface AllergyListProps {
   patientId: string;
   encounterId?: string;
   className?: string;
-  isPrintPreview?: boolean;
+
   encounterStatus?: Encounter["status"];
 }
 
@@ -72,10 +72,9 @@ export function AllergyList({
   patientId,
   encounterId,
   className,
-  isPrintPreview = false,
   encounterStatus,
 }: AllergyListProps) {
-  const [showEnteredInError, setShowEnteredInError] = useState(isPrintPreview);
+  const [showEnteredInError, setShowEnteredInError] = useState(false);
 
   const { data: allergies, isLoading } = useQuery({
     queryKey: ["allergies", patientId, encounterId, encounterStatus],
@@ -178,28 +177,22 @@ export function AllergyList({
         <TableCell className="text-sm text-gray-950">
           {allergy.note && (
             <div className="flex items-center gap-2">
-              {isPrintPreview ? (
-                <span className="text-gray-950 max-w-[200px]">
-                  {allergy.note}
-                </span>
-              ) : (
-                <Popover>
-                  <PopoverTrigger asChild>
-                    <Button
-                      variant="outline"
-                      size="sm"
-                      className="h-7 text-xs shrink-0"
-                    >
-                      {t("see_note")}
-                    </Button>
-                  </PopoverTrigger>
-                  <PopoverContent className="w-80 p-4">
-                    <p className="text-sm text-gray-700 whitespace-pre-wrap">
-                      {allergy.note}
-                    </p>
-                  </PopoverContent>
-                </Popover>
-              )}
+              <Popover>
+                <PopoverTrigger asChild>
+                  <Button
+                    variant="outline"
+                    size="sm"
+                    className="h-7 text-xs shrink-0"
+                  >
+                    {t("see_note")}
+                  </Button>
+                </PopoverTrigger>
+                <PopoverContent className="w-80 p-4">
+                  <p className="text-sm text-gray-700 whitespace-pre-wrap">
+                    {allergy.note}
+                  </p>
+                </PopoverContent>
+              </Popover>
             </div>
           )}
         </TableCell>
@@ -223,7 +216,6 @@ export function AllergyList({
       patientId={patientId}
       encounterId={encounterId}
       className={className}
-      isPrintPreview={isPrintPreview}
     >
       <Table className="border-separate border-spacing-y-0.5">
         <TableHeader>
@@ -295,24 +287,16 @@ const AllergyListLayout = ({
   encounterId,
   children,
   className,
-  isPrintPreview = false,
 }: {
   facilityId?: string;
   patientId: string;
   encounterId?: string;
   children: ReactNode;
   className?: string;
-  isPrintPreview?: boolean;
 }) => {
   return (
     <Card className={cn("border-none rounded-sm", className)}>
-      <CardHeader
-        className={cn(
-          "flex justify-between flex-row",
-          !isPrintPreview && "px-4 pt-4 pb-2 ",
-          isPrintPreview && "px-0 py-2 ",
-        )}
-      >
+      <CardHeader className="flex justify-between flex-row px-4 pt-4 pb-2">
         <CardTitle>{t("allergies")}</CardTitle>
         {facilityId && encounterId && (
           <Link
@@ -324,14 +308,7 @@ const AllergyListLayout = ({
           </Link>
         )}
       </CardHeader>
-      <CardContent
-        className={cn(
-          !isPrintPreview && "px-2 pb-2",
-          isPrintPreview && "px-0 py-0",
-        )}
-      >
-        {children}
-      </CardContent>
+      <CardContent className="px-2 pb-2">{children}</CardContent>
     </Card>
   );
 };
diff --git a/src/components/Patient/diagnosis/DiagnosisTable.tsx b/src/components/Patient/diagnosis/DiagnosisTable.tsx
index ac9d93cc878..b80e0b6062a 100644
--- a/src/components/Patient/diagnosis/DiagnosisTable.tsx
+++ b/src/components/Patient/diagnosis/DiagnosisTable.tsx
@@ -26,13 +26,9 @@ import {
 
 interface DiagnosisTableProps {
   diagnoses: Diagnosis[];
-  isPrintPreview?: boolean;
 }
 
-export function DiagnosisTable({
-  diagnoses,
-  isPrintPreview = false,
-}: DiagnosisTableProps) {
+export function DiagnosisTable({ diagnoses }: DiagnosisTableProps) {
   return (
     <Table className="border-separate border-spacing-y-0.5">
       <TableHeader>
@@ -100,26 +96,22 @@ export function DiagnosisTable({
             <TableCell className="max-w-[200px]">
               {diagnosis.note ? (
                 <div className="flex items-center gap-2">
-                  {isPrintPreview ? (
-                    <span className="text-gray-950">{diagnosis.note}</span>
-                  ) : (
-                    <Popover>
-                      <PopoverTrigger asChild>
-                        <Button
-                          variant="outline"
-                          size="sm"
-                          className="h-7 text-xs shrink-0"
-                        >
-                          {t("see_note")}
-                        </Button>
-                      </PopoverTrigger>
-                      <PopoverContent className="w-80 p-4">
-                        <p className="text-sm text-gray-700 whitespace-pre-wrap">
-                          {diagnosis.note}
-                        </p>
-                      </PopoverContent>
-                    </Popover>
-                  )}
+                  <Popover>
+                    <PopoverTrigger asChild>
+                      <Button
+                        variant="outline"
+                        size="sm"
+                        className="h-7 text-xs shrink-0"
+                      >
+                        {t("see_note")}
+                      </Button>
+                    </PopoverTrigger>
+                    <PopoverContent className="w-80 p-4">
+                      <p className="text-sm text-gray-700 whitespace-pre-wrap">
+                        {diagnosis.note}
+                      </p>
+                    </PopoverContent>
+                  </Popover>
                 </div>
               ) : (
                 "-"
@@ -132,6 +124,7 @@ export function DiagnosisTable({
                   className="w-4 h-4"
                   imageUrl={diagnosis.created_by.profile_picture_url}
                 />
+
                 <span className="text-sm">{diagnosis.created_by.username}</span>
               </div>
             </TableCell>
diff --git a/src/components/Patient/diagnosis/list.tsx b/src/components/Patient/diagnosis/list.tsx
index 4695f5900f9..cb682456b02 100644
--- a/src/components/Patient/diagnosis/list.tsx
+++ b/src/components/Patient/diagnosis/list.tsx
@@ -21,7 +21,6 @@ interface DiagnosisListProps {
   encounterId?: string;
   facilityId?: string;
   className?: string;
-  isPrintPreview?: boolean;
 }
 
 export function DiagnosisList({
@@ -29,9 +28,8 @@ export function DiagnosisList({
   encounterId,
   facilityId,
   className,
-  isPrintPreview = false,
 }: DiagnosisListProps) {
-  const [showEnteredInError, setShowEnteredInError] = useState(isPrintPreview);
+  const [showEnteredInError, setShowEnteredInError] = useState(false);
 
   const { data: diagnoses, isLoading } = useQuery({
     queryKey: ["diagnosis", patientId, encounterId],
@@ -47,6 +45,7 @@ export function DiagnosisList({
         facilityId={facilityId}
         patientId={patientId}
         encounterId={encounterId}
+        className={className}
       >
         <CardContent className="px-2 pb-2">
           <Skeleton className="h-[100px] w-full" />
@@ -71,6 +70,7 @@ export function DiagnosisList({
         facilityId={facilityId}
         patientId={patientId}
         encounterId={encounterId}
+        className={className}
       >
         <CardContent className="px-2 pb-3 pt-2">
           <p className="text-gray-500">{t("no_diagnoses_recorded")}</p>
@@ -85,38 +85,39 @@ export function DiagnosisList({
       patientId={patientId}
       encounterId={encounterId}
       className={className}
-      isPrintPreview={isPrintPreview}
     >
-      <DiagnosisTable
-        diagnoses={[
-          ...filteredDiagnoses.filter(
-            (diagnosis) => diagnosis.verification_status !== "entered_in_error",
-          ),
-          ...(showEnteredInError
-            ? filteredDiagnoses.filter(
-                (diagnosis) =>
-                  diagnosis.verification_status === "entered_in_error",
-              )
-            : []),
-        ]}
-        isPrintPreview={isPrintPreview}
-      />
+      <>
+        <DiagnosisTable
+          diagnoses={[
+            ...filteredDiagnoses.filter(
+              (diagnosis) =>
+                diagnosis.verification_status !== "entered_in_error",
+            ),
+            ...(showEnteredInError
+              ? filteredDiagnoses.filter(
+                  (diagnosis) =>
+                    diagnosis.verification_status === "entered_in_error",
+                )
+              : []),
+          ]}
+        />
 
-      {hasEnteredInErrorRecords && !showEnteredInError && (
-        <>
-          <div className="border-b border-dashed border-gray-200 my-2" />
-          <div className="flex justify-center">
-            <Button
-              variant="ghost"
-              size="xs"
-              onClick={() => setShowEnteredInError(true)}
-              className="text-xs underline text-gray-950"
-            >
-              {t("view_all")}
-            </Button>
-          </div>
-        </>
-      )}
+        {hasEnteredInErrorRecords && !showEnteredInError && (
+          <>
+            <div className="border-b border-dashed border-gray-200 my-2" />
+            <div className="flex justify-center">
+              <Button
+                variant="ghost"
+                size="xs"
+                onClick={() => setShowEnteredInError(true)}
+                className="text-xs underline text-gray-950"
+              >
+                {t("view_all")}
+              </Button>
+            </div>
+          </>
+        )}
+      </>
     </DiagnosisListLayout>
   );
 }
@@ -127,22 +128,17 @@ const DiagnosisListLayout = ({
   encounterId,
   children,
   className,
-  isPrintPreview = false,
 }: {
   facilityId?: string;
   patientId: string;
   encounterId?: string;
   children: ReactNode;
   className?: string;
-  isPrintPreview?: boolean;
 }) => {
   return (
-    <Card className={cn("border-none rounded-sm", className)}>
+    <Card className={cn("rounded-sm ", className)}>
       <CardHeader
-        className={cn(
-          "px-4 pt-4 pb-2 flex justify-between flex-row",
-          isPrintPreview && "px-0 py-2",
-        )}
+        className={cn("px-4 pt-4 pb-2 flex justify-between flex-row")}
       >
         <CardTitle>{t("diagnoses")}</CardTitle>
         {facilityId && encounterId && (
@@ -155,14 +151,7 @@ const DiagnosisListLayout = ({
           </Link>
         )}
       </CardHeader>
-      <CardContent
-        className={cn(
-          isPrintPreview && "px-0 py-0",
-          !isPrintPreview && "px-2 pb-2",
-        )}
-      >
-        {children}
-      </CardContent>
+      <CardContent className="px-2 pb-2">{children}</CardContent>
     </Card>
   );
 };
diff --git a/src/components/Patient/symptoms/SymptomTable.tsx b/src/components/Patient/symptoms/SymptomTable.tsx
index 8b9dd9cb973..759342338cb 100644
--- a/src/components/Patient/symptoms/SymptomTable.tsx
+++ b/src/components/Patient/symptoms/SymptomTable.tsx
@@ -27,13 +27,9 @@ import {
 
 interface SymptomTableProps {
   symptoms: Symptom[];
-  isPrintPreview?: boolean;
 }
 
-export function SymptomTable({
-  symptoms,
-  isPrintPreview = false,
-}: SymptomTableProps) {
+export function SymptomTable({ symptoms }: SymptomTableProps) {
   return (
     <Table className="border-separate border-spacing-y-0.5">
       <TableHeader>
@@ -110,26 +106,22 @@ export function SymptomTable({
             <TableCell className="max-w-[200px]">
               {symptom.note ? (
                 <div className="flex items-center gap-2">
-                  {isPrintPreview ? (
-                    <span className="text-gray-950">{symptom.note}</span>
-                  ) : (
-                    <Popover>
-                      <PopoverTrigger asChild>
-                        <Button
-                          variant="outline"
-                          size="sm"
-                          className="h-7 text-xs shrink-0"
-                        >
-                          {t("see_note")}
-                        </Button>
-                      </PopoverTrigger>
-                      <PopoverContent className="w-80 p-4">
-                        <p className="text-sm text-gray-700 whitespace-pre-wrap">
-                          {symptom.note}
-                        </p>
-                      </PopoverContent>
-                    </Popover>
-                  )}
+                  <Popover>
+                    <PopoverTrigger asChild>
+                      <Button
+                        variant="outline"
+                        size="sm"
+                        className="h-7 text-xs shrink-0"
+                      >
+                        {t("see_note")}
+                      </Button>
+                    </PopoverTrigger>
+                    <PopoverContent className="w-80 p-4">
+                      <p className="text-sm text-gray-700 whitespace-pre-wrap">
+                        {symptom.note}
+                      </p>
+                    </PopoverContent>
+                  </Popover>
                 </div>
               ) : (
                 "-"
@@ -142,6 +134,7 @@ export function SymptomTable({
                   className="w-4 h-4"
                   imageUrl={symptom.created_by.profile_picture_url}
                 />
+
                 <span className="text-sm">{symptom.created_by.username}</span>
               </div>
             </TableCell>
diff --git a/src/components/Patient/symptoms/list.tsx b/src/components/Patient/symptoms/list.tsx
index 0f4b558d6a9..891154584f1 100644
--- a/src/components/Patient/symptoms/list.tsx
+++ b/src/components/Patient/symptoms/list.tsx
@@ -21,7 +21,6 @@ interface SymptomsListProps {
   encounterId?: string;
   facilityId?: string;
   className?: string;
-  isPrintPreview?: boolean;
 }
 
 export function SymptomsList({
@@ -29,9 +28,8 @@ export function SymptomsList({
   encounterId,
   facilityId,
   className,
-  isPrintPreview = false,
 }: SymptomsListProps) {
-  const [showEnteredInError, setShowEnteredInError] = useState(isPrintPreview);
+  const [showEnteredInError, setShowEnteredInError] = useState(false);
 
   const { data: symptoms, isLoading } = useQuery({
     queryKey: ["symptoms", patientId, encounterId],
@@ -84,7 +82,6 @@ export function SymptomsList({
       patientId={patientId}
       encounterId={encounterId}
       className={className}
-      isPrintPreview={isPrintPreview}
     >
       <SymptomTable
         symptoms={[
@@ -97,7 +94,6 @@ export function SymptomsList({
               )
             : []),
         ]}
-        isPrintPreview={isPrintPreview}
       />
 
       {hasEnteredInErrorRecords && !showEnteredInError && (
@@ -125,24 +121,16 @@ const SymptomListLayout = ({
   encounterId,
   children,
   className,
-  isPrintPreview = false,
 }: {
   facilityId?: string;
   patientId: string;
   encounterId?: string;
   children: ReactNode;
   className?: string;
-  isPrintPreview?: boolean;
 }) => {
   return (
     <Card className={cn("border-none rounded-sm", className)}>
-      <CardHeader
-        className={cn(
-          "flex justify-between flex-row",
-          !isPrintPreview && "px-4 pt-4 pb-2",
-          isPrintPreview && "px-0 py-2",
-        )}
-      >
+      <CardHeader className="flex justify-between flex-row px-4 pt-4 pb-2">
         <CardTitle>{t("symptoms")}</CardTitle>
         {facilityId && encounterId && (
           <Link
@@ -154,14 +142,7 @@ const SymptomListLayout = ({
           </Link>
         )}
       </CardHeader>
-      <CardContent
-        className={cn(
-          isPrintPreview && "px-0 py-0",
-          !isPrintPreview && "px-2 pb-2",
-        )}
-      >
-        {children}
-      </CardContent>
+      <CardContent className="px-2 pb-2">{children}</CardContent>
     </Card>
   );
 };