renalware-core 2.0.64 → 2.0.67

data/app/presenters/renalware/clinical/dry_weight_presenter.rb

@@ -6,6 +6,10 @@ module Renalware
       def assessed_on
         ::I18n.l(super)
       end
+
+      def to_s
+        "#{weight} (#{assessed_on})"
+      end
     end
   end
 end

data/app/presenters/renalware/clinical/dry_weights_presenter.rb

@@ -14,18 +14,24 @@ module Renalware
         @weights = dry_weights # optional otherwise we grab them ourselves
       end
 
-      def weights
-        @weights ||= begin
-          Renalware::Clinical::DryWeight.for_patient(patient)
-                                        .includes(:assessor)
-                                        .limit(limit)
-                                        .ordered
+      def dry_weights
+        @dry_weights ||= begin
+          CollectionPresenter.new(
+            weights,
+            Renalware::Clinical::DryWeightPresenter
+          )
         end
       end
 
-      def dry_weights
-        @dry_weights ||= begin
-          CollectionPresenter.new(weights, Renalware::Clinical::DryWeightPresenter)
+      private
+
+      def weights
+        @weights ||= begin
+          Renalware::Clinical::DryWeight
+            .for_patient(patient)
+            .includes(:assessor)
+            .limit(limit)
+            .ordered
         end
       end
     end

data/app/presenters/renalware/ukrdc/modality_presenter.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Renalware
+  module UKRDC
+    class ModalityPresenter < SimpleDelegator
+    end
+  end
+end

data/app/presenters/renalware/ukrdc/patient_presenter.rb

@@ -2,15 +2,16 @@
 
 require_dependency "renalware"
 
+# rubocop:disable Metrics/ClassLength
 module Renalware
   module UKRDC
     class PatientPresenter < SimpleDelegator
+      UKRDC_MAX_PHONE_LEN = 80
       attr_reader :changes_since, :changes_up_until
       delegate :profile, to: :renal_patient, allow_nil: true
       delegate :first_seen_on, to: :profile, allow_nil: true
-      alias_attribute :home_telephone, :telephone1
-      alias_attribute :mobile_telephone, :telephone2
 
+      # rubocop:disable Metrics/MethodLength
       def initialize(patient, changes_since: nil)
         if changes_since.present? && changes_since.is_a?(String)
           changes_since = Time.zone.parse(changes_since)
@@ -28,6 +29,7 @@ module Renalware
         @changes_up_until = Time.zone.now
         super(patient)
       end
+      # rubocop:enable Metrics/MethodLength
 
       def language
         return if super.nil? || super.name == "Unknown"
@@ -35,6 +37,10 @@ module Renalware
         super
       end
 
+      def modalities
+        __getobj__.modalities.order(started_on: :asc)
+      end
+
       def dead?
         current_modality_death?
       end
@@ -77,10 +83,6 @@ module Renalware
         letter_head.site_code
       end
 
-      def contact_details?
-        email.present? || home_telephone.present? || mobile_telephone.present?
-      end
-
       def allergies
         clinical_patient
           .allergies
@@ -144,3 +146,4 @@ module Renalware
     end
   end
 end
+# rubocop:enable Metrics/ClassLength

data/app/views/renalware/api/ukrdc/patients/_clinical_relationships.xml.builder

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-xml = builder
+# xml = builder
 
-xml.ClinicalRelationships do
-  xml.comment! "Not supplied in RW 2.0"
-end
+# xml.ClinicalRelationships do
+#   xml.comment! "Not supplied in RW 2.0"
+# end

data/app/views/renalware/api/ukrdc/patients/_encounters.xml.builder

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-# xml = builder
+xml = builder
 
-# xml.Encounters do
-#   patient.finished_hd_sessions.each do |session|
-#     render "renalware/api/ukrdc/patients/encounters/hd_session",
-#            builder: xml,
-#            patient: patient,
-#            session: Renalware::HD::SessionPresenter.new(session)
-#   end
-# end
+xml.Encounters do
+  patient.modalities.each do |session|
+    render "renalware/api/ukrdc/patients/encounters/treatment",
+           builder: xml,
+           patient: patient,
+           session: Renalware::HD::SessionPresenter.new(session)
+  end
+end

