renalware-core 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35f1da96bf99bc1165eafb40df5d2061d5840831ef9d061373448bb6fc0d8dad
-  data.tar.gz: cf73511f92c66f3a6192b26daefd7ed7a1bd69265edee4a283fa17d6e138e38b
+  metadata.gz: f41d5954f23c36c96a70b4144d1d87cf641d5b36710077b413a78be349a84535
+  data.tar.gz: b86bd1bc6dc7820348938df876fb4cd069fef8714d0cb5ad7fd702d8c7e0dd89
 SHA512:
-  metadata.gz: 571bf241c4d5c4249267c2a948b46d3e1455f6bdd453891f13df6e66b45774eae011971a37a96280b6c0a5e1a60e8faeef22e9342ca0770ea99427ff116d626d
-  data.tar.gz: f9700de2153b34d22684d45f79350bc4b996d5deb7b95faeb8d57adf0af85a24e6dd061cd423fd26f47aff4f6a2d13ba77351a6f89befc14e096fba68dd6a5d1
+  metadata.gz: e642930ef41116b225a8cbcb89af1638993141f498800f265aafff94cf9f68303ea9c9e1e46dad5e4d7dbe0a3b24c830360781b11a0b2cdaf1f3d638ef634180
+  data.tar.gz: 7178712e89d738149ee01e2b232befe8e7fef0d21a87eef5a3c5bdae85081562321cafa2039a814407943673788a687fc31caf6b771f1c36258bb50b30addf71

data/app/controllers/renalware/transplants/mdm_patients_controller.rb

@@ -6,7 +6,8 @@ module Renalware
       def index
         render_index(query: query,
                      page_title: t(".page_title"),
-                     view_proc: ->(patient) { patient_transplants_mdm_path(patient) })
+                     view_proc: ->(patient) { patient_transplants_mdm_path(patient) },
+                     patient_presenter_class: Transplants::MDMPatientPresenter)
       end
 
       private

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

@@ -9,7 +9,9 @@ module Renalware
       validates :patient_id, presence: true
       validates :started_on, presence: true
       validates :description, presence: true
-      validates :consult_type, presence: true
+      # Currently #consult_type is a string and we are not sure what should be in there
+      # Migrated consults may not have a type so only enforce it creation of new ones.
+      validates :consult_type, presence: true, on: :create
       validates :other_site_or_ward, presence: {
         if: ->(consult){ consult.consult_site_id.blank? && consult.hospital_ward_id.blank? }
       }

data/app/models/renalware/hd/session/closed.rb

@@ -45,9 +45,12 @@ module Renalware
         attribute :observations_after, Observations
 
         class Dialysis < Renalware::HD::SessionDocument::Dialysis
-          # rubocop:disable Rails/Validation
-          validates_presence_of attribute_set.map(&:name).reject{ |att| att == :machine_ktv }
-          # rubocop:enable Rails/Validation
+          validates :arterial_pressure, presence: true
+          validates :venous_pressure, presence: true
+          validates :fluid_removed, presence: true
+          validates :blood_flow, presence: true
+          validates :flow_rate, presence: true
+          validates :litres_processed, presence: true
         end
         attribute :dialysis, Dialysis
 

data/app/models/renalware/patients/primary_care_physician.rb

@@ -32,6 +32,10 @@ module Renalware
         ""
       end
 
+      def to_s
+        [title, name].compact.join(" ")
+      end
+
       def skip_given_name_validation?
         true
       end
@@ -43,7 +47,11 @@ module Renalware
       end
 
       def salutation
-        [title, name].join(" ")
+        [
+          Renalware.config.salutation_prefix,
+          title,
+          name
+        ].compact.join(" ")
       end
 
       class PrimaryCarePhysicianAddressAccessError < StandardError; end

data/app/models/renalware/transplants/mdm_patients_query.rb

@@ -55,6 +55,15 @@ module Renalware
           joins("RIGHT OUTER JOIN patient_worries ON patient_worries.patient_id = patients.id")
         end
         alias_method :on_worryboard, :patients_on_the_worry_board
+
+        def patients_with_a_transplant_operation_in_the_past_year
+          joins(<<-SQL)
+            LEFT JOIN transplant_recipient_operations
+            ON patients.id = transplant_recipient_operations.patient_id
+          SQL
+          .where("transplant_recipient_operations.performed_on >= ?", 1.year.ago)
+        end
+        alias_method :past_year, :patients_with_a_transplant_operation_in_the_past_year
       end
     end
   end

