diff --git a/app/config.js b/app/config.js index 3f2ac515..8b00e2a3 100644 --- a/app/config.js +++ b/app/config.js @@ -78,6 +78,6 @@ module.exports = { generation: { numberOfParticipants: 1000, bookingProbability: 0.8, // 80% of slots are booked - previousMammogramRate: 0.05 // Rate of completed events with reported previous mammograms + previousMammogramRate: 0.05 // Rate of completed events with recorded previous mammograms } } diff --git a/app/lib/generators/event-generator.js b/app/lib/generators/event-generator.js index 3867dc49..da305fe0 100644 --- a/app/lib/generators/event-generator.js +++ b/app/lib/generators/event-generator.js @@ -311,7 +311,7 @@ const generateEvent = ({ } } - // Generate previous mammograms (reported mammograms from other facilities) + // Generate previous mammograms (recorded mammograms from other facilities) const previousMammograms = generatePreviousMammograms({ eventDate: event.timing.actualEndTime || event.timing.actualStartTime, addedByUserId: event.sessionDetails.startedBy, diff --git a/app/lib/generators/previous-mammogram-generator.js b/app/lib/generators/previous-mammogram-generator.js index 58ea3cb9..0366e3bc 100644 --- a/app/lib/generators/previous-mammogram-generator.js +++ b/app/lib/generators/previous-mammogram-generator.js @@ -259,7 +259,7 @@ const generatePreviousMammograms = ({ eventDate, addedByUserId, rate }) => { ? rate : (config.generation?.previousMammogramRate ?? 0.2) - // Decide whether this event has reported mammograms + // Decide whether this event has recorded mammograms if (Math.random() > effectiveRate) { return null } diff --git a/app/lib/generators/reading-generator.js b/app/lib/generators/reading-generator.js index 37a0211d..acdf40b7 100644 --- a/app/lib/generators/reading-generator.js +++ b/app/lib/generators/reading-generator.js @@ -23,11 +23,11 @@ const DEFAULT_READ_WEIGHTS = { // Normal opinion freetext reasons when participant has symptoms const NORMAL_DETAILS_WITH_SYMPTOMS = [ - 'Images reviewed carefully in the context of reported symptoms. No mammographic abnormality identified. Clinical follow-up recommended for symptoms.', + 'Images reviewed carefully in the context of disclosed symptoms. No mammographic abnormality identified. Clinical follow-up recommended for symptoms.', 'Thorough review of all views performed. No significant mammographic findings. Symptoms noted but no corresponding imaging abnormality detected.', 'Normal mammographic appearance bilaterally. Symptoms have been considered in this assessment. No imaging correlate found.', - 'Careful assessment undertaken given reported symptoms. Mammographic appearances are within normal limits. Clinical assessment advised.', - 'No mammographic abnormality detected on careful review. Reported symptoms do not have a mammographic correlate. Recommend clinical follow-up.' + 'Careful assessment undertaken given disclosed symptoms. Mammographic appearances are within normal limits. Clinical assessment advised.', + 'No mammographic abnormality detected on careful review. Disclosed symptoms do not have a mammographic correlate. Recommend clinical follow-up.' ] // Normal opinion freetext reasons without symptoms (used for a small proportion) diff --git a/app/lib/utils/prior-mammograms.js b/app/lib/utils/prior-mammograms.js index 86d753aa..7e268fd1 100644 --- a/app/lib/utils/prior-mammograms.js +++ b/app/lib/utils/prior-mammograms.js @@ -1,13 +1,13 @@ // app/lib/utils/prior-mammograms.js // -// Utility functions for working with prior mammograms (previously reported +// Utility functions for working with prior mammograms (previously recorded // mammograms from other facilities). These derive event-level state from // per-mammogram request tracking on event.previousMammograms[]. const { formatDate, formatRelativeDate } = require('./dates') -/** Returns true if the event has any previously reported mammograms */ -const hasReportedMammograms = (event) => { +/** Returns true if the event has any previously recorded mammograms */ +const hasRecordedMammograms = (event) => { if (!event) return false return ( Array.isArray(event.previousMammograms) && @@ -17,7 +17,7 @@ const hasReportedMammograms = (event) => { /** Returns true if any prior mammogram has requestStatus 'pending' or 'requested' (holds case from reading) */ const awaitingPriors = (event) => { - if (!hasReportedMammograms(event)) return false + if (!hasRecordedMammograms(event)) return false return event.previousMammograms.some( (m) => m.requestStatus === 'pending' || m.requestStatus === 'requested' ) @@ -25,7 +25,7 @@ const awaitingPriors = (event) => { /** Returns true if any prior mammogram has requestStatus 'not_requested' */ const hasUnrequestedPriors = (event) => { - if (!hasReportedMammograms(event)) return false + if (!hasRecordedMammograms(event)) return false return event.previousMammograms.some( (m) => m.requestStatus === 'not_requested' ) @@ -38,7 +38,7 @@ const hasUnrequestedPriors = (event) => { * @returns {{total: number, counts: object, hasAwaiting: boolean, hasUnrequested: boolean, allResolved: boolean}} */ const getPriorsSummary = (event) => { - if (!hasReportedMammograms(event)) { + if (!hasRecordedMammograms(event)) { return { total: 0, counts: {}, @@ -82,7 +82,7 @@ const getPriorsSummary = (event) => { /** Get priors with requestStatus 'not_requested' (for the request priors UI) */ const getUnrequestedPriors = (event) => { - if (!hasReportedMammograms(event)) return [] + if (!hasRecordedMammograms(event)) return [] return event.previousMammograms.filter( (m) => m.requestStatus === 'not_requested' ) @@ -90,7 +90,7 @@ const getUnrequestedPriors = (event) => { /** Get priors with requestStatus 'pending' or 'requested' (awaiting arrival) */ const getAwaitingPriors = (event) => { - if (!hasReportedMammograms(event)) return [] + if (!hasRecordedMammograms(event)) return [] return event.previousMammograms.filter( (m) => m.requestStatus === 'pending' || m.requestStatus === 'requested' ) @@ -101,7 +101,7 @@ const getAwaitingPriors = (event) => { * Only 'pending' is checked — once admin moves to 'requested', the reader can no longer undo. */ const userRequestedPriors = (event, userId) => { - if (!hasReportedMammograms(event)) return false + if (!hasRecordedMammograms(event)) return false return event.previousMammograms.some( (m) => m.requestStatus === 'pending' && m.requestedBy === userId ) @@ -179,14 +179,14 @@ const summarisePriorMammogram = (mammogram, options = {}) => { * @returns {Array} Array of summary strings */ const summarisePriorMammograms = (event, options = {}) => { - if (!hasReportedMammograms(event)) return [] + if (!hasRecordedMammograms(event)) return [] return event.previousMammograms .map((m) => summarisePriorMammogram(m, options)) .filter(Boolean) } module.exports = { - hasReportedMammograms, + hasRecordedMammograms, awaitingPriors, hasUnrequestedPriors, getPriorsSummary, diff --git a/app/routes/events.js b/app/routes/events.js index fe8997eb..419636f3 100644 --- a/app/routes/events.js +++ b/app/routes/events.js @@ -1957,7 +1957,7 @@ module.exports = (router) => { } // Show combined success message - req.flash('success', 'Breast implants recorded and consent recorded') + req.flash('success', 'Breast implants added and consent recorded') // Continue to next step in the flow const returnUrl = getReturnUrl( diff --git a/app/views/_includes/cards/medical-information/symptoms.njk b/app/views/_includes/cards/medical-information/symptoms.njk index 4ce615ab..218b3bfe 100644 --- a/app/views/_includes/cards/medical-information/symptoms.njk +++ b/app/views/_includes/cards/medical-information/symptoms.njk @@ -7,7 +7,7 @@ {% if not hasSymptoms %} {% set insetHtml %} -

No symptoms have been recorded for this participant.

+

No symptoms have been added for this participant.

{% endset %} {{ insetText({ html: insetHtml @@ -32,4 +32,4 @@ headingLevel: "2", feature: false, descriptionHtml: symptomsCardHtml -}) }} \ No newline at end of file +}) }} diff --git a/app/views/_includes/medical-information/breast-features.njk b/app/views/_includes/medical-information/breast-features.njk index f8333e1f..aa40dbc6 100644 --- a/app/views/_includes/medical-information/breast-features.njk +++ b/app/views/_includes/medical-information/breast-features.njk @@ -8,7 +8,7 @@ {% if hasBreastFeatures %}

- {{ breastFeaturesCount }} breast {{ "feature" | pluralise(breastFeaturesCount) }} recorded + {{ breastFeaturesCount }} breast {{ "feature" | pluralise(breastFeaturesCount) }} added