dde_client 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b9ff81b364e1eb3f676e175b2057e829accbd95f9fe971335f01b0571fca540
-  data.tar.gz: 0b4f7869847ddc8849f57b0168da0b63dd6943ee63c2e5aeb781cd5a0594354f
+  metadata.gz: 5cb3310001f540fa0cfea485fc92e4b502302991d2e7edac9f8fdf91854f07f8
+  data.tar.gz: c4830af9b76cb788172ad045123360aca0fa1368845eec4fad8f043ed89e278e
 SHA512:
-  metadata.gz: c6fba5260c11ca7655c2a7217ec6a75ade9bb18018af7a3517abd0dd8a321fccf9be1403d151a3e642c930a0aa47a1dd0797f4f3428d78a209c3e2011fb479c9
-  data.tar.gz: 8e3394c08fc5c51ead99425d41e905e044ecf9059dd607c15eee340c5d84a71d744e87218dfc8e04799da1d1c27d52b6e9963ad384717269336711d47438eae3
+  metadata.gz: 66d90e020efced8089fdac99bb395a673e6092c2e497ac2ee8b3d702e5d4ddcff30f9adca02b690e47781473d8125e9ac998238032c5a292b4515105d3647160
+  data.tar.gz: c9668939d2c46080d236c82d77409836dfae23671ba185cea7e5e71d93ab9ac29cfd6030fd7953155c130650c089d7840d3988f6175b3c1d359d75ebbf99bd4b

data/app/services/dde_client/dde_service.rb

@@ -435,7 +435,7 @@ class DdeClient::DdeService
 
       resolved_patients << local_patient
     end
-    if resolved_patients.empty? && (local_patients.size.zero? && remote_patients.size == 10)
+    if resolved_patients.empty? && (local_patients.size.zero? && remote_patients.size == 1)
       # HACK: Frontenders requested that if only a single patient exists
       # remotely and locally none exists, the remote patient should be
       # imported.

data/app/services/dde_client/merging_service.rb

@@ -51,6 +51,7 @@ class DdeClient::MergingService
     ActiveRecord::Base.transaction do
       primary_patient = Patient.find(primary_patient_ids['patient_id'])
       secondary_patient = Patient.find(secondary_patient_ids['patient_id'])
+      secondary_patient ||= Patient.find(secondary_patient_ids['doc_id'])
       merge_name(primary_patient, secondary_patient)
       merge_identifiers(primary_patient, secondary_patient)
       merge_attributes(primary_patient, secondary_patient)

data/lib/dde_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DdeClient
-  VERSION = "1.0.2"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dde_client
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - bryan-mw
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-15 00:00:00.000000000 Z
+date: 2024-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails