@ovok/core 0.4.49-dev.495 → 0.4.49-dev.497

package/dist/client/observation/measurement-fields.d.ts

@@ -1,4 +1,4 @@
-import { MeasurementTypeKey } from "../../types";
+import { MeasurementTypeKey } from "../../types/MeasurementTypes";
 import { MeasurementField } from "./types/service/MeasurementField";
 /**
  * For each measurement type the SDK stores, its properties as their Observations store them: the

package/dist/client/observation/methods/observationsToMeasurements.d.ts

@@ -1,5 +1,5 @@
 import { Observation } from "@medplum/fhirtypes";
-import { BabySleepMeasurement, BloodGlucoseMeasurement, BloodPressureMeasurement, BodyTemperatureMeasurement, BodyWeightMeasurement, EcgMeasurement, HeartRateMeasurement, HeartRateVariabilityMeasurement, LipidPanelMeasurement, Measurement, MeasurementTypeKey, PulseOximeterMeasurement, RespiratoryRateMeasurement, RespiratoryTherapyMeasurement, RestingHeartRateMeasurement, StepCountMeasurement, UrineAnalyzeMeasurement, Vo2MaxMeasurement, WalkingHeartRateAverageMeasurement } from "../../../types";
+import { BabySleepMeasurement, BloodGlucoseMeasurement, BloodPressureMeasurement, BodyTemperatureMeasurement, BodyWeightMeasurement, EcgMeasurement, HeartRateMeasurement, HeartRateVariabilityMeasurement, LipidPanelMeasurement, Measurement, MeasurementTypeKey, PulseOximeterMeasurement, RespiratoryRateMeasurement, RespiratoryTherapyMeasurement, RestingHeartRateMeasurement, StepCountMeasurement, UrineAnalyzeMeasurement, Vo2MaxMeasurement, WalkingHeartRateAverageMeasurement } from "../../../types/MeasurementTypes";
 export type SupportedMeasurement = BloodGlucoseMeasurement | BabySleepMeasurement | BloodPressureMeasurement | BodyTemperatureMeasurement | BodyWeightMeasurement | EcgMeasurement | HeartRateMeasurement | HeartRateVariabilityMeasurement | LipidPanelMeasurement | PulseOximeterMeasurement | RespiratoryRateMeasurement | RespiratoryTherapyMeasurement | RestingHeartRateMeasurement | StepCountMeasurement | UrineAnalyzeMeasurement | Vo2MaxMeasurement | WalkingHeartRateAverageMeasurement | Measurement;
 type SupportedType = Exclude<MeasurementTypeKey, MeasurementTypeKey.symptomQuestionnaire>;
 export type ObservationGrouping = "hasMember" | "time" | ((observation: Observation, index: number, observations: readonly Observation[]) => string);

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

@@ -2,7 +2,7 @@
 /* eslint-disable max-lines */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.observationsToMeasurements = exports.observationCodesForTypes = void 0;
-const types_1 = require("../../../types");
+const MeasurementTypes_1 = require("../../../types/MeasurementTypes");
 const fhir_systems_1 = require("../fhir-systems");
 const single_value_services_1 = require("../services/single-value-services");
 const DEFAULT_OBSERVATION_TIME_TOLERANCE_MS = 1000;
