conflict changes

cerner · Nov 2, 2023 · 9821b26 · 9821b26
1 parent 39bc69d
commit 9821b26
Show file tree

Hide file tree

Showing 3 changed files with 440 additions and 24 deletions.
diff --git a/content/millennium/r4/clinical/diagnostics/diagnostic-report.md b/content/millennium/r4/clinical/diagnostics/diagnostic-report.md
@@ -181,7 +181,7 @@ Create a new diagnostic report.
 
 _Implementation Notes_
 
-* DiagnosticReports of type Cardiology and Anatomic Pathology are supported for the create operation.
+* DiagnosticReports of type Cardiology and Anotomic Pathology are supported for the create operation.
 * Only the body fields mentioned below are supported. Unsupported fields will be ignored.
 * All provided dates must have a time component.
 * Supported MIME Types: application/pdf, text/plain, text/richtext, text/rtf, text/html, application/xml, and application/xhtml+xml

diff --git a/lib/resources/example_json/r4_examples_diagnostic_report.rb b/lib/resources/example_json/r4_examples_diagnostic_report.rb
@@ -557,6 +557,24 @@ module Resources
     R4_DIAGNOSTIC_REPORT_POST_CARDIOLOGY ||= {
       "resourceType": 'DiagnosticReport',
       "status": 'amended',
+      "identifier": [
+        {
+          "use": 'usual',
+          "type": {
+            "coding": [
+              {
+                "code": 'Coding',
+                "system": 'http://snomed.info/sct',
+                "version": '4.0.1',
+                "display": 'test',
+                "userSelected": true
+              }
+            ]
+          },
+          "system": 'http://hl7.org/fhir/sid/us-ssn',
+          "value": '11182457'
+        }
+      ],
       "category": [
         {
           "coding": [
@@ -579,24 +597,6 @@ module Resources
         ],
         "text": 'string'
       },
-      "identifier": [
-        {
-          "use": 'usual',
-          "type": {
-            "coding": [
-              {
-                "code": 'Coding',
-                "system": 'http://snomed.info/sct',
-                "version": '4.0.1',
-                "display": 'test',
-                "userSelected": true
-              }
-            ]
-          },
-          "system": 'http://hl7.org/fhir/sid/us-ssn',
-          "value": '11182457'
-        }
-      ],
       "subject": {
         "reference": 'Patient/12804513'
       },
@@ -659,11 +659,6 @@ module Resources
           "text": 'string'
         }
       ],
-      "performer": [
-        {
-          "reference": 'Practitioner/11786042'
-        }
-      ],
       "code": {
         "coding": [
           {
@@ -681,6 +676,11 @@ module Resources
       "encounter": {
         "reference": 'Encounter/98041577'
       },
+      "performer": [
+        {
+          "reference": 'Practitioner/11786042'
+        }
+      ],
       "effectiveDateTime": '2020-12-27T09:12:28Z',
       "issued": '2020-12-29T09:12:28Z',
       "presentedForm": [