Skip to content
This repository has been archived by the owner on Jun 28, 2024. It is now read-only.

Commit

Permalink
Merge pull request #2113 from MeasureAuthoringTool/merge_to_fhir_stage
Browse files Browse the repository at this point in the history
Merge bonnie-on-fhir to fhir_staging
  • Loading branch information
adongare authored Dec 12, 2022
2 parents 4540219 + df116a5 commit 0db9c34
Show file tree
Hide file tree
Showing 7 changed files with 1,577 additions and 5,685 deletions.
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ GEM
netrc (0.11.0)
newrelic_rpm (7.1.0)
nio4r (2.5.8)
nokogiri (1.13.8)
nokogiri (1.13.10)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
non-stupid-digest-assets (1.0.9)
Expand Down
14 changes: 7 additions & 7 deletions app/assets/javascripts/models/patient.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -303,14 +303,14 @@ class Thorax.Models.Patient extends Thorax.Model
group.id = "group-#{expected_value.population_index}"
group.population = populations
group
measureReport = cqm.models.MeasureReport.parse({
type: "individual", date: new Date(),
text: {status: "additional", div: cqmPatient.notes},
})
measureReportJson = measureReport.toJSON()
measureReportJson.group = groups.filter((g) -> !!g)
# measureReport = cqm.models.MeasureReport.parse({
# type: "individual", date: new Date(),
# text: {status: "additional", div: cqmPatient.notes},
# })
# measureReportJson = measureReport.toJSON()
# measureReportJson.group = groups.filter((g) -> !!g)
bundleJson = bundle.toJSON();
bundleJson.entry.push(measureReportJson);
# bundleJson.entry.push(measureReportJson);
bundleJson

class Thorax.Collections.Patients extends Thorax.Collection
Expand Down
2 changes: 1 addition & 1 deletion config/bonnie.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
defaults: &defaults
version: 6.2.4
version: 6.2.5
enable_logging: true
enable_rationale: true
check_crosswalk: false
Expand Down
Loading

0 comments on commit 0db9c34

Please sign in to comment.