data/app/views/renalware/api/ukrdc/patients/_family_histories.xml.builder

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-xml = builder
+# xml = builder
 
-xml.FamilyHistories do
-  xml.comment! "Not supplied in RW 2.0"
-end
+# xml.FamilyHistories do
+#   xml.comment! "Not supplied in RW 2.0"
+# end

data/app/views/renalware/api/ukrdc/patients/_patient.xml.builder

@@ -4,6 +4,7 @@
 # Things we are not going to include in RW2.0
 # - PersonToContact
 # - Occupation
+# - ContactDetails - these may contain data not relating to the patient
 #
 xml = builder
 path = "renalware/api/ukrdc/patients" # or "."
@@ -48,26 +49,6 @@ xml.Patient do
     end
   end
 
-  if patient.contact_details?
-    xml.ContactDetails do
-      if patient.email.present?
-        xml.ContactDetail(use: "NET") do
-          xml.Value patient.email
-        end
-      end
-      if patient.home_telephone.present?
-        xml.ContactDetail(use: "PRN") do
-          xml.Value patient.home_telephone
-        end
-      end
-      if patient.mobile_telephone.present?
-        xml.ContactDetail(use: "PRS") do
-          xml.Value patient.mobile_telephone
-        end
-      end
-    end
-  end
-
   xml.FamilyDoctor do
     xml.GPPracticeId patient.practice&.code
     xml.GPId patient.primary_care_physician&.code

data/app/views/renalware/api/ukrdc/patients/_program_memberships.xml.builder

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-xml = builder
+# xml = builder
 
-xml.ProgramMemberships do
-  xml.comment! "Not supplied in RW 2.0"
-end
+# xml.ProgramMemberships do
+#   xml.comment! "Not supplied in RW 2.0"
+# end

data/app/views/renalware/api/ukrdc/patients/_surveys.xml.builder

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-xml = builder
+# xml = builder
 
-xml.Surveys do
-  xml.comment! "Not supplied in RW 2.0"
-end
+# xml.Surveys do
+#   xml.comment! "Not supplied in RW 2.0"
+# end

data/app/views/renalware/api/ukrdc/patients/encounters/_hd_session.xml.builder

@@ -1,38 +1,38 @@
 # frozen_string_literal: true
 
-xml = builder
+# xml = builder
 
-xml.Treatment do
-  xml.EncounterNumber session.uuid
-  xml.comment! "TODO: EncounterType TBC"
-  xml.EncounterType "R"
-  xml.FromTime session.start_datetime&.to_datetime
-  xml.ToTime session.stop_datetime&.to_datetime
+# xml.Treatment do
+#   xml.EncounterNumber session.uuid
+#   xml.comment! "TODO: EncounterType TBC"
+#   xml.EncounterType "R"
+#   xml.FromTime session.start_datetime&.to_datetime
+#   xml.ToTime session.stop_datetime&.to_datetime
 
-  xml.HealthCareFacility do
-    xml.CodingStandard "ODS"
-    xml.Code session.hospital_unit_renal_registry_code
-    xml.Description session.hospital_unit_name
-  end
+#   xml.HealthCareFacility do
+#     xml.CodingStandard "ODS"
+#     xml.Code session.hospital_unit_renal_registry_code
+#     xml.Description session.hospital_unit_name
+#   end
 
-  xml.AdmitReason do
-    xml.comment! "AdmitReason 1 == Haemodialysis - TBC - may need to capture/derive"
-    xml.CodingStandard "CF_RR7_TREATMENT"
-    xml.Code "1"
-  end
+#   xml.AdmitReason do
+#     xml.comment! "AdmitReason 1 == Haemodialysis - TBC - may need to capture/derive"
+#     xml.CodingStandard "CF_RR7_TREATMENT"
+#     xml.Code "1"
+#   end
 
-  xml.EnteredAt do
-    xml.Code session.hospital_unit_renal_registry_code
-  end
+#   xml.EnteredAt do
+#     xml.Code session.hospital_unit_renal_registry_code
+#   end
 
