@ovok/core 0.2.58 → 0.2.61

package/dist/client/observation/methods/generateObservationBodiesByMeasurement.js

@@ -12,14 +12,31 @@ const getPatientReference = async (client, patientId) => {
     return (0, core_1.getReferenceString)(profile);
 };
 async function generateObservationBodiesByMeasurement(params) {
+    var _a;
     const { device, measurement } = params;
     const measurementTypeKey = measurement.measurementTypeKey;
     const patientReference = await getPatientReference(this, params.patientId);
     const observationService = creator_1.ObservationServiceCreator.getInstance().getService(measurementTypeKey);
+    const deviceObject = (0, getDeviceObject_1.getDeviceObject)(device);
+    const observationFragments = (_a = observationService.generateObservationFragments) === null || _a === void 0 ? void 0 : _a.call(observationService, measurement);
+    if (observationFragments) {
+        return observationFragments
+            .map((fragment) => ({
+            resourceType: "Observation",
+            status: "registered",
+            subject: {
+                reference: patientReference,
+            },
+            device: deviceObject,
+            ...fragment.value,
+            code: fragment.code,
+            ...(fragment.additionalProperties || {}),
+        }))
+            .filter(hasObservationValue);
+    }
     const observationCodes = observationService.getObservationCodes();
     const values = observationService.generateValues(measurement);
     const additionalProperties = observationService.getAdditionalProperties(measurement);
-    const deviceObject = (0, getDeviceObject_1.getDeviceObject)(device);
     const observationBodies = observationCodes.map((code, index) => ({
         resourceType: "Observation",
         status: "registered",
@@ -31,10 +48,11 @@ async function generateObservationBodiesByMeasurement(params) {
         code,
         ...(additionalProperties[index] || {}),
     }));
-    return observationBodies.filter((observation) => {
-        var _a, _b, _c, _d, _e;
-        return ((_a = observation.valueQuantity) === null || _a === void 0 ? void 0 : _a.value) ||
-            ((_b = observation.valueSampledData) === null || _b === void 0 ? void 0 : _b.data) ||
-            ((_e = (_d = (_c = observation.valueCodeableConcept) === null || _c === void 0 ? void 0 : _c.coding) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.code);
-    });
+    return observationBodies.filter(hasObservationValue);
 }
+const hasObservationValue = (observation) => {
+    var _a, _b, _c, _d, _e;
+    return ((_a = observation.valueQuantity) === null || _a === void 0 ? void 0 : _a.value) !== undefined ||
+        Boolean((_b = observation.valueSampledData) === null || _b === void 0 ? void 0 : _b.data) ||
+        Boolean((_e = (_d = (_c = observation.valueCodeableConcept) === null || _c === void 0 ? void 0 : _c.coding) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.code);
+};

package/dist/client/observation/services/body-temperature.js

@@ -15,7 +15,7 @@ class BodyTemperatureService extends base_observation_service_1.BaseObservationS
                 display: "Body Temperature",
                 unit: "°C",
                 valueKey: "bodyTemp",
-                toFixed: 0,
+                toFixed: 1,
             },
         ];
     }

package/dist/client/observation/services/ecg-observation-fragments.d.ts

@@ -0,0 +1,4 @@
+import { CodeableConcept } from "@medplum/fhirtypes";
+import { EcgMeasurement } from "../../../types";
+import { ObservationFragment } from "../types/generate-observation-body/ObservationFragment";
+export declare const generateEcgObservationFragments: (measurement: EcgMeasurement, observationCodes: CodeableConcept[]) => ObservationFragment[];

package/dist/client/observation/services/ecg-observation-fragments.js

