fix: only send diagnosis with no enddate to newcrop

* only send diagnosis with no enddate to newcrop * only push active diag to newcrop * fix extensions
mdsupport · Oct 30, 2023 · 355b5f0 · 355b5f0
1 parent 221034a
commit 355b5f0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/interface/eRxStore.php b/interface/eRxStore.php
@@ -22,7 +22,12 @@ class eRxStore
      */
     public static function sanitizeNumber($value)
     {
-        return preg_replace('/[^-0-9.]/', '', $value);
+        $sanitized = '';
+        if ($value !== null) {
+            $sanitized = preg_replace('/[^-0-9.]/', '', $value);
+        }
+
+        return $sanitized;
     }
 
     /**
@@ -160,7 +165,7 @@ public function getPatientAllergiesByPatientId($patientId)
     public function getPatientDiagnosisByPatientId($patientId)
     {
         return sqlStatement(
-            'SELECT diagnosis, begdate, title, date
+            'SELECT diagnosis, begdate, enddate, title, date
             FROM lists
             WHERE `type` = \'medical_problem\'
                 AND pid = ?

diff --git a/interface/eRxXMLBuilder.php b/interface/eRxXMLBuilder.php
@@ -728,7 +728,8 @@ public function getPatientDiagnosis($patientId)
                     // NewCrop only accepts ICD10 codes, so only add XML elements for diagnosis with ICD10 code types
                     if (
                         $codeType == 'ICD10' &&
-                        !empty($diagnosisId)
+                        !empty($diagnosisId) &&
+                        empty($diagnosis['enddate'])
                     ) {
                         $element = $this->getDocument()->createElement('PatientDiagnosis');
                         $element->appendChild($this->createElementText('diagnosisID', $diagnosisId));