From 355b5f04a7da0551bf81e48b1c747a23e223fa8b Mon Sep 17 00:00:00 2001 From: Ken Chapple Date: Mon, 30 Oct 2023 09:09:12 -0400 Subject: [PATCH] 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 --- interface/eRxStore.php | 9 +++++++-- interface/eRxXMLBuilder.php | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/interface/eRxStore.php b/interface/eRxStore.php index 3c9cba69b..840042bb0 100644 --- 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 @@ class eRxStore 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 index 84c9b5c93..96a8dd390 100644 --- a/interface/eRxXMLBuilder.php +++ b/interface/eRxXMLBuilder.php @@ -728,7 +728,8 @@ class eRxXMLBuilder // 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)); -- 2.11.4.GIT