renalware-core 2.0.24 → 2.0.25

data/app/models/renalware/admissions/consult_query.rb

@@ -10,6 +10,7 @@ module Renalware
       def initialize(query = nil)
         @query = query || {}
         @query[:ended_on_null] ||= true
+        @query[:s] ||= "hospital_ward_name"
       end
 
       def call
@@ -20,6 +21,7 @@ module Renalware
       # It might be better to refactor PatientsRansackHelper so we can include where required
       # eg below using .extending(PatientsRansackHelper) rather than relying on it being in
       # included in the model file.
+      # rubocop:disable Metrics/MethodLength
       def search
         @search ||= begin
           Consult
@@ -35,6 +37,7 @@ module Renalware
             .ransack(query)
         end
       end
+      # rubocop:enable Metrics/MethodLength
     end
   end
 end

data/app/models/renalware/feeds/message_processor.rb

@@ -27,6 +27,11 @@ module Renalware
         MessageParser.new.parse(raw_message)
       end
 
+      # If the incoming message has already been processed we should not be processing it again.
+      # To help enforce this there is a unique MD5 hash on feed_messages which will baulk if the
+      # same message payload is saved twice - in this case we exit #call early, the broadcast
+      # is not issued and therefore the message is not processed. The message will go back into
+      # the delayed_job queue and retry, failing until it finally gives up!
       def persist_message(message_payload)
         PersistMessage.new.call(message_payload)
       end

data/app/models/renalware/feeds/persist_message.rb

@@ -6,11 +6,14 @@ module Renalware
   module Feeds
     class PersistMessage
       # message_payload is an HL7Message (a decorator around ::HL7::Message)
+      # If the same message is persisted twice we'll get an ActiveRecord::RecordNotUnique error
+      # but that's fine as we don't want to process the same HL7 message twice.
       def call(message_payload)
         Message.create!(
           event_code: message_payload.type,
           header_id: message_payload.header_id,
-          body: message_payload.to_s
+          body: message_payload.to_s,
+          body_hash: Digest::MD5.hexdigest(message_payload.to_s)
         )
       end
     end

data/app/models/renalware/renal.rb

@@ -4,7 +4,7 @@ require_dependency "renalware"
 
 module Renalware
   module Renal
-    AKI_ALERT_FILTERS = %w(today all).freeze
+    AKI_ALERT_FILTERS = %w(today all hotlist).freeze
 
     def self.table_name_prefix
       "renal_"

data/app/models/renalware/renal/aki_alert.rb

@@ -16,6 +16,7 @@ module Renalware
       alias_attribute :decided_by, :updated_by
 
       scope :today, ->{ where(created_at: Time.zone.today.all_day) }
+      scope :hotlist, ->{ where(hotlist: true) }
     end
   end
 end

data/app/presenters/renalware/admissions/admission_presenter.rb

@@ -22,7 +22,7 @@ module Renalware
         ward = hospital_ward || NullObject.instance
         [
           ward.hospital_unit.unit_code,
-          ward.name
+          [ward.name, ward.code].reject.first
         ].compact.join(" / ")
       end
 

data/app/views/renalware/admissions/consults/_filters.html.slim

@@ -11,11 +11,16 @@
         = f.input :consult_site_id_eq,
                   collection: Renalware::Admissions::ConsultSite.pluck(:name, :id),
                   label: "Site"
-      .columns.medium-2.large-1
+      .columns.medium-1.large-1
         = f.input :seen_by_id_eq,
                   include_blank: false,
                   collection: [["Anyone", nil], ["Me", current_user.id]],
                   label: "Seen by"
+      .columns.medium-1.large-1
+        = f.input :rrt_eq,
+                  include_blank: true,
+                  collection: [["Yes", true], ["No", false]],
+                  label: "RRT"
       .columns.medium-1.large-1
         = f.input :aki_risk_eq,
                   include_blank: true,
@@ -26,6 +31,10 @@
                   include_blank: true,
                   collection: [["Yes", true], ["No", false]],
                   label: "Active"
+      .columns.medium-2.large-2
+        = f.input :patient_current_modality_description_id_eq,
+                  collection: Renalware::Modalities::Description.pluck("name", "id"),
+                  label: "Modality"
       .columns.medium-2.large-2.actions.end
         = f.submit "Filter", class: "button"
         span= " or "

data/app/views/renalware/admissions/consults/_filters.pdf.slim