@@ -19,16 +19,16 @@ const irregularHeartbeatOf = (observations) => {
     var _a, _b, _c;
     const rhythm = observations.find((observation) => {
         var _a, _b;
-        return (_b = (_a = observation.code) === null || _a === void 0 ? void 0 : _a.coding) === null || _b === void 0 ? void 0 : _b.some((coding) => coding.system === types_1.PulseRhythmCoding.system &&
-            coding.code === types_1.PulseRhythmCoding.observation);
+        return (_b = (_a = observation.code) === null || _a === void 0 ? void 0 : _a.coding) === null || _b === void 0 ? void 0 : _b.some((coding) => coding.system === MeasurementTypes_1.PulseRhythmCoding.system &&
+            coding.code === MeasurementTypes_1.PulseRhythmCoding.observation);
     });
-    const result = (_c = (_b = (_a = rhythm === null || rhythm === void 0 ? void 0 : rhythm.valueCodeableConcept) === null || _a === void 0 ? void 0 : _a.coding) === null || _b === void 0 ? void 0 : _b.find((coding) => coding.system === types_1.PulseRhythmCoding.system)) === null || _c === void 0 ? void 0 : _c.code;
-    if (result === types_1.PulseRhythmCoding.irregular ||
-        result === types_1.PulseRhythmCoding.irregularlyIrregular ||
-        result === types_1.PulseRhythmCoding.regularlyIrregular) {
+    const result = (_c = (_b = (_a = rhythm === null || rhythm === void 0 ? void 0 : rhythm.valueCodeableConcept) === null || _a === void 0 ? void 0 : _a.coding) === null || _b === void 0 ? void 0 : _b.find((coding) => coding.system === MeasurementTypes_1.PulseRhythmCoding.system)) === null || _c === void 0 ? void 0 : _c.code;
+    if (result === MeasurementTypes_1.PulseRhythmCoding.irregular ||
+        result === MeasurementTypes_1.PulseRhythmCoding.irregularlyIrregular ||
+        result === MeasurementTypes_1.PulseRhythmCoding.regularlyIrregular) {
         return true;
     }
-    return result === types_1.PulseRhythmCoding.regular ? false : undefined;
+    return result === MeasurementTypes_1.PulseRhythmCoding.regular ? false : undefined;
 };
 const recordedAtOf = (observation) => {
     var _a, _b;
@@ -53,14 +53,14 @@ const ecgGroupKey = (observation, observations) => {
     if (parent) {
         return groupKey(parent);
     }
-    if (codeOf(observation) === types_1.ObservationCode.ECG) {
+    if (codeOf(observation) === MeasurementTypes_1.ObservationCode.ECG) {
         return groupKey(observation);
     }
     const recordedAt = recordedAtOf(observation);
     const root = observations.find((candidate) => {
         var _a;
         const start = (_a = candidate.effectivePeriod) === null || _a === void 0 ? void 0 : _a.start;
-        return (codeOf(candidate) === types_1.ObservationCode.ECG &&
+        return (codeOf(candidate) === MeasurementTypes_1.ObservationCode.ECG &&
             start &&
             recordedAt &&
             new Date(start).toISOString().slice(0, 16) ===
@@ -206,11 +206,11 @@ const firstValue = (observations, code) => {
     return match ? valueOf(match) : undefined;
 };
 const LIPID_FIELDS = [
-    { key: "totalCholesterol", codes: [types_1.ObservationCode.TOTAL_CHOLESTEROL_MASS, types_1.ObservationCode.TOTAL_CHOLESTEROL_MOLAR] },
-    { key: "hdlCholesterol", codes: [types_1.ObservationCode.HDL_CHOLESTEROL_MASS, types_1.ObservationCode.HDL_CHOLESTEROL_MOLAR] },
-    { key: "ldlCholesterol", codes: [types_1.ObservationCode.LDL_CHOLESTEROL_MASS, types_1.ObservationCode.LDL_CHOLESTEROL_MOLAR] },
-    { key: "triglycerides", codes: [types_1.ObservationCode.TRIGLYCERIDES_MASS, types_1.ObservationCode.TRIGLYCERIDES_MOLAR] },
-    { key: "totalCholesterolHdlRatio", codes: [types_1.ObservationCode.TOTAL_CHOLESTEROL_HDL_RATIO] },
+    { key: "totalCholesterol", codes: [MeasurementTypes_1.ObservationCode.TOTAL_CHOLESTEROL_MASS, MeasurementTypes_1.ObservationCode.TOTAL_CHOLESTEROL_MOLAR] },
+    { key: "hdlCholesterol", codes: [MeasurementTypes_1.ObservationCode.HDL_CHOLESTEROL_MASS, MeasurementTypes_1.ObservationCode.HDL_CHOLESTEROL_MOLAR] },
+    { key: "ldlCholesterol", codes: [MeasurementTypes_1.ObservationCode.LDL_CHOLESTEROL_MASS, MeasurementTypes_1.ObservationCode.LDL_CHOLESTEROL_MOLAR] },
+    { key: "triglycerides", codes: [MeasurementTypes_1.ObservationCode.TRIGLYCERIDES_MASS, MeasurementTypes_1.ObservationCode.TRIGLYCERIDES_MOLAR] },
+    { key: "totalCholesterolHdlRatio", codes: [MeasurementTypes_1.ObservationCode.TOTAL_CHOLESTEROL_HDL_RATIO] },
 ];
 const lipidValue = (observations, field) => {
     var _a, _b, _c;
@@ -224,16 +224,16 @@ const lipidValue = (observations, field) => {
     return undefined;
 };
 const MOLAR_LIPID_CODES = [
-    types_1.ObservationCode.TOTAL_CHOLESTEROL_MOLAR,
-    types_1.ObservationCode.HDL_CHOLESTEROL_MOLAR,
-    types_1.ObservationCode.LDL_CHOLESTEROL_MOLAR,
-    types_1.ObservationCode.TRIGLYCERIDES_MOLAR,
+    MeasurementTypes_1.ObservationCode.TOTAL_CHOLESTEROL_MOLAR,
+    MeasurementTypes_1.ObservationCode.HDL_CHOLESTEROL_MOLAR,
+    MeasurementTypes_1.ObservationCode.LDL_CHOLESTEROL_MOLAR,
+    MeasurementTypes_1.ObservationCode.TRIGLYCERIDES_MOLAR,
 ];
 const MASS_LIPID_CODES = [
-    types_1.ObservationCode.TOTAL_CHOLESTEROL_MASS,
-    types_1.ObservationCode.HDL_CHOLESTEROL_MASS,
-    types_1.ObservationCode.LDL_CHOLESTEROL_MASS,
-    types_1.ObservationCode.TRIGLYCERIDES_MASS,
+    MeasurementTypes_1.ObservationCode.TOTAL_CHOLESTEROL_MASS,
+    MeasurementTypes_1.ObservationCode.HDL_CHOLESTEROL_MASS,
+    MeasurementTypes_1.ObservationCode.LDL_CHOLESTEROL_MASS,
+    MeasurementTypes_1.ObservationCode.TRIGLYCERIDES_MASS,
 ];
 /** The unit a lipid code implies, else the quantity's own unit when it is a lipid unit. */
 const lipidUnitOf = (code, unit) => {
@@ -282,34 +282,34 @@ const inverseGroup = (type, observations) => {
         return { ...measurement, measurementTypeKey: type, [single.valueKey]: value(single.code) };
     }
     switch (type) {
-        case types_1.MeasurementTypeKey.bloodPressure:
+        case MeasurementTypes_1.MeasurementTypeKey.bloodPressure:
             return {
                 ...measurement,
                 measurementTypeKey: type,
-                systolic: value(types_1.ObservationCode.SYSTOLIC_BLOOD_PRESSURE),
-                diastolic: value(types_1.ObservationCode.DIASTOLIC_BLOOD_PRESSURE),
-                meanArterialPressure: value(types_1.ObservationCode.MEAN_BLOOD_PRESSURE),
-                heartRate: value(types_1.ObservationCode.BLOOD_PRESSURE_HEART_RATE),
+                systolic: value(MeasurementTypes_1.ObservationCode.SYSTOLIC_BLOOD_PRESSURE),
+                diastolic: value(MeasurementTypes_1.ObservationCode.DIASTOLIC_BLOOD_PRESSURE),
+                meanArterialPressure: value(MeasurementTypes_1.ObservationCode.MEAN_BLOOD_PRESSURE),
+                heartRate: value(MeasurementTypes_1.ObservationCode.BLOOD_PRESSURE_HEART_RATE),
                 irregularHeartbeat: irregularHeartbeatOf(observations),
             };
-        case types_1.MeasurementTypeKey.bloodOxygenPulseRate:
+        case MeasurementTypes_1.MeasurementTypeKey.bloodOxygenPulseRate:
             return {
                 ...measurement,
                 measurementTypeKey: type,
-                bloodOxygen: value(types_1.ObservationCode.OXYGEN_SATURATION),
-                pulseRate: value(types_1.ObservationCode.OXYGEN_SATURATION_HEART_RATE),
+                bloodOxygen: value(MeasurementTypes_1.ObservationCode.OXYGEN_SATURATION),
+                pulseRate: value(MeasurementTypes_1.ObservationCode.OXYGEN_SATURATION_HEART_RATE),
             };
-        case types_1.MeasurementTypeKey.stepCount:
+        case MeasurementTypes_1.MeasurementTypeKey.stepCount:
             return {
                 ...measurement,
                 measurementTypeKey: type,
-                stepCount: value(types_1.ObservationCode.STEPS),
+                stepCount: value(MeasurementTypes_1.ObservationCode.STEPS),
                 ...(((_a = first.effectivePeriod) === null || _a === void 0 ? void 0 : _a.start) ? { start: new Date(first.effectivePeriod.start) } : {}),
                 ...(((_b = first.effectivePeriod) === null || _b === void 0 ? void 0 : _b.end) ? { end: new Date(first.effectivePeriod.end) } : {}),
             };
-        case types_1.MeasurementTypeKey.ecg: {
+        case MeasurementTypes_1.MeasurementTypeKey.ecg: {
             const sampled = observations
-                .filter((observation) => codeOf(observation) === types_1.ObservationCode.ECG)
+                .filter((observation) => codeOf(observation) === MeasurementTypes_1.ObservationCode.ECG)
                 .sort((left, right) => { var _a, _b, _c, _d; return ((_b = (_a = left.effectivePeriod) === null || _a === void 0 ? void 0 : _a.start) !== null && _b !== void 0 ? _b : "").localeCompare((_d = (_c = right.effectivePeriod) === null || _c === void 0 ? void 0 : _c.start) !== null && _d !== void 0 ? _d : ""); });
             const points = sampled.flatMap((observation) => {
                 var _a;
@@ -327,14 +327,14 @@ const inverseGroup = (type, observations) => {
                 ...measurement,
                 measurementTypeKey: type,
                 diagramPoints: points,
-                heartRate: (_e = value(types_1.ObservationCode.ECG_HEART_RATE)) !== null && _e !== void 0 ? _e : value(types_1.ObservationCode.HEART_RATE),
+                heartRate: (_e = value(MeasurementTypes_1.ObservationCode.ECG_HEART_RATE)) !== null && _e !== void 0 ? _e : value(MeasurementTypes_1.ObservationCode.HEART_RATE),
                 ...(diagnosticResult ? { diagnosticResult } : {}),
                 ...(duration > 0 ? { duration } : {}),
             };
         }
-        case types_1.MeasurementTypeKey.urineAnalysis:
-        case types_1.MeasurementTypeKey.uricAcid: {
-            const analyteByCode = Object.fromEntries(types_1.URINE_ANALYTE_DEFINITIONS.map((analyte) => [analyte.code, analyte.key]));
+        case MeasurementTypes_1.MeasurementTypeKey.urineAnalysis:
+        case MeasurementTypes_1.MeasurementTypeKey.uricAcid: {
+            const analyteByCode = Object.fromEntries(MeasurementTypes_1.URINE_ANALYTE_DEFINITIONS.map((analyte) => [analyte.code, analyte.key]));
             const result = {
                 ...measurement,
                 measurementTypeKey: type,
@@ -354,7 +354,7 @@ const inverseGroup = (type, observations) => {
             }
             return result;
         }
-        case types_1.MeasurementTypeKey.lipidPanel:
+        case MeasurementTypes_1.MeasurementTypeKey.lipidPanel:
             return {
                 ...measurement,
                 measurementTypeKey: type,
@@ -364,8 +364,8 @@ const inverseGroup = (type, observations) => {
                     return value === undefined ? [] : [[key, value]];
                 })),
             };
-        case types_1.MeasurementTypeKey.respiratoryTherapy:
-        case types_1.MeasurementTypeKey.babySleep:
+        case MeasurementTypes_1.MeasurementTypeKey.respiratoryTherapy:
+        case MeasurementTypes_1.MeasurementTypeKey.babySleep:
             return {
                 ...measurement,
                 measurementTypeKey: type,
@@ -375,27 +375,27 @@ const inverseGroup = (type, observations) => {
             return measurement;
     }
 };
-const COMPONENT_TYPES = new Set([types_1.MeasurementTypeKey.respiratoryTherapy, types_1.MeasurementTypeKey.babySleep]);
+const COMPONENT_TYPES = new Set([MeasurementTypes_1.MeasurementTypeKey.respiratoryTherapy, MeasurementTypes_1.MeasurementTypeKey.babySleep]);
 const codesForType = {
     ...Object.fromEntries([...single_value_services_1.singleValueFields].map(([type, { code }]) => [type, [code]])),
-    [types_1.MeasurementTypeKey.bloodPressure]: [types_1.ObservationCode.SYSTOLIC_BLOOD_PRESSURE, types_1.ObservationCode.DIASTOLIC_BLOOD_PRESSURE, types_1.ObservationCode.MEAN_BLOOD_PRESSURE, types_1.ObservationCode.BLOOD_PRESSURE_HEART_RATE, types_1.PulseRhythmCoding.observation],
-    [types_1.MeasurementTypeKey.bloodOxygenPulseRate]: [types_1.ObservationCode.OXYGEN_SATURATION, types_1.ObservationCode.OXYGEN_SATURATION_HEART_RATE],
-    [types_1.MeasurementTypeKey.stepCount]: [types_1.ObservationCode.STEPS],
-    [types_1.MeasurementTypeKey.ecg]: [types_1.ObservationCode.ECG, types_1.ObservationCode.ECG_HEART_RATE, types_1.ObservationCode.HEART_RATE],
-    [types_1.MeasurementTypeKey.uricAcid]: [
-        types_1.ObservationCode.URIC_ACID,
-        ...types_1.URINE_ANALYTE_DEFINITIONS.map((analyte) => analyte.code),
+    [MeasurementTypes_1.MeasurementTypeKey.bloodPressure]: [MeasurementTypes_1.ObservationCode.SYSTOLIC_BLOOD_PRESSURE, MeasurementTypes_1.ObservationCode.DIASTOLIC_BLOOD_PRESSURE, MeasurementTypes_1.ObservationCode.MEAN_BLOOD_PRESSURE, MeasurementTypes_1.ObservationCode.BLOOD_PRESSURE_HEART_RATE, MeasurementTypes_1.PulseRhythmCoding.observation],
+    [MeasurementTypes_1.MeasurementTypeKey.bloodOxygenPulseRate]: [MeasurementTypes_1.ObservationCode.OXYGEN_SATURATION, MeasurementTypes_1.ObservationCode.OXYGEN_SATURATION_HEART_RATE],
+    [MeasurementTypes_1.MeasurementTypeKey.stepCount]: [MeasurementTypes_1.ObservationCode.STEPS],
+    [MeasurementTypes_1.MeasurementTypeKey.ecg]: [MeasurementTypes_1.ObservationCode.ECG, MeasurementTypes_1.ObservationCode.ECG_HEART_RATE, MeasurementTypes_1.ObservationCode.HEART_RATE],
+    [MeasurementTypes_1.MeasurementTypeKey.uricAcid]: [
+        MeasurementTypes_1.ObservationCode.URIC_ACID,
+        ...MeasurementTypes_1.URINE_ANALYTE_DEFINITIONS.map((analyte) => analyte.code),
     ],
-    [types_1.MeasurementTypeKey.urineAnalysis]: [
-        types_1.ObservationCode.URIC_ACID,
-        ...types_1.URINE_ANALYTE_DEFINITIONS.map((analyte) => analyte.code),
+    [MeasurementTypes_1.MeasurementTypeKey.urineAnalysis]: [
+        MeasurementTypes_1.ObservationCode.URIC_ACID,
+        ...MeasurementTypes_1.URINE_ANALYTE_DEFINITIONS.map((analyte) => analyte.code),
     ],
-    [types_1.MeasurementTypeKey.lipidPanel]: [
-        types_1.ObservationCode.LIPID_PANEL,
+    [MeasurementTypes_1.MeasurementTypeKey.lipidPanel]: [
+        MeasurementTypes_1.ObservationCode.LIPID_PANEL,
         ...LIPID_FIELDS.flatMap(({ codes }) => codes),
     ],
-    [types_1.MeasurementTypeKey.respiratoryTherapy]: [types_1.ObservationCode.RESPIRATORY_THERAPY],
-    [types_1.MeasurementTypeKey.babySleep]: [types_1.ObservationCode.BABY_SLEEP],
+    [MeasurementTypes_1.MeasurementTypeKey.respiratoryTherapy]: [MeasurementTypes_1.ObservationCode.RESPIRATORY_THERAPY],
+    [MeasurementTypes_1.MeasurementTypeKey.babySleep]: [MeasurementTypes_1.ObservationCode.BABY_SLEEP],
 };
 const observationCodesForTypes = (types) => [...new Set(types.flatMap((type) => { var _a; return (_a = codesForType[type]) !== null && _a !== void 0 ? _a : []; }))].join(",");
 exports.observationCodesForTypes = observationCodesForTypes;
@@ -406,11 +406,11 @@ const observationsToMeasurements = (observations, types, options = {}) => {
         var _a;
         const codes = (_a = codesForType[type]) !== null && _a !== void 0 ? _a : [];
         const matching = observations.filter((observation) => { var _a; return codes.includes((_a = codeOf(observation)) !== null && _a !== void 0 ? _a : ""); });
-        const groups = groupObservations(matching, options, type === types_1.MeasurementTypeKey.ecg
+        const groups = groupObservations(matching, options, type === MeasurementTypes_1.MeasurementTypeKey.ecg
             ? (observation, index) => ecgGroupKey(observation, matching) || `ecg:${index}`
             : undefined);
         groups.forEach((group) => {
-            if (type === types_1.MeasurementTypeKey.lipidPanel &&
+            if (type === MeasurementTypes_1.MeasurementTypeKey.lipidPanel &&
                 !LIPID_FIELDS.some((field) => lipidValue(group.observations, field) !== undefined)) {
                 return;
             }

package/dist/client/observation/services/base-observation-service.d.ts

@@ -1,5 +1,5 @@
 import { CodeableConcept, Observation } from "@medplum/fhirtypes";
-import { MeasurementTypeKey } from "../../../types";
+import { MeasurementTypeKey } from "../../../types/MeasurementTypes";
 import { RecordResult, RecordType } from "../types/generate-measurement/HealthConnectTypes";
 import { Sample } from "../types/generate-measurement/Sample";
 import { ObservationValue } from "../types/generate-observation-body/ObservationValue";

package/dist/client/observation/services/blood-oxygen.d.ts

@@ -1,4 +1,4 @@
-import { Measurement, MeasurementTypeKey } from "../../../types";
+import { Measurement, MeasurementTypeKey } from "../../../types/MeasurementTypes";
 import { RecordResult, RecordType } from "../types/generate-measurement/HealthConnectTypes";
 import { Sample } from "../types/generate-measurement/Sample";
 import { PulseOximeterMeasurement } from "../types/measurement/PulseOximeterMeasurement";

package/dist/client/observation/services/blood-oxygen.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BloodOxygenService = void 0;
-const types_1 = require("../../../types");
+const MeasurementTypes_1 = require("../../../types/MeasurementTypes");
 const base_observation_service_1 = require("./base-observation-service");
 class BloodOxygenService extends base_observation_service_1.BaseObservationService {
     constructor() {
         super(...arguments);
-        this.measurementTypeKey = types_1.MeasurementTypeKey.bloodOxygenPulseRate;
+        this.measurementTypeKey = MeasurementTypes_1.MeasurementTypeKey.bloodOxygenPulseRate;
         this.measurementTypeName = "blood oxygen";
         this.observationMetadata = [
             {
-                primaryCode: types_1.ObservationCode.OXYGEN_SATURATION,
+                primaryCode: MeasurementTypes_1.ObservationCode.OXYGEN_SATURATION,
                 additionalCodes: [],
                 display: "Oxygen Saturation",
                 unit: "%",
@@ -18,8 +18,8 @@ class BloodOxygenService extends base_observation_service_1.BaseObservationServi
                 toFixed: 0,
             },
             {
-                primaryCode: types_1.ObservationCode.OXYGEN_SATURATION_HEART_RATE,
-                additionalCodes: [types_1.ObservationCode.HEART_RATE],
+                primaryCode: MeasurementTypes_1.ObservationCode.OXYGEN_SATURATION_HEART_RATE,
+                additionalCodes: [MeasurementTypes_1.ObservationCode.HEART_RATE],
                 display: "Heart Rate",
                 unit: "bpm",
                 valueKey: "pulseRate",
@@ -42,7 +42,7 @@ class BloodOxygenService extends base_observation_service_1.BaseObservationServi
         return {
             pulseRate,
             bloodOxygen,
-            measurementTypeKey: types_1.MeasurementTypeKey.bloodOxygenPulseRate,
+            measurementTypeKey: MeasurementTypes_1.MeasurementTypeKey.bloodOxygenPulseRate,
         };
     }
     convertRecordToMeasurement(record) {
@@ -50,7 +50,7 @@ class BloodOxygenService extends base_observation_service_1.BaseObservationServi
         return {
             pulseRate: 0,
             bloodOxygen: pulseOximeterRecord.percentage,
-            measurementTypeKey: types_1.MeasurementTypeKey.bloodOxygenPulseRate,
+            measurementTypeKey: MeasurementTypes_1.MeasurementTypeKey.bloodOxygenPulseRate,
         };
     }
 }

package/dist/client/observation/services/blood-pressure.d.ts

@@ -1,5 +1,5 @@
 import { CodeableConcept, Observation } from "@medplum/fhirtypes";
-import { BloodPressureMeasurement, Measurement, MeasurementTypeKey } from "../../../types";
+import { BloodPressureMeasurement, Measurement, MeasurementTypeKey } from "../../../types/MeasurementTypes";
 import { RecordResult, RecordType } from "../types/generate-measurement/HealthConnectTypes";
 import { Sample } from "../types/generate-measurement/Sample";
 import { ObservationValue } from "../types/generate-observation-body/ObservationValue";

package/dist/client/observation/services/blood-pressure.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BloodPressureService = void 0;
-const types_1 = require("../../../types");
+const MeasurementTypes_1 = require("../../../types/MeasurementTypes");
 const base_observation_service_1 = require("./base-observation-service");
 class BloodPressureService extends base_observation_service_1.BaseObservationService {
     constructor() {
         super(...arguments);
-        this.measurementTypeKey = types_1.MeasurementTypeKey.bloodPressure;
+        this.measurementTypeKey = MeasurementTypes_1.MeasurementTypeKey.bloodPressure;
         this.measurementTypeName = "blood pressure";
         this.observationMetadata = [
             {
-                primaryCode: types_1.ObservationCode.SYSTOLIC_BLOOD_PRESSURE,
+                primaryCode: MeasurementTypes_1.ObservationCode.SYSTOLIC_BLOOD_PRESSURE,
                 additionalCodes: [],
                 display: "Systolic Blood Pressure",
                 unit: "mmHg",
@@ -18,7 +18,7 @@ class BloodPressureService extends base_observation_service_1.BaseObservationSer
                 toFixed: 0,
             },
             {
-                primaryCode: types_1.ObservationCode.DIASTOLIC_BLOOD_PRESSURE,
+                primaryCode: MeasurementTypes_1.ObservationCode.DIASTOLIC_BLOOD_PRESSURE,
                 additionalCodes: [],
                 display: "Diastolic Blood Pressure",
                 unit: "mmHg",
@@ -26,7 +26,7 @@ class BloodPressureService extends base_observation_service_1.BaseObservationSer
                 toFixed: 0,
             },
             {
-                primaryCode: types_1.ObservationCode.MEAN_BLOOD_PRESSURE,
+                primaryCode: MeasurementTypes_1.ObservationCode.MEAN_BLOOD_PRESSURE,
                 additionalCodes: [],
                 display: "Mean Arterial Pressure",
                 unit: "mmHg",
@@ -34,8 +34,8 @@ class BloodPressureService extends base_observation_service_1.BaseObservationSer
                 toFixed: 0,
             },
             {
-                primaryCode: types_1.ObservationCode.BLOOD_PRESSURE_HEART_RATE,
-                additionalCodes: [types_1.ObservationCode.HEART_RATE],
+                primaryCode: MeasurementTypes_1.ObservationCode.BLOOD_PRESSURE_HEART_RATE,
+                additionalCodes: [MeasurementTypes_1.ObservationCode.HEART_RATE],
                 display: "Blood Pressure Heart Rate",
                 unit: "bpm",
                 valueKey: "heartRate",
@@ -48,9 +48,9 @@ class BloodPressureService extends base_observation_service_1.BaseObservationSer
             ...super.getObservationCodes(),
             {
                 coding: [{
-                        code: types_1.PulseRhythmCoding.observation,
+                        code: MeasurementTypes_1.PulseRhythmCoding.observation,
                         display: "Pulse rhythm",
-                        system: types_1.PulseRhythmCoding.system,
+                        system: MeasurementTypes_1.PulseRhythmCoding.system,
                     }],
                 text: "Pulse rhythm",
             },
@@ -61,8 +61,8 @@ class BloodPressureService extends base_observation_service_1.BaseObservationSer
         const rhythmCode = castedMeasurement.irregularHeartbeat === undefined
             ? undefined
             : castedMeasurement.irregularHeartbeat
-                ? types_1.PulseRhythmCoding.irregular
-                : types_1.PulseRhythmCoding.regular;
+                ? MeasurementTypes_1.PulseRhythmCoding.irregular
+                : MeasurementTypes_1.PulseRhythmCoding.regular;
         return [
             ...super.generateValues(measurement),
             rhythmCode
@@ -70,7 +70,7 @@ class BloodPressureService extends base_observation_service_1.BaseObservationSer
                     valueCodeableConcept: {
                         coding: [{
                                 code: rhythmCode,
-                                system: types_1.PulseRhythmCoding.system,
+                                system: MeasurementTypes_1.PulseRhythmCoding.system,
                             }],
                     },
                 }
@@ -91,8 +91,8 @@ class BloodPressureService extends base_observation_service_1.BaseObservationSer
     }
     getObservationDisplay(observations) {
         var _a, _b, _c, _d;
-        const systolic = (_b = (_a = observations === null || observations === void 0 ? void 0 : observations.find((x) => { var _a, _b, _c; return ((_c = (_b = (_a = x.code) === null || _a === void 0 ? void 0 : _a.coding) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.code) === types_1.ObservationCode.SYSTOLIC_BLOOD_PRESSURE; })) === null || _a === void 0 ? void 0 : _a.valueQuantity) === null || _b === void 0 ? void 0 : _b.value;
-        const diastolic = (_d = (_c = observations === null || observations === void 0 ? void 0 : observations.find((x) => { var _a, _b, _c; return ((_c = (_b = (_a = x.code) === null || _a === void 0 ? void 0 : _a.coding) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.code) === types_1.ObservationCode.DIASTOLIC_BLOOD_PRESSURE; })) === null || _c === void 0 ? void 0 : _c.valueQuantity) === null || _d === void 0 ? void 0 : _d.value;
+        const systolic = (_b = (_a = observations === null || observations === void 0 ? void 0 : observations.find((x) => { var _a, _b, _c; return ((_c = (_b = (_a = x.code) === null || _a === void 0 ? void 0 : _a.coding) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.code) === MeasurementTypes_1.ObservationCode.SYSTOLIC_BLOOD_PRESSURE; })) === null || _a === void 0 ? void 0 : _a.valueQuantity) === null || _b === void 0 ? void 0 : _b.value;
+        const diastolic = (_d = (_c = observations === null || observations === void 0 ? void 0 : observations.find((x) => { var _a, _b, _c; return ((_c = (_b = (_a = x.code) === null || _a === void 0 ? void 0 : _a.coding) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.code) === MeasurementTypes_1.ObservationCode.DIASTOLIC_BLOOD_PRESSURE; })) === null || _c === void 0 ? void 0 : _c.valueQuantity) === null || _d === void 0 ? void 0 : _d.value;
         if (!systolic || !diastolic) {
             return undefined;
         }
@@ -104,7 +104,7 @@ class BloodPressureService extends base_observation_service_1.BaseObservationSer
         return {
             systolic: systolic === null || systolic === void 0 ? void 0 : systolic.quantity,
             diastolic: diastolic === null || diastolic === void 0 ? void 0 : diastolic.quantity,
-            measurementTypeKey: types_1.MeasurementTypeKey.bloodPressure,
+            measurementTypeKey: MeasurementTypes_1.MeasurementTypeKey.bloodPressure,
         };
     }
     convertRecordToMeasurement(record) {
@@ -112,7 +112,7 @@ class BloodPressureService extends base_observation_service_1.BaseObservationSer
         return {
             systolic: bloodPressureRecord.systolic.inMillimetersOfMercury,
             diastolic: bloodPressureRecord.diastolic.inMillimetersOfMercury,
-            measurementTypeKey: types_1.MeasurementTypeKey.bloodPressure,
+            measurementTypeKey: MeasurementTypes_1.MeasurementTypeKey.bloodPressure,
         };
     }
 }

package/dist/client/observation/services/component-observation-services.d.ts

@@ -1,5 +1,5 @@
 import { CodeableConcept, Observation, ObservationComponent } from "@medplum/fhirtypes";
-import { Measurement, MeasurementTypeKey, ObservationCode } from "../../../types";
+import { Measurement, MeasurementTypeKey, ObservationCode } from "../../../types/MeasurementTypes";
 import { RecordResult, RecordType } from "../types/generate-measurement/HealthConnectTypes";
 import { Sample } from "../types/generate-measurement/Sample";
 import { ObservationFragment } from "../types/generate-observation-body/ObservationFragment";

package/dist/client/observation/services/component-observation-services.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.respiratoryTherapyService = exports.babySleepService = void 0;
-const types_1 = require("../../../types");
+const MeasurementTypes_1 = require("../../../types/MeasurementTypes");
 const base_observation_service_1 = require("./base-observation-service");
 const measurement_time_1 = require("./measurement-time");
 const MEASUREMENT_TYPE_SYSTEM = "https://sdk.ovok.com/fhir/CodeSystem/measurement-type";
@@ -63,7 +63,7 @@ class ComponentObservationService extends base_observation_service_1.BaseObserva
         };
     }
 }
-const babySleepService = () => new ComponentObservationService(types_1.MeasurementTypeKey.babySleep, "baby sleep", types_1.ObservationCode.BABY_SLEEP);
+const babySleepService = () => new ComponentObservationService(MeasurementTypes_1.MeasurementTypeKey.babySleep, "baby sleep", MeasurementTypes_1.ObservationCode.BABY_SLEEP);
 exports.babySleepService = babySleepService;
-const respiratoryTherapyService = () => new ComponentObservationService(types_1.MeasurementTypeKey.respiratoryTherapy, "respiratory therapy", types_1.ObservationCode.RESPIRATORY_THERAPY);
+const respiratoryTherapyService = () => new ComponentObservationService(MeasurementTypes_1.MeasurementTypeKey.respiratoryTherapy, "respiratory therapy", MeasurementTypes_1.ObservationCode.RESPIRATORY_THERAPY);
 exports.respiratoryTherapyService = respiratoryTherapyService;

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

@@ -1,4 +1,4 @@
-import { MeasurementTypeKey } from "../../../types";
+import { MeasurementTypeKey } from "../../../types/MeasurementTypes";
 import { IObservationService } from "../types/IObservationService";
 export declare class ObservationServiceCreator {
     private static instance;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObservationServiceCreator = void 0;
-const types_1 = require("../../../types");
+const MeasurementTypes_1 = require("../../../types/MeasurementTypes");
 const blood_oxygen_1 = require("./blood-oxygen");
 const blood_pressure_1 = require("./blood-pressure");
 const component_observation_services_1 = require("./component-observation-services");
@@ -15,15 +15,15 @@ class ObservationServiceCreator {
         const uricAcid = new uric_acid_service_1.UricAcidService();
         this.services = new Map([
             ...(0, single_value_services_1.singleValueObservationServices)(),
-            [types_1.MeasurementTypeKey.bloodPressure, new blood_pressure_1.BloodPressureService()],
-            [types_1.MeasurementTypeKey.bloodOxygenPulseRate, new blood_oxygen_1.BloodOxygenService()],
-            [types_1.MeasurementTypeKey.ecg, new ecg_1.EcgService()],
-            [types_1.MeasurementTypeKey.stepCount, new step_count_1.StepCountService()],
-            [types_1.MeasurementTypeKey.urineAnalysis, uricAcid],
-            [types_1.MeasurementTypeKey.uricAcid, uricAcid],
-            [types_1.MeasurementTypeKey.lipidPanel, new lipid_panel_1.LipidPanelService()],
-            [types_1.MeasurementTypeKey.respiratoryTherapy, (0, component_observation_services_1.respiratoryTherapyService)()],
-            [types_1.MeasurementTypeKey.babySleep, (0, component_observation_services_1.babySleepService)()],
+            [MeasurementTypes_1.MeasurementTypeKey.bloodPressure, new blood_pressure_1.BloodPressureService()],
+            [MeasurementTypes_1.MeasurementTypeKey.bloodOxygenPulseRate, new blood_oxygen_1.BloodOxygenService()],
+            [MeasurementTypes_1.MeasurementTypeKey.ecg, new ecg_1.EcgService()],
+            [MeasurementTypes_1.MeasurementTypeKey.stepCount, new step_count_1.StepCountService()],
+            [MeasurementTypes_1.MeasurementTypeKey.urineAnalysis, uricAcid],
+            [MeasurementTypes_1.MeasurementTypeKey.uricAcid, uricAcid],
+            [MeasurementTypes_1.MeasurementTypeKey.lipidPanel, new lipid_panel_1.LipidPanelService()],
+            [MeasurementTypes_1.MeasurementTypeKey.respiratoryTherapy, (0, component_observation_services_1.respiratoryTherapyService)()],
+            [MeasurementTypes_1.MeasurementTypeKey.babySleep, (0, component_observation_services_1.babySleepService)()],
         ]);
     }
     static getInstance() {

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

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

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

@@ -1,5 +1,5 @@
 import { Observation } from "@medplum/fhirtypes";
-import { EcgMeasurement, Measurement, MeasurementTypeKey } from "../../../types";
+import { EcgMeasurement, Measurement, MeasurementTypeKey } from "../../../types/MeasurementTypes";
 import { ObservationFragment } from "../types/generate-observation-body/ObservationFragment";
 import { ObservationValue } from "../types/generate-observation-body/ObservationValue";
 import { ObservationMetadata } from "../types/service/ObservationMetadata";

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

@@ -1,18 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EcgService = void 0;
-const types_1 = require("../../../types");
+const MeasurementTypes_1 = require("../../../types/MeasurementTypes");
 const fhir_systems_1 = require("../fhir-systems");
 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);
-        this.measurementTypeKey = types_1.MeasurementTypeKey.ecg;
+        this.measurementTypeKey = MeasurementTypes_1.MeasurementTypeKey.ecg;
         this.measurementTypeName = "ECG";
         this.observationMetadata = [
             {
-                primaryCode: types_1.ObservationCode.ECG,
+                primaryCode: MeasurementTypes_1.ObservationCode.ECG,
                 additionalCodes: [],
                 display: "ECG",
                 unit: "mV",
@@ -20,8 +20,8 @@ class EcgService extends base_observation_service_1.BaseObservationService {
                 toFixed: 0,
             },
             {
-                primaryCode: types_1.ObservationCode.ECG_HEART_RATE,
-                additionalCodes: [types_1.ObservationCode.HEART_RATE],
+                primaryCode: MeasurementTypes_1.ObservationCode.ECG_HEART_RATE,
+                additionalCodes: [MeasurementTypes_1.ObservationCode.HEART_RATE],
                 display: "ECG Heart Rate",
                 unit: "bpm",
                 valueKey: "heartRate",
@@ -54,7 +54,7 @@ class EcgService extends base_observation_service_1.BaseObservationService {
                 valueQuantity: {
                     value: Number(fixedValue),
                     unit: "bpm",
-                    code: types_1.ObservationCode.ECG_HEART_RATE,
+                    code: MeasurementTypes_1.ObservationCode.ECG_HEART_RATE,
                     system: fhir_systems_1.LOINC_SYSTEM,
                 },
             });
@@ -112,14 +112,14 @@ class EcgService extends base_observation_service_1.BaseObservationService {
     }
     convertSamplesToMeasurement() {
         return {
-            diagnosticResult: types_1.EcgDiagnosticFlag.REGULAR,
-            measurementTypeKey: types_1.MeasurementTypeKey.ecg,
+            diagnosticResult: MeasurementTypes_1.EcgDiagnosticFlag.REGULAR,
+            measurementTypeKey: MeasurementTypes_1.MeasurementTypeKey.ecg,
         };
     }
     convertRecordToMeasurement() {
         return {
-            diagnosticResult: types_1.EcgDiagnosticFlag.REGULAR,
-            measurementTypeKey: types_1.MeasurementTypeKey.ecg,
+            diagnosticResult: MeasurementTypes_1.EcgDiagnosticFlag.REGULAR,
+            measurementTypeKey: MeasurementTypes_1.MeasurementTypeKey.ecg,
         };
     }
 }

package/dist/client/observation/services/lipid-panel.d.ts

@@ -1,5 +1,5 @@
 import { Observation } from "@medplum/fhirtypes";
-import { LipidPanelMeasurement, Measurement, MeasurementTypeKey, ObservationCode } from "../../../types";
+import { LipidPanelMeasurement, Measurement, MeasurementTypeKey, ObservationCode } from "../../../types/MeasurementTypes";
 import { RecordResult, RecordType } from "../types/generate-measurement/HealthConnectTypes";
 import { Sample } from "../types/generate-measurement/Sample";
 import { ObservationFragment } from "../types/generate-observation-body/ObservationFragment";