RubyGems - renalware-core - Versions diffs - 2.0.0.pre.rc11 → 2.0.0.pre.rc13 - Mend

@@ -1,15 +1,31 @@
+# frozen_string_literal: true
 require_dependency "renalware"
 module Renalware
   module UKRDC
     class PatientPresenter < SimpleDelegator
-      delegate :allergies, to: :clinical_patient
-      delegate :clinic_visits, to: :clinics_patient
+      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
+      def initialize(patient, changes_since: nil)
+        if changes_since.present? && changes_since.is_a?(String)
+          changes_since = Time.zone.parse(changes_since)
+        end
+        @changes_since = changes_since || patient.sent_to_ukrdc_at
+        if @changes_since.blank?
+          raise(
+            ArgumentError,
+            "No date for comparison: patient#sent_to_ukrdc_at and changes_since are nil"
+          )
+        end
+        @changes_up_until = Time.zone.now
+        super(patient)
+      end
       def dead?
         current_modality_death?
       end
@@ -25,11 +41,21 @@ module Renalware
       def letters
         CollectionPresenter.new(
-          letters_patient.letters.approved,
+          letters_patient
+            .letters
+            .approved
+            .where("updated_at > ?", changes_since),
           Renalware::Letters::LetterPresenterFactory
         )
       end
+      def finished_hd_sessions
+        hd_patient
+          .finished_hd_sessions
+          .includes(:patient, :dialysate)
+          .where("hd_sessions.updated_at > ?", changes_since)
+      end
       def current_registration_status_rr_code
         @current_registration_status_rr_code ||= begin
           status = transplant_patient.current_registration_status
@@ -45,11 +71,35 @@ module Renalware
         email || home_telephone || mobile_telephone
       end
+      def allergies
+        clinical_patient
+          .allergies
+          .where("recorded_at >= ?", changes_since)
+      end
+      def clinic_visits
+        clinics_patient
+          .clinic_visits
+          .where("date >= ?", changes_since)
+          .includes(:updated_by)
+      end
+      def prescriptions
+        __getobj__.prescriptions
+          .includes(:termination, :medication_route, :drug)
+          .where("updated_at > ?", changes_since)
+      end
       def observation_requests
         pathology_patient
           .observation_requests
-          .having_observations_with_a_loinc_code
+          .eager_load(
+            :description,
+            observations: { description: :measurement_unit }
+          )
           .where(patient_id: id)
+          .where("requested_at >= ?", changes_since)
+          .where("loinc_code is not null")
       end
       private
@@ -77,6 +127,10 @@ module Renalware
       def transplant_patient
         @transplant_patient ||= Renalware::Transplants::PatientPresenter.new(__getobj__)
       end
+      def hd_patient
+        @hd_patient ||= Renalware::HD::PatientPresenter.new(self)
+      end
     end
   end
 end

data/app/presenters/string_presenter.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 class StringPresenter
   include ::ActionView::Helpers::TextHelper

data/app/presenters/time_presenter.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 class TimePresenter < SimpleDelegator
   def to_s
     ::I18n.l self

data/app/presenters/true_class_presenter.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 class TrueClassPresenter < SimpleDelegator
   def to_s
     # rubocop:disable Lint/BooleanSymbol

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

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

data/app/views/renalware/api/ukrdc/patients/_lab_orders.xml.builder CHANGED Viewed

@@ -1,13 +1,12 @@
 xml = builder
 # TODO: Implement start stop dates
-# xml.LabOrders (start: Time.zone.today.iso8601, stop: Time.zone.today.iso8601) do
-xml.LabOrders do
+xml.LabOrders(
+  start: patient.changes_since.to_date.iso8601,
+  stop: patient.changes_up_until.to_date.iso8601
+  ) do
   render partial: "renalware/api/ukrdc/patients/lab_orders/lab_order",
-         collection: patient.observation_requests.includes(
-           :description,
-           observations: { description: :measurement_unit }
-         ),
+         collection: patient.observation_requests,
          as: :request,
          locals: { builder: builder, patient: patient }
 end

data/app/views/renalware/api/ukrdc/patients/_observations.xml.builder CHANGED Viewed

@@ -4,10 +4,11 @@
 #   - bp
 xml = builder
-# TODO: Implement start stop dates
-# xml.Observations do(start: Time.zone.today.iso8601, stop: Time.zone.today.iso8601) do
-xml.Observations do
-  patient.clinic_visits.includes(:updated_by).each do |visit|
+xml.Observations(
+  start: patient.changes_since.to_date.iso8601,
+  stop: patient.changes_up_until.to_date.iso8601
+  ) do
+  patient.clinic_visits.each do |visit|
     render "clinic_visit_observation",
            visit: visit,
            method: :systolic_bp,

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

@@ -24,7 +24,7 @@ xml.Treatment do
   end
   xml.Attributes do
-    xml.HDP01 hd_patient&.hd_profile&.schedule_definition&.days_per_week
+    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

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

@@ -2,12 +2,18 @@
 #
 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-")
 xml.LabOrder do
   # xml.ReceivingLocation do
   #   xml.Code ""
   #   xml.Description # request.pathology_lab.name
   # end
-  xml.PlacerId request.requestor_order_number
+  xml.PlacerId placer_id
   # xml.FillerId "??ORC:3 Labs Order Id"
   # xml.OrderedBy do
   #   xml.Code "unknown"

data/app/views/renalware/api/v1/medications/prescriptions/index.json.jbuilder ADDED Viewed

@@ -0,0 +1,14 @@
+json.array!(
+  prescriptions,
+  :id,
+  :prescribed_on,
+  :drug_name,
+  :dose,
+  :dose_unit,
+  :dose_amount,
+  :frequency,
+  :route_code,
+  :route_description,
+  :administer_on_hd,
+  :last_delivery_date
+)

data/app/views/renalware/api/v1/patients/patients/show.json.jbuilder CHANGED Viewed

@@ -1,6 +1,6 @@
-json.nhs_number patient.nhs_number
+json.id patient.id
 json.secure_id patient.secure_id
-json.legacy_patient_id patient.legacy_patient_id
+json.nhs_number patient.nhs_number
 json.local_patient_id patient.local_patient_id
 json.local_patient_id_2 patient.local_patient_id_2
 json.local_patient_id_3 patient.local_patient_id_3
@@ -12,6 +12,19 @@ json.family_name patient.family_name
 json.born_on patient.born_on&.to_s
 json.died_on patient.died_on&.to_s
 json.sex patient.sex&.code
-json.ethnicity patient.ethnicity&.code
-json.medications_url api_v1_patient_medications_prescriptions_url(patient_id: patient)
+json.ethnicity patient.ethnicity&.name
+json.current_address do
+  json.street_1 patient.current_address&.street_1
+  json.street_2 patient.current_address&.street_2
+  json.street_3 patient.current_address&.street_3
+  json.town patient.current_address&.town
+  json.county patient.current_address&.county
+  json.region patient.current_address&.region
+  json.postcode patient.current_address&.postcode
+  json.country patient.current_address&.country&.name
+  json.telephone patient.current_address&.telephone
+  json.email patient.current_address&.email
+end
+json.prescriptions_url api_v1_patient_prescriptions_url(patient_id: patient)
 json.hd_profile_url api_v1_patient_hd_current_profile_url(patient_id: patient)
+# TODO: HD Profile link to have at least site and schedule