data/app/presenters/renalware/transplants/mdm_patient_presenter.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/transplants"
+
+module Renalware
+  module Transplants
+    # Presenter formatting a single patient for use behind any MDM Patients listing.
+    class MDMPatientPresenter < Renalware::MDMPatientPresenter
+      def last_operation_on
+        Transplants::RecipientOperation
+          .for_patient(__getobj__)
+          .order(performed_on: :desc)
+          .limit(1)
+          .pluck(:performed_on)
+          .first
+      end
+    end
+  end
+end

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

@@ -1,12 +1,22 @@
 # See HL7 spec http://pacs.hk/Doc/HL7/Hl7V231.pdf
-#
-xml = builder
 
-# Migrated OBRs have the prefix 'PCS-'. Some have been reported as duplicates by URDC.
-# I don't believe PCS-XXX is the actual placerid in the HL7 message as this is not stored in RW1
-# so we are safe here to suffix them with a random string to remove the possibility of duplication.
-placer_id = request.requestor_order_number
-placer_id += SecureRandom.hex(8) if placer_id.to_s.upcase.start_with?("PCS-")
+# A Note about PlacerId
+# ---------------------
+# In UKRDC terms an OBR equates to their LabOrder. Each LabOrder must have a unique
+# PlacerId. However an HL7 message (for example at KCH) can have multiple OBRs with the same
+# placer id (aka requester order number) thus causing duplicate placer ids to appear in the XML.
+# After email discussion with George and Nick at UKRDC it was decided that PlacerID could be
+# any value as long as it is unique and is persisted in Renalware (in case an update needs to be
+# sent, and the original LabOrder identified). To solve this we obfuscate the request.id (slightly)
+# by converting to base 16 (hex) and then append it to the original requester order number.
+# Its not good practice to expose a database id in this way though it is to an internal NHS consumer
+# and the hex obfuscation helps slightly.
+# A better approach might be to generate a GUID for each pathology_observation_request and pass
+# this as the placer id. However that would introduce more moving parts (calling the SQL function
+# to generate the uuid) and increases storage and XML file sizes.
+placer_id = "#{request.requestor_order_number}-#{request.id.to_s(16)}".upcase
+
+xml = builder
 
 xml.LabOrder do
   # xml.ReceivingLocation do

data/app/views/renalware/letters/formatted_letters/_letter.html.slim

@@ -215,6 +215,7 @@ scss:
 
     .message {
       margin-top: 30px;
+      margin-bottom: 20px;
 
       p {
         margin-bottom: 15px;
@@ -308,6 +309,8 @@ scss:
     .message
       = letter.body&.html_safe
 
+    p Yours sincerely
+
     .signature.nobreak
       .electronic-signature
         p= letter.signature

data/app/views/renalware/medications/prescriptions/index.pdf.slim

@@ -106,9 +106,9 @@ heading
   .our-ref= "RW ref: #{patient.hospital_identifier}"
 
   span.logo= wicked_pdf_image_tag "renalware/NHS-Black.jpg", width: 50
-  .trust
-    .title Barts and the London
-    span NHS Trust
+  / .trust
+  /   .title Barts and the London
+  /   span NHS Trust
 
 main
 

data/app/views/renalware/patients/patients/show/_primary_care_physician.html.slim

@@ -7,17 +7,23 @@ article
               data: { "reveal-id" => "change-gp-modal", "reveal-ajax" => "true" }
 
   dl.dl-horizontal
-    dt GP:
+    dt(title=patient.primary_care_physician&.code) GP:
     - if patient.primary_care_physician.present?
       dd= patient.primary_care_physician
     - else
       dd None
+
+    dt(title=patient.practice&.code) Practice:
     - if patient.practice
-      dt Practice
-      dd
-        = patient.practice.name
-        br
-        = Renalware::AddressPresenter::Block.new(patient.practice.address).to_html
+      dd= patient.practice.name
+      dt Address:
+      dd= Renalware::AddressPresenter::Block.new(patient.practice.address).to_html
+      dt Tel:
+      dd= patient.practice.telephone
+      dt Email:
+      dd= patient.practice.email
+    - else
+      dd None
 
 / This is where the Find GP modal will be inserted in an Ajax call
 #change-gp-modal.reveal-modal.medium(data-reveal)

data/app/views/renalware/transplants/mdm_patients/_filters.html.slim

@@ -3,6 +3,6 @@
 dl.sub-nav
   dd(class=("active" unless named_filter_param.present?))
      = link_to t(".filter.all"), transplants_mdm_patients_path
-  - %i(recent on_worryboard).each do |filter|
+  - %i(on_worryboard recent past_year).each do |filter|
     dd(class=("active" if named_filter_param == filter.to_s))
       = link_to t(".filter.#{filter}"), transplants_filtered_mdm_patients_path(named_filter: filter)

data/app/views/renalware/transplants/mdm_patients/_patient.html.slim

@@ -0,0 +1,18 @@
+- observation_set = patient.current_observation_set
+tr
+  td.full-name= link_to patient.to_s(:default), view_proc.call(patient)
+  td.nowrap= patient.nhs_number
+  td.nowrap= patient.hospital_identifier
+  td= patient.sex.code
+  td= patient.age
+  td= patient.modality_description&.name
+  td= l(patient.last_operation_on)
+  td= observation_set.hgb_result
+  td= l(observation_set.hgb_observed_at)
+  td= observation_set.ure_result
+  td= l(observation_set.ure_observed_at)
+  td= observation_set.cre_result
+  td= l(observation_set.cre_observed_at)
+  td= observation_set.egfr_result
+  td= l(patient.esrf_date)
+  td.actions= link_to t(".view"), view_proc.call(patient)

data/app/views/renalware/transplants/mdm_patients/_table.html.slim

@@ -0,0 +1,22 @@
+- path = [:renalware, presenter.q]
+table#patients.mdm-patients.columns
+  thead
+    tr
+      th.col-width-large= sort_link(path, :family_name, t(".name"))
+      th.col-width-nhs-no= sort_link(path, :nhs_number, t(".nhs_no"))
+      th.col-width-reference-no= t(".hosp_no")
+      th.col-width-tiny= t(".sex")
+      th.col-width-tiny= t(".age")
+      th.col-width-medium= t(".modality")
+      th.col-width-date= t(".last_operation_on")
+      - %i(hgb ure cre).each do |code|
+        th.col-width-tiny= sort_link(path, code, t(".#{code}"))
+        th.col-width-date= sort_link(path, :"#{code}_date", t(".#{code}_date"))
+      th.col-width-tiny= sort_link(path, :egfr, t(".egfr"))
+      th.col-width-date= t(".esrf")
+      th.col-width-small
+
+  tbody
+    = render partial: "patient",
+             collection: presenter.patients,
+             locals: { view_proc: presenter.view_proc, q: presenter.q }

data/config/locales/renalware/transplants/mdm.en.yml

@@ -2,10 +2,30 @@ en:
   renalware:
     transplants:
       mdm_patients:
+        patient:
+          view: "MDM"
+        table:
+          name: Name
+          nhs_no: NHS No.
+          hosp_no: Hosp No.
+          sex: Sex
+          age: Age
+          dob: Date of Birth
+          modality: Modality
+          esrf: ESRF
+          hgb: HGB
+          hgb_date: HGB Date
+          ure: URE
+          ure_date: URE Date
+          cre: CRE
+          cre_date: CRE Date
+          egfr: EGFR
+          last_operation_on: Last Op Date
         index:
           page_title: Transplant MDM Patients
         filters:
           filter:
             all: All
-            recent: Recent
+            recent: Tx in Past 3/12
             on_worryboard: On Worryboard
+            past_year: Tx in Past Year

data/config/routes.rb

@@ -271,7 +271,7 @@ Renalware::Engine.routes.draw do
     end
     resources :live_donors, only: :index
     resources :mdm_patients, only: :index
-    constraints(named_filter: /(recent|on_worryboard)/) do
+    constraints(named_filter: /(recent|on_worryboard|past_year)/) do
       get "mdm_patients/:named_filter", to: "mdm_patients#index", as: :filtered_mdm_patients
     end
   end

data/lib/renalware/version.rb

@@ -1,3 +1,3 @@
 module Renalware
-  VERSION = "2.0.7".freeze
+  VERSION = "2.0.8".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1886,6 +1886,7 @@ files:
 - app/presenters/renalware/time_of_day_presenter.rb
 - app/presenters/renalware/transplants/consent_presenter.rb
 - app/presenters/renalware/transplants/donor_dashboard_presenter.rb
+- app/presenters/renalware/transplants/mdm_patient_presenter.rb
 - app/presenters/renalware/transplants/mdm_presenter.rb
 - app/presenters/renalware/transplants/patient_presenter.rb
 - app/presenters/renalware/transplants/recipient_dashboard_presenter.rb
@@ -2648,6 +2649,8 @@ files:
 - app/views/renalware/transplants/mdm/_prescriptions.html.slim
 - app/views/renalware/transplants/mdm/_top.html.slim
 - app/views/renalware/transplants/mdm_patients/_filters.html.slim
+- app/views/renalware/transplants/mdm_patients/_patient.html.slim
+- app/views/renalware/transplants/mdm_patients/_table.html.slim
 - app/views/renalware/transplants/recipient_dashboards/_modality_missing_warning.html.slim
 - app/views/renalware/transplants/recipient_dashboards/_page_actions.html.slim
 - app/views/renalware/transplants/recipient_dashboards/show.html.slim