-  xml.Attributes do
-    xml.HDP01 session.patient&.hd_profile&.schedule_definition&.days_per_week
-    xml.HDP02 session.duration
-    xml.HDP03 session.document.dialysis.flow_rate
-    xml.HDP04 session&.dialysate&.sodium_content
-    xml.QBL05 session.access_type
-    xml.comment! "ERF61 - defaulting to 5 if not present, as element is required"
-    xml.ERF61 patient.current_registration_status_rr_code || "5" # 5= not assessed
-    xml.PAT35 patient.first_seen_on
-  end
-end
+#   xml.Attributes do
+#     xml.HDP01 session.patient&.hd_profile&.schedule_definition&.days_per_week
+#     xml.HDP02 session.duration
+#     xml.HDP03 session.document.dialysis.flow_rate
+#     xml.HDP04 session&.dialysate&.sodium_content
+#     xml.QBL05 session.access_type
+#     xml.comment! "ERF61 - defaulting to 5 if not present, as element is required"
+#     xml.ERF61 patient.current_registration_status_rr_code || "5" # 5= not assessed
+#     xml.PAT35 patient.first_seen_on
+#   end
+# end

data/app/views/renalware/api/ukrdc/patients/encounters/_treatment.xml.builder

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+xml = builder
+
+xml.Treatment do
+  xml.FromTime modality.started_on
+  xml.ToTime modality.ended_on
+
+  xml.HealthCareFacility do
+    xml.CodingStandard "ODS"
+    xml.Code Renalware.config.ukrdc_site_code
+  end
+
+  # xml.AdmitReason do
+  #   xml.comment! "AdmitReason 1 == Haemodialysis - TBC - may need to capture/derive"
+  #   xml.CodingStandard "CF_RR7_TREATMENT"
+  #   xml.Code "1"
+  # end
+
+  # xml.EnteredAt do
+  #   xml.Code session.hospital_unit_renal_registry_code
+  # end
+
+  # xml.Attributes do
+  #   xml.HDP01 session.patient&.hd_profile&.schedule_definition&.days_per_week
+  #   xml.HDP02 session.duration
+  #   xml.HDP03 session.document.dialysis.flow_rate
+  #   xml.HDP04 session&.dialysate&.sodium_content
+  #   xml.QBL05 session.access_type
+  #   xml.comment! "ERF61 - defaulting to 5 if not present, as element is required"
+  #   xml.ERF61 patient.current_registration_status_rr_code || "5" # 5= not assessed
+  #   xml.PAT35 patient.first_seen_on
+  # end
+end

data/app/views/renalware/api/ukrdc/patients/lab_orders/_lab_order.xml.builder

@@ -38,7 +38,7 @@ xml.LabOrder do
   xml.OrderCategory do
     xml.Code request.description.code
   end
-  # xml.SpecimenCollectedTime request.requested_at.iso8601
+  xml.SpecimenCollectedTime request.requested_at&.iso8601
   # xml.SpecimenReceivedTime "TODO"
   xml.SpecimenSource request.description.bottle_type
   # xml.Duration "OBR:27.3 but no available in the example messages I have"

data/app/views/renalware/api/ukrdc/patients/show.xml.builder

@@ -23,7 +23,7 @@ xml.ukrdc(:PatientRecord, namespace_and_schema) do
   render "medications", builder: xml, patient: patient
   render "procedures", builder: xml, patient: patient
   render "documents", builder: xml, patient: patient
-  render "encounters", builder: xml, patient: patient
+  #render "encounters", builder: xml, patient: patient
   render "program_memberships", builder: xml, patient: patient
   render "clinical_relationships", builder: xml, patient: patient
   render "surveys", builder: xml, patient: patient

data/app/views/renalware/hd/mdm/_summary.html.slim

@@ -1,14 +1,22 @@
+- clinical_patient = Renalware::Clinical.cast_patient(mdm.patient)
+
 article
   header
     h2 Additional Information
 
   dl.dl-horizontal.xlarge
     dt Latest Pre mean BP
-    - if mdm.rolling_audit.present?
-      dd= "#{mdm.rolling_audit.pre_mean_systolic_blood_pressure.to_i} / #{mdm.rolling_audit.pre_mean_diastolic_blood_pressure.to_i}"
+    dd
+      - if mdm.rolling_audit.present?
+        = "#{mdm.rolling_audit.pre_mean_systolic_blood_pressure.to_i} / #{mdm.rolling_audit.pre_mean_diastolic_blood_pressure.to_i}"
     dt Latest Post mean BP
-    - if mdm.rolling_audit.present?
-      dd= "#{mdm.rolling_audit.post_mean_systolic_blood_pressure.to_i} / #{mdm.rolling_audit.post_mean_diastolic_blood_pressure.to_i}"
+    dd
+      - if mdm.rolling_audit.present?
+        = "#{mdm.rolling_audit.post_mean_systolic_blood_pressure.to_i} / #{mdm.rolling_audit.post_mean_diastolic_blood_pressure.to_i}"
+    dt Latest Dry Weight (kg)
+    dd
+      - if clinical_patient.dry_weights.latest.present?
+        = Renalware::Clinical::DryWeightPresenter.new(clinical_patient.dry_weights.latest)
 
     dt Latest URR
     dd

data/app/views/renalware/hd/protocols/_recent_pathology.html.slim

@@ -8,3 +8,7 @@ table.recent-pathology
       th.code PLT
       td.result= recent_pathology.plt_result
       td.observed_at= (l(recent_pathology.plt_observed_at))
+    tr
+      th.code CRP
+      td.result= recent_pathology.crp_result
+      td.observed_at= (l(recent_pathology.crp_observed_at))

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

@@ -114,6 +114,7 @@ ruby:
         locals: { legend: "Notes/Complications", name: "complications" } do
       = fd.simple_fields_for :complications, fd.object.complications do |fcm|
         = fcm.input :access_site_status, wrapper: :horizontal_small
+        = fcm.input :line_exit_site_status, wrapper: :horizontal_small
         = fcm.input :was_dressing_changed, as: :inline_radio_buttons, wrapper: :horizontal_small
         = fcm.input :had_mrsa_swab, as: :inline_radio_buttons, wrapper: :horizontal_small
         = fcm.input :had_mssa_swab, as: :inline_radio_buttons, wrapper: :horizontal_small

data/app/views/renalware/mdm/_prescription_buttons.html.slim

@@ -0,0 +1,15 @@
+= link_to patient_prescriptions_path(patient),
+            class: "button secondary",
+            target: "_blank" do
+    i.fa.fa-external-link-square-alt
+    | Update
+    end
+
+= link_to "View all",
+          patient_prescriptions_path(patient),
+          class: "button secondary"
+
+= link_to "Toggle",
+          "#prescriptions",
+          class: "button secondary",
+          data: { behaviour: "css-toggler" }

data/app/views/renalware/mdm/_prescriptions.html.slim

@@ -3,14 +3,7 @@ article
     h2= t(".title")
     .supplemental
       span= "#{mdm.current_prescriptions.length} of #{mdm.patient.summary.prescriptions_count}"
-      = link_to t(".view_all"),
-                patient_prescriptions_path(mdm.patient),
-                class: "button secondary"
-
-      = link_to "Toggle",
-                "#prescriptions",
-                class: "button secondary",
-                data: { behaviour: "css-toggler" }
+      = render "prescription_buttons", patient: mdm.patient
 
   #prescriptions.expandable
     - if local_assigns[:with_esa] == true

data/app/views/renalware/patients/bookmarks/_bookmark.html.slim

@@ -0,0 +1,16 @@
+- patient = Renalware::PatientPresenter.new(bookmark.patient)
+
+tr class=("urgent" if bookmark.urgent?)
+  td= default_patient_link(patient)
+  td= patient.nhs_number
+  td= patient.hospital_identifier
+  td= I18n.l(patient.born_on)
+  td= patient.age
+  td= patient.sex
+  td= patient.current_modality
+  td= bookmark.notes
+  td= bookmark.tags
+  td= I18n.l bookmark.created_at
+  td.nowrap= render "renalware/patients/bookmarks/delete",
+                    bookmark: bookmark,
+                    link_text: "Remove"