dde_client 1.0.2 → 1.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5cb3310001f540fa0cfea485fc92e4b502302991d2e7edac9f8fdf91854f07f8
|
|
4
|
+
data.tar.gz: c4830af9b76cb788172ad045123360aca0fa1368845eec4fad8f043ed89e278e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 66d90e020efced8089fdac99bb395a673e6092c2e497ac2ee8b3d702e5d4ddcff30f9adca02b690e47781473d8125e9ac998238032c5a292b4515105d3647160
|
|
7
|
+
data.tar.gz: c9668939d2c46080d236c82d77409836dfae23671ba185cea7e5e71d93ab9ac29cfd6030fd7953155c130650c089d7840d3988f6175b3c1d359d75ebbf99bd4b
|
|
@@ -435,7 +435,7 @@ class DdeClient::DdeService
|
|
|
435
435
|
|
|
436
436
|
resolved_patients << local_patient
|
|
437
437
|
end
|
|
438
|
-
if resolved_patients.empty? && (local_patients.size.zero? && remote_patients.size ==
|
|
438
|
+
if resolved_patients.empty? && (local_patients.size.zero? && remote_patients.size == 1)
|
|
439
439
|
# HACK: Frontenders requested that if only a single patient exists
|
|
440
440
|
# remotely and locally none exists, the remote patient should be
|
|
441
441
|
# imported.
|
|
@@ -51,6 +51,7 @@ class DdeClient::MergingService
|
|
|
51
51
|
ActiveRecord::Base.transaction do
|
|
52
52
|
primary_patient = Patient.find(primary_patient_ids['patient_id'])
|
|
53
53
|
secondary_patient = Patient.find(secondary_patient_ids['patient_id'])
|
|
54
|
+
secondary_patient ||= Patient.find(secondary_patient_ids['doc_id'])
|
|
54
55
|
merge_name(primary_patient, secondary_patient)
|
|
55
56
|
merge_identifiers(primary_patient, secondary_patient)
|
|
56
57
|
merge_attributes(primary_patient, secondary_patient)
|
data/lib/dde_client/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: dde_client
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.0.
|
|
4
|
+
version: 1.0.4
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- bryan-mw
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2024-07-
|
|
11
|
+
date: 2024-07-18 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|