dde_client 1.0.4 → 1.0.5
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 +4 -4
- data/app/services/dde_client/merging_service.rb +1 -2
- data/lib/dde_client/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b4249b25da5b1a3fb2ae1d1983a1b1db923abc549b9e3fe1aca9076457886ad3
|
|
4
|
+
data.tar.gz: '0774816b4c50898586fc878a5d44a76f0fcfbb5017f99c192d84f57a137a27e2'
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 41c8825241b6d5ea9af30d81c655ba5cad83b3621f2cfcfb5cf14ebbc71d4946587de734ad3b472983a1444036611addb4b8d48637b413355900e7ca8434d86d
|
|
7
|
+
data.tar.gz: bbb06da8e74a26f38fcbc783c372e1732474f7c8d1a2f6b8757d540a7a346bb6c091b6cd2b2ad55e6257f1f8578c5b8dbdf805c0deb62dd9443f0469c84cd7cf
|
|
@@ -34,7 +34,7 @@ class DdeClient::MergingService
|
|
|
34
34
|
elsif remote_local_merge?(primary_patient_ids, secondary_patient_ids)
|
|
35
35
|
merge_remote_and_local_patients(primary_patient_ids, secondary_patient_ids, 'Remote and Local Patient')
|
|
36
36
|
elsif inverted_remote_local_merge?(primary_patient_ids, secondary_patient_ids)
|
|
37
|
-
|
|
37
|
+
merge_remote_and_local_patients(primary_patient_ids, secondary_patient_ids, 'Remote and Local Patient')
|
|
38
38
|
elsif local_merge?(primary_patient_ids, secondary_patient_ids)
|
|
39
39
|
merge_local_patients(primary_patient_ids, secondary_patient_ids, 'Local Patients')
|
|
40
40
|
else
|
|
@@ -51,7 +51,6 @@ 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'])
|
|
55
54
|
merge_name(primary_patient, secondary_patient)
|
|
56
55
|
merge_identifiers(primary_patient, secondary_patient)
|
|
57
56
|
merge_attributes(primary_patient, secondary_patient)
|
data/lib/dde_client/version.rb
CHANGED