Import CCDA Improvements and Fixes (openemr#7935)

* Import CCDA Improvements and Fixes Starting entire import templae refactor to use x-pathing. fix careplan report content display new classes for component parsing helper new classes for consultation note parsing and parsing text components for import. * style * Add Guardian Add medication such as it is! * consolidate labs by date this is temp for test * refactor buildLabArray generate doc blocks * php error fix fix deleter to delete encounters instead of soft delete on patient delete * PSR
sjpadgett · Feb 4, 2025 · 539898e · 539898e
1 parent 87a4feb
commit 539898e
Show file tree

Hide file tree

Showing 11 changed files with 1,063 additions and 234 deletions.
diff --git a/interface/forms/care_plan/report.php b/interface/forms/care_plan/report.php
@@ -48,10 +48,10 @@ function care_plan_report($pid, $encounter, $cols, $id): void
                 <tr>
                     <td class="border p-1"><span class='text'><?php echo text($value['user']); ?></span></td>
                     <td class="border p-1"><span class='text'><?php echo text(getListItemTitle('Plan_of_Care_Type', $value['care_plan_type'])); ?></span></td>
-                    <td class="border p-1"><span class=text><?php echo text($value['code']); ?></span></td>
-                    <td class="border p-1"><span class=text><?php echo text($value['codetext']); ?></span></td>
-                    <td class="border p-1"><span class=text><?php echo text($value['description']); ?></span></td>
-                    <td class="border p-1"><span class=text><?php echo text($value['date']); ?></span></td>
+                    <td class="border p-1"><span class='text'><?php echo text($value['code']); ?></span></td>
+                    <td class="border p-1"><span class='text'><?php echo text($value['codetext']); ?></span></td>
+                    <td class="border p-1"><span class='text'><?php echo nl2br(text($value['description'])); ?></span></td>
+                    <td class="border p-1"><span class='text'><?php echo text($value['date']); ?></span></td>
                 </tr>
                 <?php } ?>
             </tbody>

diff --git a/interface/modules/custom_modules/oe-module-faxsms/src/Controller/RCFaxClient.php b/interface/modules/custom_modules/oe-module-faxsms/src/Controller/RCFaxClient.php
@@ -151,7 +151,7 @@ private function initializeSDK(): void
      * @param string[] $acl
      * @return int
      */
-    public function authenticate($acl = ['admin', 'doc']): int
+    public function authenticate($acl = ['admin', 'doc']): bool|int|string
     {
         if (empty($this->credentials['appKey'])) {
             $this->credentials = $this->getCredentials();