Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add OP number to treatment summary. #6898

Merged
merged 8 commits into from
Dec 28, 2023
Merged

Add OP number to treatment summary. #6898

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b200b90
add op
AshrafMd-1 Dec 23, 2023
b432471
Merge branch 'coronasafe:develop' into Fix-6885
AshrafMd-1 Dec 25, 2023
c6d8784
Merge branch 'coronasafe:develop' into Fix-6885
AshrafMd-1 Dec 26, 2023
ae34e62
Merge branch 'coronasafe:develop' into Fix-6885
AshrafMd-1 Dec 27, 2023
95856d5
Add correct borders in treatment summary
AshrafMd-1 Dec 27, 2023
c102c56
Update TreatmentSummary.tsx
AshrafMd-1 Dec 27, 2023
e532a3d
add space
AshrafMd-1 Dec 27, 2023
272e48c
add extra cols
AshrafMd-1 Dec 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 22 additions & 12 deletions src/Components/Facility/TreatmentSummary.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,22 +122,32 @@ const TreatmentSummary = (props: any) => {
<div className="text-right font-bold">{formatDate(date)}</div>

<div className="mb-5 mt-2 border border-gray-800">
<div className="grid border-b-2 border-gray-800 print:grid-cols-3 sm:grid-cols-3">
<div className="grid border-b-2 border-gray-800 print:grid-cols-3 sm:grid-cols-2 print:md:grid-cols-3">
<div className="col-span-1 border-b-2 border-gray-800 px-3 py-2 print:border-b-0 print:border-r-2 sm:border-b-0 sm:border-r-2">
<b>Name :</b> {patientData.name}
</div>
<div className="col-span-1 px-3 py-2">
<b>Address :</b> {patientData.address}
<b>Address : </b> {patientData.address}
</div>
</div>

<div className="grid border-b-2 border-gray-800 print:grid-cols-3 sm:grid-cols-2 md:grid-cols-3">
<div className="col-span-1 border-b-2 border-gray-800 px-3 py-2 print:border-b-0 print:border-r-2 sm:border-r-2 md:border-b-0 ">
<b>Age :</b>{" "}
{formatAge(patientData.age, patientData.date_of_birth, true)}
<div className="grid border-b-2 border-gray-800 print:grid-cols-3 sm:grid-cols-2 print:md:grid-cols-3">
<div className="col-span-1 grid print:grid-cols-2 sm:grid-cols-2 ">
<div className="col-span-1 border-b-2 border-gray-800 px-3 py-2 print:border-b-0 print:border-r-2 sm:border-b-0 sm:border-r-2">
<b>Age :</b>{" "}
{formatAge(
patientData.age,
patientData.date_of_birth,
true
)}
</div>
<div className="col-span-1 border-b-2 border-gray-800 px-3 py-2 print:border-b-0 print:border-r-2 sm:border-b-0 sm:border-r-2">
<b>OP :</b> {consultationData.patient_no}
</div>
</div>
<div className="col-span-1 border-b-2 border-gray-800 px-3 py-2 print:border-b-0 md:border-b-0 ">
<b>Date of admission :</b>

<div className="col-span-1 px-3 py-2">
<b>Date of admission : </b>
<span>
{consultationData.admitted
? formatDateTime(consultationData.encounter_date)
Expand All @@ -146,13 +156,13 @@ const TreatmentSummary = (props: any) => {
</div>
</div>

<div className="grid border-b-2 border-gray-800 print:grid-cols-3 sm:grid-cols-2 md:grid-cols-3">
<div className="col-span-1 border-b-2 border-gray-800 px-3 py-2 print:border-b-0 print:border-r-2 sm:border-r-2 md:border-b-0">
<b>Gender :</b>
<div className="grid border-b-2 border-gray-800 print:grid-cols-3 sm:grid-cols-2 print:md:grid-cols-3">
<div className="col-span-1 border-b-2 border-gray-800 px-3 py-2 print:border-b-0 print:border-r-2 sm:border-b-0 sm:border-r-2">
<b>Gender : </b>
{GENDER_TYPES.find((i) => i.id === patientData.gender)?.text}
</div>

<div className="col-span-1 border-b-2 border-gray-800 px-3 py-2 print:border-b-0 md:border-b-0 ">
<div className="col-span-1 px-3 py-2">
<b>Contact person :</b>
<span>
{" "}
Expand Down
Loading