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.

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

Removed Date of Positive & Negative in Treatment Summary #6878

Merged
merged 1 commit into from
Dec 20, 2023
Merged
Changes from all commits
Commits
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
20 changes: 3 additions & 17 deletions src/Components/Facility/TreatmentSummary.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { PatientModel } from "../Patient/models";

import { GENDER_TYPES } from "../../Common/constants";
import { formatAge, formatDate, formatDateTime } from "../../Utils/utils";

const Loading = lazy(() => import("../Common/Loading"));

const TreatmentSummary = (props: any) => {
Expand Down Expand Up @@ -135,20 +136,14 @@ const TreatmentSummary = (props: any) => {
<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 md:border-b-0 md:border-r-2">
<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>
<span>
{consultationData.admitted
? formatDateTime(consultationData.admission_date)
: " --/--/----"}
</span>
</div>
<div className="col-span-1 px-3 py-2">
<b>Date of positive :</b>
{patientData.date_of_result
? formatDate(patientData.date_of_result)
: " --/--/----"}
</div>
</div>

<div className="grid border-b-2 border-gray-800 print:grid-cols-3 sm:grid-cols-2 md:grid-cols-3">
Expand All @@ -157,7 +152,7 @@ const TreatmentSummary = (props: any) => {
{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 print:border-r-2 md:border-b-0 md:border-r-2">
<div className="col-span-1 border-b-2 border-gray-800 px-3 py-2 print:border-b-0 md:border-b-0 ">
<b>Contact person :</b>
<span>
{" "}
Expand All @@ -166,15 +161,6 @@ const TreatmentSummary = (props: any) => {
: " -"}
</span>
</div>

<div className="col-span-1 px-3 py-2">
<b>Date of negative :</b>
<span>
{patientData.disease_status == "NEGATIVE"
? formatDate(patientData.modified_date)
: " --/--/----"}
</span>
</div>
</div>

<div className="border-b-2 border-gray-800 px-5 py-2">
Expand Down
Loading