corrected misspelling for system and added codeable concepts in FHIR …

…Condition (openemr#3959)
DiscoverAndChange · Oct 6, 2020 · 2763b49 · 2763b49
1 parent 2713488
commit 2763b49
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/src/Services/FHIR/FhirAllergyIntoleranceService.php b/src/Services/FHIR/FhirAllergyIntoleranceService.php
@@ -76,14 +76,14 @@ public function parseOpenEMRRecord($dataRecord = array(), $encode = false)
  $clinicalStatus = "active";
  }
  $allergyIntoleranceResource->setClinicalStatus(array(
- 'sysytem' => "https://terminology.hl7.org/CodeSystem/allergyintolerance-clinical",
+ 'system' => "https://terminology.hl7.org/CodeSystem/allergyintolerance-clinical",
  'code' => $clinicalStatus,
  'display' => strtoupper($clinicalStatus),
  ));
 
  $allergyIntoleranceCategory = new FHIRAllergyIntoleranceCategory();
  $allergyIntoleranceCategory->setValue(array(
- 'sysytem' => "https://hl7.org/fhir/allergy-intolerance-category",
+ 'system' => "https://hl7.org/fhir/allergy-intolerance-category",
  'code' => "medication",
  'display' => strtoupper("Medication"),
  ));
@@ -102,7 +102,7 @@ public function parseOpenEMRRecord($dataRecord = array(), $encode = false)
  );
  $criticality = new FHIRAllergyIntoleranceCriticality();
  $criticality->setValue(array(
- 'sysytem' => "https://hl7.org/fhir/allergy-intolerance-criticality",
+ 'system' => "https://hl7.org/fhir/allergy-intolerance-criticality",
  'code' => $criticalityCode[$dataRecord['severity_al']]['code'],
  'display' => $criticalityCode[$dataRecord['severity_al']]['display'],
  ));
@@ -133,13 +133,13 @@ public function parseOpenEMRRecord($dataRecord = array(), $encode = false)
  }
 
  $verificationCoding = array(
- 'sysytem' => "https://terminology.hl7.org/CodeSystem/allergyintolerance-verification",
+ 'system' => "https://terminology.hl7.org/CodeSystem/allergyintolerance-verification",
  'code' => 'unconfirmed',
  'display' => 'Unconfirmed',
  );
  if (!empty($dataRecord['verification'])) {
  $verificationCoding = array(
- 'sysytem' => "https://terminology.hl7.org/CodeSystem/allergyintolerance-verification",
+ 'system' => "https://terminology.hl7.org/CodeSystem/allergyintolerance-verification",
  'code' => $dataRecord['verification'],
  'display' => $dataRecord['verification_title']
  );

diff --git a/src/Services/FHIR/FhirConditionService.php b/src/Services/FHIR/FhirConditionService.php
@@ -93,14 +93,16 @@ public function parseOpenEMRRecord($dataRecord = array(), $encode = false)
  )
  );
  $conditionResource->setClinicalStatus($clinical_Status);
-
- $conditionResource->addCategory(
+
+ $conditionCategory = new FHIRCodeableConcept();
+ $conditionCategory->addCoding(
  array(
- 'sysytem' => "https://terminology.hl7.org/CodeSystem/condition-category",
+ 'system' => "https://terminology.hl7.org/CodeSystem/condition-category",
  'code' => 'problem-list-item',
  'display' => 'Problem List Item'
  )
  );
+ $conditionResource->addCategory($conditionCategory);
 
  if (isset($dataRecord['puuid'])) {
  $patient = new FHIRReference();
@@ -119,19 +121,21 @@ public function parseOpenEMRRecord($dataRecord = array(), $encode = false)
  $conditionResource->setCode($diagnosisCode);
  }
 
+ $verificationStatus = new FHIRCodeableConcept();
  $verificationCoding = array(
- 'sysytem' => "https://terminology.hl7.org/CodeSystem/condition-ver-status",
+ 'system' => "https://terminology.hl7.org/CodeSystem/condition-ver-status",
  'code' => 'unconfirmed',
  'display' => 'Unconfirmed',
  );
  if (!empty($dataRecord['verification'])) {
  $verificationCoding = array(
- 'sysytem' => "https://terminology.hl7.org/CodeSystem/condition-ver-status",
+ 'system' => "https://terminology.hl7.org/CodeSystem/condition-ver-status",
  'code' => $dataRecord['verification'],
  'display' => $dataRecord['verification_title']
  );
  }
- $conditionResource->setVerificationStatus($verificationCoding);
+ $verificationStatus->addCoding($verificationCoding);
+ $conditionResource->setVerificationStatus($verificationStatus);
 
  if ($encode) {
  return json_encode($conditionResource);