Revert "feat: Hook into the CDA Parsing functions (openemr#6716)" (op…

…enemr#6730) This reverts commit e2f1e03.
DiscoverAndChange · Aug 10, 2023 · c1744d7 · c1744d7
1 parent e2f1e03
commit c1744d7
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 199 deletions.
diff --git a/src/Events/CDA/CDAPostParseEvent.php b/src/Events/CDA/CDAPostParseEvent.php
diff --git a/src/Events/CDA/CDAPreParseEvent.php b/src/Events/CDA/CDAPreParseEvent.php
diff --git a/src/Services/Cda/CdaTemplateParse.php b/src/Services/Cda/CdaTemplateParse.php
@@ -13,8 +13,6 @@
 namespace OpenEMR\Services\Cda;
 
 use DOMDocument;
-use OpenEMR\Events\CDA\CDAPreParseEvent;
-use OpenEMR\Events\CDA\CDAPostParseEvent;
 use OpenEMR\Services\CodeTypesService;
 
 class CdaTemplateParse
@@ -24,17 +22,11 @@ class CdaTemplateParse
     private $currentOid;
     protected $is_qrda_import;
 
-    /**
-     * @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface
-     */
-    private $ed;
-
     public function __construct()
     {
         $this->templateData = [];
         $this->is_qrda_import = false;
         $this->codeService = new CodeTypesService();
-        $this->ed = $GLOBALS['kernel']->getEventDispatcher();
     }
 
     public function parseCDAEntryComponents($components): array
@@ -69,17 +61,12 @@ public function parseCDAEntryComponents($components): array
             '2.16.840.1.113883.10.20.22.2.41' => 'dischargeSummary'
         );
 
-        $preParseEvent = new CDAPreParseEvent($components);
-        $this->ed->dispatch($preParseEvent, CDAPreParseEvent::EVENT_HANDLE);
-
-        foreach ($preParseEvent->getComponents() as $component) {
+        foreach ($components as $component) {
             if (!empty($component['section']['templateId']['root'])) {
                 if (!empty($components_oids[$component['section']['templateId']['root']])) {
                     $this->currentOid = $component['section']['templateId']['root'];
                     $func_name = $components_oids[$component['section']['templateId']['root']];
                     $this->$func_name($component);
-                    $postParseEvent = new CDAPostParseEvent($func_name, $this->currentOid, $component, $this->templateData);
-                    $this->ed->dispatch($postParseEvent, CDAPostParseEvent::EVENT_HANDLE);
                 }
             } elseif (empty($component['section']['templateId'])) {
                 // uncomment for debugging information.
@@ -91,13 +78,10 @@ public function parseCDAEntryComponents($components): array
                         $this->currentOid = $component['section']['templateId'][$key_1]['root'];
                         $func_name = $components_oids[$component['section']['templateId'][$key_1]['root']];
                         $this->$func_name($component);
-                        $postParseEvent = new CDAPostParseEvent($func_name, $this->currentOid, $component, $this->templateData);
-                        $this->ed->dispatch($postParseEvent, CDAPostParseEvent::EVENT_HANDLE);
                         break;
                     }
                 }
             }
-            $this->templateData = $postParseEvent->getTemplateData();
         }
         return $this->templateData;
     }