@kenyaemr/esm-patient-clinical-view-app 5.4.2-pre.2674 → 5.4.2-pre.2680

package/src/in-patient/in-patient.component.tsx

@@ -1,78 +1,13 @@
 import React from 'react';
-import { useTranslation } from 'react-i18next';
-import { ComboButton, MenuItem, DataTableSkeleton } from '@carbon/react';
-import { CardHeader, EmptyState, useVisitOrOfflineVisit } from '@openmrs/esm-patient-common-lib';
-import { useConfig, useVisit, evaluateAsBoolean, launchWorkspace } from '@openmrs/esm-framework';
-import dayjs from 'dayjs';
-import { BedManagementConfig } from '../config-schema';
-import { usePatientEncounters } from './in-patient.resource';
-import InPatientTable from './in-patient-table/in-patient-table.component';
+import AdmissionRequest from './admission-request.component';
 
 type InPatientProps = {
   patientUuid: string;
   patient: fhir.Patient;
 };
 
-const InPatient: React.FC<InPatientProps> = ({ patientUuid, patient }) => {
-  const { t } = useTranslation();
-  const { inpatientVisitUuid } = useConfig<BedManagementConfig>();
-  const { currentVisit } = useVisitOrOfflineVisit(patientUuid);
-  const { inPatientForms } = useConfig<BedManagementConfig>();
-  const { encounters, isLoading, mutate } = usePatientEncounters(patientUuid);
-
-  const hasInPatientVisit = currentVisit?.visitType.uuid === inpatientVisitUuid;
-  const filteredForms = inPatientForms.filter((form) => {
-    if (!form.hideExpression) {
-      return true;
-    }
-    const age = dayjs().diff(dayjs(patient.birthDate), 'year');
-    const ageInDays = dayjs().diff(dayjs(patient.birthDate), 'day');
-    const ageInMonths = dayjs().diff(dayjs(patient.birthDate), 'month');
-    const gender = patient.gender;
-    const hide = form.hideExpression
-      ? evaluateAsBoolean(form.hideExpression, { age, gender, ageInDays, ageInMonths })
-      : false;
-    return hide;
-  });
-
-  const handleLaunchForm = (form: { label: string; uuid: string }) => {
-    launchWorkspace('patient-form-entry-workspace', {
-      workspaceTitle: form.label,
-      mutateForm: () => mutate(),
-      formInfo: {
-        encounterUuid: '',
-        formUuid: form.uuid,
-        additionalProps: {},
-      },
-    });
-  };
-
-  if (!hasInPatientVisit) {
-    return (
-      <EmptyState
-        displayText={t('inPatientVisitMessage', 'in-patient encounter found for current  {{visitType}} visit', {
-          visitType: currentVisit?.visitType.display,
-        })}
-        headerTitle={t('inPatientView', 'In Patient View')}
-      />
-    );
-  }
-
-  return (
-    <div>
-      <CardHeader title={t('inPatient', 'In Patient')}>
-        <ComboButton size="sm" label={t('inPatientForms', 'In-Patient Forms')}>
-          {filteredForms.map((form) => (
-            <MenuItem key={form.uuid} onClick={() => handleLaunchForm(form)} label={form.label} />
-          ))}
-        </ComboButton>
-      </CardHeader>
-      <div>
-        {isLoading && <DataTableSkeleton aria-label="encounters" />}
-        {!isLoading && <InPatientTable tableRows={encounters} currentVisit={currentVisit} />}
-      </div>
-    </div>
-  );
+const InPatient: React.FC<InPatientProps> = ({ patientUuid }) => {
+  return <AdmissionRequest patientUuid={patientUuid} />;
 };
 
 export default InPatient;

package/src/in-patient/in-patient.resource.tsx

@@ -1,7 +1,7 @@
-import { openmrsFetch, useConfig } from '@openmrs/esm-framework';
+import { type Encounter, openmrsFetch, restBaseUrl, useConfig } from '@openmrs/esm-framework';
 import useSWR from 'swr';
-import { Encounter } from './encounter-observations/visit.resource';
 import { BedManagementConfig } from '../config-schema';
+import { AdmissionRequest } from '../types';
 
 export const usePatientEncounters = (patientUuid: string) => {
   const { inPatientForms } = useConfig<BedManagementConfig>();
@@ -24,3 +24,33 @@ export const usePatientEncounters = (patientUuid: string) => {
     mutate,
   };
 };
+
+const defaultRep =
+  'custom:(' +
+  'dispositionLocation,' +
+  'dispositionType,' +
+  'disposition,' +
+  'dispositionEncounter:full,' +
+  'patient:(uuid,identifiers,voided,' +
+  'person:(uuid,display,gender,age,birthdate,birthtime,preferredName,preferredAddress,dead,deathDate)),' +
+  'dispositionObsGroup,' +
+  'visit)';
+
+export const useAdmissionRequest = (patientUuid: string) => {
+  const patientUuids = [patientUuid];
+  const searchParams = new URLSearchParams();
+  searchParams.set('dispositionType', 'ADMIT');
+  searchParams.set('patients', patientUuids.join(','));
+  searchParams.set('v', defaultRep);
+
+  const url = `${restBaseUrl}/emrapi/inpatient/request?${searchParams.toString()}`;
+
+  const { data, isLoading, error, mutate } = useSWR<{ data: { results: Array<AdmissionRequest> } }>(url, openmrsFetch);
+
+  return {
+    admissionRequest: data?.data?.results ?? [],
+    isLoading: isLoading,
+    error: error,
+    mutate: mutate,
+  };
+};

package/src/types/index.ts

@@ -1,4 +1,5 @@
-import { OpenmrsResource } from '@openmrs/esm-framework';
+import { AuditInfo, EncounterType, type Obs, type OpenmrsResource } from '@openmrs/esm-framework';
+import { type Form } from '@openmrs/esm-patient-common-lib';
 export interface OpenmrsEncounter extends OpenmrsResource {
   encounterDatetime: string;
   encounterType: {
@@ -262,3 +263,29 @@ export interface ContactAttributeData {
   livingWithClient?: string;
   ipvOutCome?: string;
 }
+
+interface DispositionEncounter extends OpenmrsResource {
+  encounterDatetime: string;
+  patient: OpenmrsResource;
+  location: OpenmrsResource;
+  form: Form;
+  encounterType: EncounterType;
+  obs: Obs[];
+  orders: any[];
+  voided: boolean;
+  auditInfo: AuditInfo;
+  visit: Visit;
+  encounterProviders: any[];
+  diagnoses: any[];
+  resourceVersion: string;
+}
+
+export interface AdmissionRequest {
+  dispositionLocation: OpenmrsResource;
+  dispositionType: string;
+  disposition: Concept;
+  dispositionEncounter: DispositionEncounter;
+  patient: Patient;
+  dispositionObsGroup: Obs;
+  visit: Visit;
+}

package/translations/am.json

@@ -10,6 +10,10 @@
   "addPNSContact": "የPNS እውቂያ ጨምር",
   "addRelationship": "ግንኙነት ጨምር",
   "admissionDate": "የመግቢያ ቀን",
+  "admissionLocation": "መግቢያ ቦታ",
+  "admissionRequest": "የመግቢያ ጥያቄ",
+  "admissionRequests": "የመግቢያ ጥያቄዎች",
+  "admissionType": "የመግቢያ ዓይነት",
   "admissionWard": "የመግቢያ Ward",
   "admittingDoctor": "የሚያስገባ ሀኪም",
   "age": "ዕድሜ",
@@ -59,6 +63,7 @@
   "dischargeDate": "የመልቀቂያ ቀን",
   "dischargingDoctor": "የሚለቅ ሀኪም",
   "discontinuationCases": "የማቋረጥ ጉዳዮች",
+  "disposition": "Disposition",
   "edit": "አስተካክል",
   "editContactList": "የእውቂያ ዝርዝር አስተካክል",
   "editEncounter": "አስተካክል",
@@ -103,11 +108,7 @@
   "htsResult": "የመጨረሻ ውጤት",
   "htsScreening": "HTS ምርመራ",
   "htsTestType": "የምርመራ አይነት",
-  "inPatient": "የውስጥ ታካሚ",
-  "inPatientForms": "የውስጥ ታካሚ ቅጾች",
   "inPatientSummary": "የውስጥ ታካሚ ማጠቃለያ",
-  "inPatientView": "የውስጥ ታካሚ እይታ",
-  "inPatientVisitMessage": "ለአሁኑ {{visitType}} ጉብኝት የውስጥ ታካሚ ግኝት ተገኝቷል",
   "ipvOutcome": "IPV ውጤት",
   "ipvOutCome": "IPV ውጤት",
   "ipvQuestions": "IPV ጥያቄዎች",
@@ -167,6 +168,7 @@
   "remarks": "ማስታወሻዎች",
   "reportingMonth": "ወር",
   "reportingYear": "ዓመት",
+  "requestDatetime": "Request Datetime",
   "save": "አስቀምጥ",
   "savedRelationship": "ግንኙነት በተሳካ ሁኔታ ተቋርጧል",
   "selectClinic": "ክሊኒክ ምረጥ",

package/translations/en.json

@@ -10,6 +10,10 @@
   "addPNSContact": "Add PNS Contact",
   "addRelationship": "Add relationship",
   "admissionDate": "Admission Date",
+  "admissionLocation": "Admission Location",
+  "admissionRequest": "Admission Request",
+  "admissionRequests": "admission requests",
+  "admissionType": "Admission Type",
   "admissionWard": "Admission Ward",
   "admittingDoctor": "Admitting Doctor",
   "age": "Age",
@@ -59,6 +63,7 @@
   "dischargeDate": "Discharge Date",
   "dischargingDoctor": "Discharging Doctor",
   "discontinuationCases": "Discontinuation cases",
+  "disposition": "Disposition",
   "edit": "Edit",
   "editContactList": "Edit contact list",
   "editEncounter": "Edit",
@@ -103,11 +108,7 @@
   "htsResult": "Final result",
   "htsScreening": "HTS Screening",
   "htsTestType": "Test type",
-  "inPatient": "In Patient",
-  "inPatientForms": "In-Patient Forms",
   "inPatientSummary": "In Patient Summary",
-  "inPatientView": "In Patient View",
-  "inPatientVisitMessage": "in-patient encounter found for current  {{visitType}} visit",
   "ipvOutcome": "IPV Outcome",
   "ipvOutCome": "IPV Outcome",
   "ipvQuestions": "IPV Questions",
@@ -167,6 +168,7 @@
   "remarks": "Remarks",
   "reportingMonth": "Month",
   "reportingYear": "Year",
+  "requestDatetime": "Request Datetime",
   "save": "Save",
   "savedRelationship": "Relationship ended successfully",
   "selectClinic": "Select Clinic",

package/translations/sw.json

@@ -10,6 +10,10 @@
   "addPNSContact": "Add PNS Contact",
   "addRelationship": "Add relationship",
   "admissionDate": "Admission Date",
+  "admissionLocation": "Admission Location",
+  "admissionRequest": "Admission Request",
+  "admissionRequests": "admission requests",
+  "admissionType": "Admission Type",
   "admissionWard": "Admission Ward",
   "admittingDoctor": "Admitting Doctor",
   "age": "Age",
@@ -59,6 +63,7 @@
   "dischargeDate": "Discharge Date",
   "dischargingDoctor": "Discharging Doctor",
   "discontinuationCases": "Discontinuation cases",
+  "disposition": "Disposition",
   "edit": "Edit",
   "editContactList": "Edit contact list",
   "editEncounter": "Edit",
@@ -103,11 +108,7 @@
   "htsResult": "Final result",
   "htsScreening": "HTS Screening",
   "htsTestType": "Test type",
-  "inPatient": "In Patient",
-  "inPatientForms": "In-Patient Forms",
   "inPatientSummary": "In Patient Summary",
-  "inPatientView": "In Patient View",
-  "inPatientVisitMessage": "in-patient encounter found for current  {{visitType}} visit",
   "ipvOutcome": "IPV Outcome",
   "ipvOutCome": "IPV Outcome",
   "ipvQuestions": "IPV Questions",
@@ -167,6 +168,7 @@
   "remarks": "Remarks",
   "reportingMonth": "Month",
   "reportingYear": "Year",
+  "requestDatetime": "Request Datetime",
   "save": "Save",
   "savedRelationship": "Relationship ended successfully",
   "selectClinic": "Select Clinic",