@@ -0,0 +1,32 @@
+// Compile a summary of filters applied. Leave out anything not set.
+- filters = params.fetch(:q, {}).reject{ |key, value| value.blank? }
+
+.filter-summary
+  table
+    tr
+      th Filters
+      - if filters.empty?
+        td None
+      - else
+        - if filters[:identity_match].present?
+          th Query:
+          td= filters[:identity_match]
+        - if filters[:consult_site_id_eq].present?
+          th Site:
+          td= Renalware::Admissions::ConsultSite.find_by(id: filters[:consult_site_id_eq]).name
+        - if filters[:rrt_eq].present?
+          th RRT:
+          td= yes_no(filters[:rrt_eq] == "true")
+        - if filters[:seen_by_id_eq].present?
+          th Seen By:
+          td= Renalware::User.find(filters[:seen_by_id_eq])&.to_s
+        - if filters[:aki_risk_eq].present?
+          th AKI Risk:
+          td= yes_no(filters[:ended_on_null]&.humanize)
+        - if filters[:ended_on_null].present?
+          th Active:
+          td= yes_no(filters[:ended_on_null] == "true")
+        - modality_id = filters[:patient_current_modality_description_id_eq]
+        - if modality_id.present?
+          th Modality:
+          td= Renalware::Modalities::Description.where(id: modality_id).first&.name

data/app/views/renalware/admissions/consults/_table.html.slim

@@ -7,10 +7,8 @@
           = sort_link(query, :patient, ["patient_family_name", "patient_given_name asc"], "Patient")
         th.col-width-nhs-no.noprint NHS No.
         th.col-width-reference-no Hosp Nos.
-        th.col-width-medium= sort_link(query,
-                                      :location,
-                                      [:consult_site_name, :hospital_ward_name],
-                                      "Location")
+        th.col-width-medium= sort_link(query, :hospital_ward_name, "Ward")
+        th.col-width-tiny RRT
         th.col-width-date.noprint= sort_link(query, :started_on, "Started")
         th.col-width-date.noprint= sort_link(query, :ended_on, "Ended")
         th.col-width-small.show-for-large-up
@@ -19,13 +17,11 @@
         th.col-width-date.show-for-large-up= sort_link(query, :patient_born_on, "DOB")
         th.col-width-tiny.show-for-large-up Age
         th.col-width-tiny.noprint= sort_link(query, :aki_risk, "AKI Risk")
-        /th.show-for-large-up Author
-        /th.col-width-medium.show-for-xlarge-up Description
 
     tbody
       - consults.each do |consult|
         - uid = "consult-#{consult.id}"
-        tr
+        tr.keep-with-next
           td.actions-dropdown.going-right.noprint
             / As we have lots of possible actions, group them in a button group.
             / A wrapping div is required for now in order for the button group display correctly
@@ -61,7 +57,8 @@
           td= default_patient_link(consult.patient)
           td.noprint= consult.patient_nhs_number
           td= consult.patient_hospital_identifiers&.to_s_multiline
-          td= consult.location
+          td= consult.hospital_ward
+          td= yes_no(consult.rrt?)
           td.noprint= l(consult.started_on)
           td.noprint= l(consult.ended_on)
           td.show-for-large-up.col-width-medium-with-ellipsis= consult.patient_current_modality
@@ -82,3 +79,7 @@
                 dt Description
                 dd= simple_format consult.description
           td
+        / When printing we just show the notes on the second row
+        tr.print-only.child-row
+          td(colspan=12)= simple_format consult.description
+

data/app/views/renalware/admissions/consults/_table.pdf.slim

@@ -0,0 +1,35 @@
+table
+  thead
+    tr
+      th.col-width-large PATIENT
+      th.col-width-reference-no HOSP NOs.
+      th.col-width-large LOCATION
+      th MODALITY
+      th.col-width-tiny SEX
+      th.col-width-date DOB
+
+  - consults.each do |consult|
+    tr
+      / Nested tables. Yum. But necessary to get wkhtml2pdf to avoid orphaning the
+      / second 'notes' row (using css - see class definition) from the first 'patient details' row.
+      / When having just one table with 2 rows per consult, wkhtml2pdf sometimes breaks a page
+      / between the 2 rows when we really want to keep them together. Using a table like this and
+      / applying page-break-inside: avoid to it we can avoid this problem. The downside is that the
+      / columns may not always line up exactly if the content is wide.
+      table.nested-table-in-order-to-prevent-orphaned-rows.spacy
+        tbody
+          tr.consult-details
+            td.col-width-large
+              b= consult.patient.to_s(:default)
+            td.col-width-reference-no= consult.patient_hospital_identifiers&.to_s_multiline
+            td.col-width-large
+              - unit = consult.hospital_ward&.hospital_unit
+              = [unit&.unit_code,
+                 consult&.hospital_ward,
+                 consult.other_site_or_ward].compact.join(" / ")
+            td= consult.patient_current_modality
+            td.col-width-tiny= consult.patient_sex
+            td.col-width-date= l(consult.patient.born_on)
+
+          tr.consult-notes
+            td(colspan=6)= simple_format consult.description