@@ -0,0 +1,96 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateEcgObservationFragments = void 0;
+const MAX_SEGMENT_DURATION_SECONDS = 5 * 60;
+const generateEcgObservationFragments = (measurement, observationCodes) => {
+    const fragments = [];
+    const diagramPoints = measurement.diagramPoints;
+    const recordedAt = isValidDate(measurement.recordedAt)
+        ? measurement.recordedAt
+        : new Date();
+    const duration = typeof measurement.duration === "number" &&
+        Number.isFinite(measurement.duration) &&
+        measurement.duration > 0
+        ? measurement.duration
+        : undefined;
+    if (diagramPoints === null || diagramPoints === void 0 ? void 0 : diagramPoints.length) {
+        const maxSamples = duration
+            ? Math.max(1, Math.floor((MAX_SEGMENT_DURATION_SECONDS * diagramPoints.length) / duration))
+            : diagramPoints.length;
+        const recordingId = `ecg-${recordedAt.getTime()}-${diagramPoints.length}`;
+        const ecgCode = observationCodes[0];
+        for (let startIndex = 0, segmentIndex = 0; startIndex < diagramPoints.length; startIndex += maxSamples, segmentIndex++) {
+            const segment = diagramPoints.slice(startIndex, startIndex + maxSamples);
+            const segmentDuration = duration
+                ? (duration * segment.length) / diagramPoints.length
+                : segment.length / 1000;
+            const segmentStart = new Date(recordedAt.getTime() +
+                (duration
+                    ? (duration * startIndex * 1000) / diagramPoints.length
+                    : startIndex));
+            const segmentEnd = new Date(segmentStart.getTime() + segmentDuration * 1000);
+            const firstId = recordingId;
+            fragments.push({
+                code: ecgCode,
+                value: {
+                    valueSampledData: {
+                        origin: { value: 0, unit: "mV" },
+                        period: duration
+                            ? (duration * 1000) / diagramPoints.length
+                            : 1,
+                        dimensions: 1,
+                        data: segment.map((sample) => Number(sample.toFixed(3))).join(" "),
+                    },
+                },
+                additionalProperties: {
+                    id: segmentIndex === 0 ? firstId : `${recordingId}-${segmentIndex}`,
+                    effectivePeriod: {
+                        start: segmentStart.toISOString(),
+                        end: segmentEnd.toISOString(),
+                    },
+                    hasMember: segmentIndex === 0
+                        ? []
+                        : [{ reference: `Observation/${firstId}` }],
+                    ...(segmentIndex === 0 && measurement.diagnosticResult
+                        ? { interpretation: [{ text: measurement.diagnosticResult }] }
+                        : {}),
+                    ...(segmentIndex === 0 && duration !== undefined
+                        ? { component: [durationComponent(duration)] }
+                        : {}),
+                },
+            });
+        }
+    }
+    if (typeof measurement.heartRate === "number") {
+        fragments.push({
+            code: observationCodes[1],
+            value: {
+                valueQuantity: {
+                    value: Number(measurement.heartRate.toFixed(0)),
+                    unit: "bpm",
+                    code: "8867-4",
+                    system: "http://loinc.org",
+                },
+            },
+            additionalProperties: {
+                effectiveDateTime: recordedAt.toISOString(),
+            },
+        });
+    }
+    return fragments;
+};
+exports.generateEcgObservationFragments = generateEcgObservationFragments;
+const durationComponent = (duration) => ({
+    code: {
+        text: "measurement-duration",
+        coding: [{ code: "measurement-duration" }],
+    },
+    id: "measurement-duration",
+    valueQuantity: {
+        value: duration,
+        unit: "s",
+        code: "s",
+        system: "http://unitsofmeasure.org",
+    },
+});
+const isValidDate = (value) => value instanceof Date && !Number.isNaN(value.getTime());

package/dist/client/observation/services/ecg.d.ts

@@ -1,5 +1,6 @@
 import { Observation } from "@medplum/fhirtypes";
 import { EcgMeasurement, Measurement, MeasurementTypeKey } from "../../../types";
+import { ObservationFragment } from "../types/generate-observation-body/ObservationFragment";
 import { ObservationValue } from "../types/generate-observation-body/ObservationValue";
 import { ObservationMetadata } from "../types/service/ObservationMetadata";
 import { BaseObservationService } from "./base-observation-service";
