diff --git a/package-lock.json b/package-lock.json index 4ce4d62..95a06bf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "app", - "version": "1.1.44", + "version": "1.2.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "app", - "version": "1.1.44", + "version": "1.2.5", "dependencies": { "@fontsource-variable/plus-jakarta-sans": "^5.2.8", "@hookform/resolvers": "^5.2.2", diff --git a/package.json b/package.json index 1d87f58..f5fa8db 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "app", "private": true, - "version": "1.2.4", + "version": "1.2.5", "type": "module", "scripts": { "dev": "vite", diff --git a/src/App.tsx b/src/App.tsx index ade7c6d..6720eb1 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -2360,16 +2360,15 @@ function App() { return `${formatPatientHeader(patient)}\nNo orders in selected window.` } - const { main } = parseServiceLines(patient.service) - - return scoped - .map((entry) => [ - formatPatientHeader(patient), - `${main} – ${formatDateMMDD(entry.orderDate)} ${formatClock(entry.orderTime)}`, - '', - entry.orderText, - ].join('\n')) - .join('\n\n') + const lines = [formatPatientHeader(patient)] + + scoped.forEach((entry) => { + const orderDateTime = `${formatDateMMDD(entry.orderDate)} ${formatClock(entry.orderTime)}` + const header = [entry.service?.trim(), orderDateTime].filter(Boolean).join(' – ') + lines.push([header, entry.orderText].filter(Boolean).join('\n')) + }) + + return lines.join('\n\n') } const toMedicationsSummary = (patient: Patient, medicationEntries: MedicationEntry[]) => {