data/app/views/renalware/admissions/consults/index.html.slim

@@ -2,8 +2,15 @@
 
 = content_for(:actions) do
   = link_to("Add", new_admissions_consult_path, class: :button)
+  = link_to(admissions_consults_path(q: params[:q]&.permit!, format: :pdf), class: "button secondary") do
+    i.fa.fa-print
+    | Print (PDF)
+  /data: { target: admissions_consults_path(format: :pdf)
 
 = within_admin_layout(title: "Admission Consults") do
+  = render "renalware/shared/please_print_using_print_button_warning"
+  = render "renalware/admissions/requests/modal_dialog_placeholder"
+
   .panel.radius.compact
     | If the patient is not on Renalware yet, please 
     = link_to("add them", new_patient_path)

data/app/views/renalware/admissions/consults/index.pdf.slim

@@ -0,0 +1,10 @@
+- content_for(:head) do
+  = wicked_pdf_stylesheet_link_tag "renalware/table_pdf"
+
+.pdf
+  .header
+    h1 Admission Consults
+    h2.muted= I18n.l(Time.zone.today)
+  = render "filters"
+  = render "table", consults: consults
+

data/app/views/renalware/hd/sessions/_empty_row.html.slim

@@ -19,6 +19,7 @@ tr.empty-session-row.first
   td(rowspan=2)
   td(rowspan=2)
   td(rowspan=2)
+  td
 tr.empty-session-row
   td
   td
@@ -27,3 +28,4 @@ tr.empty-session-row
   td
   td
   td
+  td

data/app/views/renalware/hd/sessions/_row.html.slim

@@ -18,7 +18,9 @@ tr.hd-session-row(class=[session.state, stripe_class])
   td(rowspan=2)= session.machine_no
   td(rowspan=2)= session.machine_ktv
   td(rowspan=2)= session.machine_urr
+  td.print-only(rowspan=2)
   td.print-only(rowspan=2)= session.notes
+  td.print-only
 
 tr(class=[session.state, stripe_class])
   td= tooltip(label: session.summarised_access_used, content: session.access_used)
@@ -31,3 +33,4 @@ tr(class=[session.state, stripe_class])
   td= session.after_measurement_for(:temperature)
   td= session.after_measurement_for(:bm_stix)
   td= session.after_measurement_for(:blood_pressure)
+  td.print-only

data/app/views/renalware/hd/sessions/_show.html.slim

@@ -1,6 +1,6 @@
 .document-view
-  .row
-    .columns.large-6
+  .grid
+    .row
       = render "renalware/shared/attributes_group",
           legend: "Sign-In", destination: "signin",
           models: { session => [:performed_on,
@@ -28,7 +28,6 @@
           group: session.document.observations_after,
           legend: "Post-Dialysis Observations", destination: "after"
 
-    .columns.large-6
       - %W(Dialysis HDF).each do |group|
         = render "renalware/shared/documents/attributes_group",
             group: session.document.public_send(group.parameterize(separator: "_")),
@@ -39,6 +38,6 @@
           legend: "Notes/Complications", destination: "complications",
           models: { session.document.complications => attributes_list,
                     session => [:notes] }
-  .row
-    .columns.large-12
-      = render "prescription_administrations", session: session
+    .row
+      .columns
+        = render "prescription_administrations", session: session

data/app/views/renalware/hd/sessions/_thead.html.slim

@@ -18,6 +18,8 @@ thead
     th.col-width-tiny.text-center(colspan=3)= t(".machine")
     th.col-width-drugs.text-center.print-only(rowspan=3)= t(".hd_drugs_administered")
     th.col-width-notes.text-center.print-only(rowspan=3)= t(".notes")
+    th.col-width-user.text-center.print-only= t(".user")
+
 
   tr.row2
     th(rowspan=2)= t(".access")
@@ -30,6 +32,7 @@ thead
     th.col-width-minute.col-width-tiny(rowspan=2)=t(".machine_no")
     th.col-width-minute.col-width-tiny(rowspan=2)=t(".machine_ktv")
     th.col-width-minute.col-width-tiny(rowspan=2)=t(".machine_urr")
+    th.print-only= t(".put_on_by")
   tr.row2
     th.col-width-time= t(".end_time")
     th= t(".post_with_changed")
@@ -37,3 +40,4 @@ thead
     th= t(".post")
     th= t(".post")
     th= t(".post")
+    th.print-only= t(".taken_off_by")

data/app/views/renalware/layouts/pdf.pdf.slim

@@ -4,8 +4,8 @@ html
     meta content=("text/html; charset=UTF-8") http-equiv="Content-Type" /
     meta charset="utf-8" /
 
-    = wicked_pdf_stylesheet_link_tag "renalware/pdf"
     = yield(:head)
+    = wicked_pdf_stylesheet_link_tag "renalware/pdf"
 
   body
     = yield

data/app/views/renalware/letters/contacts/_edit.html.slim

@@ -15,7 +15,7 @@
                       remote: true,
                       wrapper: :horizontal_form) do |f|
 
-      = f.input :default_cc, as: :inline_radio_buttons
+      = f.input :default_cc, as: :inline_radio_buttons, readonly: nil
       = f.input :description_id, collection: contact_descriptions
       = f.input :other_description
       = f.input :notes, as: :text

data/app/views/renalware/renal/aki_alerts/_filters.pdf.slim

@@ -0,0 +1,25 @@
+// Compile a summary of filters applied. Leave out anything not set.
+- filters = params.fetch(:q, {}).reject{ |key, value| value.blank? }
+
+.filter-summary
+  table
+    tr
+      th Filters
+      - if filters.empty?
+        td None
+      - else
+        - if filters[:term].present?
+          th Query:
+          td= filters[:term]
+        - if filters[:on_hotlist].present?
+          th On Hotlist:
+          td= yes_no(filters[:on_hotlist] == "true")
+        - if filters[:action].present?
+          th Action:
+          td=  Renalware::Renal::AKIAlertAction.find(filters[:action])&.to_s
+        - if filters[:hospital_unit_id].present?
+          th Site:
+          td= Renalware::Hospitals::Unit.find_by(id: filters[:hospital_unit_id])
+        - if filters[:hospital_ward_id].present?
+          th Ward:
+          td= Renalware::Hospitals::Ward.find_by(id: filters[:hospital_ward_id])

data/app/views/renalware/renal/aki_alerts/_table.pdf.slim

@@ -0,0 +1,29 @@
+table
+  thead
+    tr
+      th.col-width-large PATIENT
+      th.col-width-reference-no HOSP NOs.
+      th.col-width-medium WARD
+      th MODALITY
+      th.col-width-tiny CRE
+      th.col-width-date CRE DATE
+      th.col-width-tiny SEX
+      th.col-width-date DOB
+
+  - alerts.each do |alert|
+    tr
+      table.nested-table-in-order-to-prevent-orphaned-rows.spacy
+        tbody
+          tr.alert-details
+            td.col-width-large
+              b= alert.patient.to_s(:default)
+            td.col-width-reference-no= alert.patient&.hospital_identifiers&.to_s_multiline
+            td.col-width-medium= alert.hospital_ward
+            td= alert.patient&.current_modality
+            td.col-width-tiny= alert.max_cre
+            td.col-width-date= I18n.l(alert.cre_date)
+            td.col-width-tiny= alert.patient&.sex
+            td.col-width-date= l(alert.patient&.born_on)
+
+          tr.alert-notes
+            td(colspan=8)= simple_format alert.notes

data/app/views/renalware/renal/aki_alerts/edit.html.slim

@@ -7,7 +7,7 @@
           as: :grouped_select,
           group_method: :wards,
           collection: Renalware::Hospitals::Unit.includes(:wards).ordered,
-          label_method: :to_s,
+          label_method: ->(ward){ [ward.name, ward.code].compact.join(" - ") },
           wrapper: :horizontal_medium
     = f.input :hotlist, wrapper: :horizontal_small, as: :inline_radio_buttons
     = f.input :max_cre, wrapper: :horizontal_small

data/app/views/renalware/renal/aki_alerts/index.html.slim

@@ -1,4 +1,14 @@
+= content_for(:actions) do
+  / Make sure when generating the PDF we pass in exactly the same params eg q and named_filter
+  / An alternative to what we have used here is to use
+  /   url_for(request.filtered_parameters&.merge({format: :pdf})
+  / however this seems to loose the ransack sort option in  params[:q][:s]
+  = link_to(renal_filtered_aki_alerts_path(q: params[:q]&.permit!, format: :pdf), class: "button secondary") do
+    i.fa.fa-print
+    | Print (PDF)
+
 = within_admin_layout(title: "AKI Alerts") do
+  = render "renalware/shared/please_print_using_print_button_warning"
   = render "filters", form: form, path_params: path_params
   = render "table", alerts: alerts, search: search
 

data/app/views/renalware/renal/aki_alerts/index.pdf.slim

@@ -0,0 +1,14 @@
+- content_for(:head) do
+  = wicked_pdf_stylesheet_link_tag "renalware/table_pdf"
+
+.pdf
+  .header
+    h1 AKI Alerts
+    - if params[:named_filter].present?
+      h1.muted
+        |  / 
+        = params[:named_filter]&.humanize
+    h2.muted= I18n.l(Time.zone.today)
+  = render "filters"
+  = render "table", alerts: alerts
+