@@ -8,6 +9,8 @@ export declare class EcgService extends BaseObservationService<EcgMeasurement> {
     protected measurementTypeName: string;
     protected observationMetadata: ObservationMetadata<EcgMeasurement>[];
     generateValues(measurement: Measurement): ObservationValue[];
+    /** Expand long recordings into bounded, timestamped observations. */
+    generateObservationFragments(measurement: Measurement): ObservationFragment[];
     getAdditionalProperties(measurement: Measurement): Partial<Observation>[];
     getMeasurementDisplay(measurement: Measurement): string;
     getObservationDisplay(observations: Observation[]): string | undefined;

package/dist/client/observation/services/ecg.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EcgService = void 0;
 const types_1 = require("../../../types");
 const base_observation_service_1 = require("./base-observation-service");
+const ecg_observation_fragments_1 = require("./ecg-observation-fragments");
 class EcgService extends base_observation_service_1.BaseObservationService {
     constructor() {
         super(...arguments);
@@ -59,6 +60,11 @@ class EcgService extends base_observation_service_1.BaseObservationService {
         }
         return values;
     }
+    /** Expand long recordings into bounded, timestamped observations. */
+    generateObservationFragments(measurement) {
+        const castedMeasurement = this.getCastedMeasurement(measurement);
+        return (0, ecg_observation_fragments_1.generateEcgObservationFragments)(castedMeasurement, this.getObservationCodes());
+    }
     getAdditionalProperties(measurement) {
         const castedMeasurement = this.getCastedMeasurement(measurement);
         const additionalProperties = [

package/dist/client/observation/services/uric-acid-service.d.ts

@@ -1,6 +1,7 @@
 import { Observation } from "@medplum/fhirtypes";
 import { Measurement, MeasurementTypeKey, Sample, UrineAnalyzeMeasurement } from "../../../types";
 import { RecordResult, RecordType } from "../types/generate-measurement/HealthConnectTypes";
+import { ObservationFragment } from "../types/generate-observation-body/ObservationFragment";
 import { ObservationValue } from "../types/generate-observation-body/ObservationValue";
 import { ObservationMetadata } from "../types/service/ObservationMetadata";
 import { BaseObservationService } from "./base-observation-service";
@@ -11,6 +12,13 @@ export declare class UricAcidService extends BaseObservationService<UrineAnalyze
     protected observationMetadata: ObservationMetadata<UrineAnalyzeMeasurement>[];
     generateValues(measurement: Measurement): ObservationValue[];
     getAdditionalProperties(measurement: Measurement): Partial<Observation>[];
+    /**
+     * A strip contains independent analyte readings. Emit each measured value
+     * as its own Observation so zero is retained and decimal values never pass
+     * through the integer-only component representation used by the legacy
+     * panel implementation.
+     */
+    generateObservationFragments(measurement: Measurement): ObservationFragment[];
     getMeasurementDisplay(measurement: Measurement): string;
     getObservationDisplay(observations: Observation[]): string | undefined;
     convertSamplesToMeasurement(_samples: Sample[]): UrineAnalyzeMeasurement;

package/dist/client/observation/services/uric-acid-service.js

@@ -36,7 +36,9 @@ class UricAcidService extends base_observation_service_1.BaseObservationService
     getAdditionalProperties(measurement) {
         const castedMeasurement = this.getCastedMeasurement(measurement);
         const components = Object.entries(castedMeasurement)
-            .filter(([key]) => key !== "measurementTypeKey" && key !== "urineValues")
+            .filter(([key]) => key !== "measurementTypeKey" &&
+            key !== "urineValues" &&
+            key !== "recordedAt")
             .map(([key, value]) => this.getComponent(key, value));
         return [
             {
@@ -45,6 +47,50 @@ class UricAcidService extends base_observation_service_1.BaseObservationService
             },
         ];
     }
+    /**
+     * A strip contains independent analyte readings. Emit each measured value
+     * as its own Observation so zero is retained and decimal values never pass
+     * through the integer-only component representation used by the legacy
+     * panel implementation.
+     */
+    generateObservationFragments(measurement) {
+        const castedMeasurement = this.getCastedMeasurement(measurement);
+        const effectiveDateTime = castedMeasurement.recordedAt instanceof Date &&
+            !Number.isNaN(castedMeasurement.recordedAt.getTime())
+            ? castedMeasurement.recordedAt.toISOString()
+            : new Date().toISOString();
+        return types_1.URINE_ANALYTE_DEFINITIONS.flatMap((analyte) => {
+            const value = castedMeasurement[analyte.key];
+            if (value === undefined || value === null || !Number.isFinite(value)) {
+                return [];
+            }
+            return [
+                {
+                    code: {
+                        coding: [
+                            {
+                                code: analyte.code,
+                                display: analyte.display,
+                                system: "http://loinc.org",
+                            },
+                        ],
+                        text: analyte.display,
+                    },
+                    value: {
+                        valueQuantity: {
+                            value,
+                            unit: "1",
+                            code: "1",
+                            system: "http://unitsofmeasure.org",
+                        },
+                    },
+                    additionalProperties: {
+                        effectiveDateTime,
+                    },
+                },
+            ];
+        });
+    }
     getMeasurementDisplay(measurement) {
         const castedMeasurement = this.getCastedMeasurement(measurement);
         const problemCount = this.countProblems(castedMeasurement);

package/dist/client/observation/types/IObservationService.d.ts

@@ -1,10 +1,12 @@
 import { CodeableConcept, Observation } from "@medplum/fhirtypes";
 import { RecordResult, RecordType } from "./generate-measurement/HealthConnectTypes";
 import { Sample } from "./generate-measurement/Sample";
+import { ObservationFragment } from "./generate-observation-body/ObservationFragment";
 import { ObservationValue } from "./generate-observation-body/ObservationValue";
 import { Measurement } from "./measurement/Measurement";
 export interface IObservationService {
     generateValues: (measurement: Measurement) => ObservationValue[];
+    generateObservationFragments?: (measurement: Measurement) => ObservationFragment[];
     getObservationCodes: () => CodeableConcept[];
     getAdditionalProperties: (measurement: Measurement) => Partial<Observation>[];
     getUnits: () => string[];

package/dist/client/observation/types/UrineAnalytes.d.ts

@@ -0,0 +1,12 @@
+export type UrineAnalyteKey = "uro" | "bil" | "ket" | "glu" | "pro" | "ph" | "bld" | "nit" | "leu" | "sg" | "vc";
+export type UrineAnalyteDefinition = {
+    key: UrineAnalyteKey;
+    code: string;
+    display: string;
+};
+/**
+ * LOINC mappings for the eleven values returned by Contec's BC401 strip.
+ * These are exported so Native declarations and consuming apps can describe
+ * the same analytes without maintaining a second, drifting table.
+ */
+export declare const URINE_ANALYTE_DEFINITIONS: readonly UrineAnalyteDefinition[];

package/dist/client/observation/types/UrineAnalytes.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.URINE_ANALYTE_DEFINITIONS = void 0;
+/**
+ * LOINC mappings for the eleven values returned by Contec's BC401 strip.
+ * These are exported so Native declarations and consuming apps can describe
+ * the same analytes without maintaining a second, drifting table.
+ */
+exports.URINE_ANALYTE_DEFINITIONS = [
+    { key: "uro", code: "50563-6", display: "Urobilinogen" },
+    { key: "bld", code: "50559-4", display: "Hemoglobin" },
+    { key: "bil", code: "53327-3", display: "Bilirubin" },
+    { key: "ket", code: "50557-8", display: "Ketones" },
+    { key: "glu", code: "53328-1", display: "Glucose" },
+    { key: "pro", code: "50561-0", display: "Protein" },
+    { key: "ph", code: "50560-2", display: "Urine pH" },
+    { key: "nit", code: "50558-6", display: "Nitrite" },
+    { key: "leu", code: "60026-2", display: "Leukocyte esterase" },
+    { key: "sg", code: "53326-5", display: "Specific gravity" },
+    { key: "vc", code: "5768-7", display: "Ascorbate (vitamin C)" },
+];

package/dist/client/observation/types/generate-observation-body/ObservationFragment.d.ts

@@ -0,0 +1,12 @@
+import { CodeableConcept, Observation } from "@medplum/fhirtypes";
+import { ObservationValue } from "./ObservationValue";
+/**
+ * A service-specific observation that is expanded by the common observation
+ * body generator. This is used when one measurement has to produce more than
+ * one FHIR Observation, such as a long ECG or a urine strip's analytes.
+ */
+export type ObservationFragment = {
+    code: CodeableConcept;
+    value?: ObservationValue;
+    additionalProperties?: Partial<Observation>;
+};

package/dist/client/observation/types/generate-observation-body/ObservationFragment.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/client/observation/types/measurement/EcgMeasurement.d.ts

@@ -10,4 +10,6 @@ export type EcgMeasurement = Measurement & {
      * Duration of the ECG in seconds
      */
     duration?: number;
+    /** Time at which the device started recording the ECG. */
+    recordedAt?: Date;
 };

package/dist/client/observation/types/measurement/UrineAnalyzeMeasurement.d.ts

@@ -13,6 +13,8 @@ export type UrineAnalyzeMeasurement = Measurement & {
     sg?: number;
     vc?: number;
     urineValues: UrineAnalysisValue[];
+    /** Time at which the analyzer recorded the strip. */
+    recordedAt?: Date;
 };
 type UrineAnalysisValue = {
     code: CodeableConcept;

package/dist/conformance/capability-requirements.js

@@ -48,7 +48,7 @@ exports.OVOK_CORE_REQUIREMENTS = {
     description: "The FHIR surface a server must provide for the @ovok/core client library's own methods to function.",
     software: {
         name: "@ovok/core",
-        version: "0.2.57",
+        version: "0.2.60",
     },
     fhirVersion: "4.0.1",
     format: ["json"],

package/dist/types/index.d.ts

@@ -6,6 +6,7 @@ export * from "../client/auth/types/RequestDeleteUserBody";
 export * from "../client/auth/types/ResetPasswordBody";
 export * from "../client/observation/types/MeasurementTypeKey";
 export * from "../client/observation/types/ObservationCode";
+export * from "../client/observation/types/UrineAnalytes";
 export * from "../client/observation/types/measurement";
 export * from "../client/observation/types/generate-measurement/Sample";
 export * from "../client/observation/types/GetLatestObservationsByCodeParams";

package/dist/types/index.js

@@ -24,6 +24,7 @@ __exportStar(require("../client/auth/types/ResetPasswordBody"), exports);
 // Measurement types
 __exportStar(require("../client/observation/types/MeasurementTypeKey"), exports);
 __exportStar(require("../client/observation/types/ObservationCode"), exports);
+__exportStar(require("../client/observation/types/UrineAnalytes"), exports);
 __exportStar(require("../client/observation/types/measurement"), exports);
 __exportStar(require("../client/observation/types/generate-measurement/Sample"), exports);
 // Observation types

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ovok/core",
-  "version": "0.2.58",
+  "version": "0.2.61",
   "private": false,
   "main": "dist/index.js",
   "types": "dist/index.d.ts",