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

change the NIBP display from last 30 mins to current bed assignment date #6479

Merged
merged 19 commits into from
Nov 7, 2023
Merged

change the NIBP display from last 30 mins to current bed assignment date #6479

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
8c5f324
change the NIBP display from last 30 mins to currect bed assignment date
sriharsh05 Oct 20, 2023
5315c82
change model name to PascalCase and used PaginatedResponse to wrap th…
sriharsh05 Oct 22, 2023
acbe0c3
use onResponse for useQuery
sriharsh05 Oct 22, 2023
12c504e
Merge branch 'develop' into fix#6429
sriharsh05 Oct 22, 2023
25e04a4
resolved merge conflict
sriharsh05 Oct 22, 2023
2d2a6f4
move bed assignment date fetch logic to parent component
sriharsh05 Oct 22, 2023
6378a4a
replaced console log with notification for error
sriharsh05 Oct 22, 2023
75addd7
change logic by passing date to VitalsMonitor and change models
sriharsh05 Oct 23, 2023
e52c1ee
remove unused models and useState variables
sriharsh05 Oct 25, 2023
5371c69
update the CNS to pass the bedAssignmentStartDate prop to HL7PatientV…
sriharsh05 Oct 27, 2023
f0d0c98
Reverted last commit
sriharsh05 Oct 28, 2023
d6889c6
update the CNS to pass the correct bedAssignmentStartDate to the Vita…
sriharsh05 Oct 28, 2023
d2daf7a
remove usage of useQuery and replaced the prop with existing data
sriharsh05 Oct 28, 2023
365bf7a
fix NIBP visibility bug in Vitals Monitor
sriharsh05 Nov 1, 2023
c6904e3
merge develop to fix#6429
sriharsh05 Nov 1, 2023
66731de
Merge branch 'develop' into fix#6429
nihal467 Nov 6, 2023
4a34fb3
delete unused function
sriharsh05 Nov 6, 2023
8896de6
Merge branch 'develop' into fix#6429
sriharsh05 Nov 6, 2023
0535375
Merge branch 'develop' into fix#6429
nihal467 Nov 7, 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
4 changes: 4 additions & 0 deletions src/Components/Facility/CentralNursingStation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,10 @@ export default function CentralNursingStation({ facilityId }: Props) {
{data.map((props) => (
<div className="overflow-hidden text-clip">
<HL7PatientVitalsMonitor
patientCurrentBedAssignmentDate={
props.patientAssetBed?.patient?.last_consultation?.current_bed
?.start_date
}
key={`${props.patientAssetBed?.bed.id}-${hash}`}
{...props}
config={config}
Expand Down
8 changes: 8 additions & 0 deletions src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@ export const ConsultationUpdatesTab = (props: ConsultationTabProps) => {
<div className="mx-auto flex w-full flex-col justify-between gap-1 rounded bg-[#020617] lg:w-auto lg:min-w-[1280px] lg:flex-row">
<div className="min-h-[400px] flex-1">
<HL7PatientVitalsMonitor
patientCurrentBedAssignmentDate={
props.patientData?.last_consultation?.current_bed
?.start_date
}
patientAssetBed={{
asset: monitorBedData?.asset_object as AssetData,
bed: monitorBedData?.bed_object as BedModel,
Expand Down Expand Up @@ -150,6 +154,10 @@ export const ConsultationUpdatesTab = (props: ConsultationTabProps) => {
<div className="min-h-[400px] flex-1">
<HL7PatientVitalsMonitor
key={`hl7-${hl7SocketUrl}-${vitals.hash}`}
patientCurrentBedAssignmentDate={
props.patientData?.last_consultation?.current_bed
?.start_date
}
patientAssetBed={{
asset: monitorBedData?.asset_object as AssetData,
bed: monitorBedData?.bed_object as BedModel,
Expand Down
14 changes: 11 additions & 3 deletions src/Components/VitalsMonitor/HL7PatientVitalsMonitor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@ const minutesAgo = (timestamp: string) => {
return `${dayjs().diff(dayjs(timestamp), "minute")}m ago`;
};

const isWithinMinutes = (timestamp: string, minutes: number) => {
return dayjs().diff(dayjs(timestamp), "minute") < minutes;
const isWithinMinutes = (timestamp: string, bedAssignmentStartDate: string) => {
return (
dayjs().diff(dayjs(timestamp), "minute") <
dayjs().diff(dayjs(bedAssignmentStartDate), "minute")
);
rithviknishad marked this conversation as resolved.
Show resolved Hide resolved
};

export default function HL7PatientVitalsMonitor(props: IVitalsComponentProps) {
Expand All @@ -40,7 +43,12 @@ export default function HL7PatientVitalsMonitor(props: IVitalsComponentProps) {
}, [props.socketUrl]);

const bpWithinMaxPersistence = !!(
(data.bp?.["date-time"] && isWithinMinutes(data.bp?.["date-time"], 30)) // Max blood pressure persistence is 30 minutes
data.bp?.["date-time"] &&
props.patientCurrentBedAssignmentDate &&
isWithinMinutes(
data.bp?.["date-time"],
props.patientCurrentBedAssignmentDate
)
rithviknishad marked this conversation as resolved.
Show resolved Hide resolved
);

return (
Expand Down
1 change: 1 addition & 0 deletions src/Components/VitalsMonitor/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ export interface ChannelOptions {
}

export interface IVitalsComponentProps {
patientCurrentBedAssignmentDate?: string;
patientAssetBed?: PatientAssetBed;
socketUrl: string;
config?: ReturnType<typeof getVitalsCanvasSizeAndDuration>;
Expand Down
3 changes: 3 additions & 0 deletions src/Redux/api.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { IConfig } from "../Common/hooks/useConfig";

import {
IAadhaarOtp,
IAadhaarOtpTBody,
Expand Down Expand Up @@ -29,6 +30,7 @@ import {
} from "../Components/Assets/AssetTypes";
import {
ConsultationModel,
CurrentBed,
FacilityModel,
LocationModel,
WardModel,
Expand Down Expand Up @@ -357,6 +359,7 @@ const routes = {
listConsultationBeds: {
path: "/api/v1/consultationbed/",
method: "GET",
TRes: Type<PaginatedResponse<CurrentBed>>(),
},
createConsultationBed: {
path: "/api/v1/consultationbed/",
Expand Down
Loading