From 25585088f155d72b4350b650116cd113c6cacb30 Mon Sep 17 00:00:00 2001 From: Alyssa Gardiner Date: Wed, 5 Oct 2022 13:03:49 -0400 Subject: [PATCH 1/6] Adding act model and template for progress note --- .DS_Store | Bin 0 -> 6148 bytes lib/ccd/models/progress_note_act.rb | 11 +++++++ .../templates/progress_note_act_template.rb | 30 ++++++++++++++++++ 3 files changed, 41 insertions(+) create mode 100644 .DS_Store create mode 100644 lib/ccd/models/progress_note_act.rb create mode 100644 lib/ccd/templates/progress_note_act_template.rb diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..64b274f2153c2ff47505452f067a081cfd6adbbb GIT binary patch literal 6148 zcmeHKO-chX7=5urtyQtOawE)aTU77|^Z;t7wG>Ay){5?CFJ8ebh==ho;zHk- zM46=HRzwm=-Zb-GeqO#w8USiz++7120BX#FQJqCelJ}A)(v+=PBr4rTiVQuZ80=&d z>`)OL2oC%;2jttGK~uh2T(kWCeurr%8+Q0swuW`)=7&yv;#NULpNgBE%;7zIy!sc9 z+&(TbWFI|Oqn15Qm6~gea3wp5$9?m-^O`$G2lrUTEfu01u%Am;Io0=+bJ)Z-=e3V5 zw6Ti=ViOnWdb(FnSEWa69cMBlms{ENxHXRF4ySDOO8YwU_%9xRnq%mZEp2lhTz0hL zvFBViN1t(IDb79Jqo=ELC3>8Jcy)@KGPk04PqR>_!EyO2>1cT>L`#Ju8=&Kk3lb|u z)(j5066g%9 zVGvDhF|n8%"1..1", :value=>"ACT"} + + # SHALL contain exactly one [1..1] @moodCode="EVN" Event (CodeSystem: ActMood 2.16.840.1.113883.5.1001 STATIC) (CONF:7470). + constraint 'mood_code', {:cardinality=>"1..1", :value=>"EVN"} + + # SHALL contain exactly one [1..1] @root="2.16.840.1.113883.10.20.22.4.202" (CONF:10489). + constraint 'template_id', {:cardinality=>"1..1", :value=>{:root=>"2.16.840.1.113883.10.20.22.4.202", :extension=>"2016-11-01"}} + + # SHALL contain exactly one [1..1] code (CONF:7477). + constraint 'code', {:cardinality=>"1..1", :value=>{:code=>"34109-9", :display_name=>"Note", :code_system=>"2.16.840.1.113883.6.1", :codeSystemName=>"LOINC"}} + + constraint 'code.translation', {:cardinality=>"1..1", :value=>{:code=>"11506-3", :display_name=>"ProgressNote", :code_system=>"2.16.840.1.113883.6.1", :codeSystemName=>"LOINC"}} + + # SHALL contain exactly one [1..1] text (CONF:7270). + constraint 'text', {:cardinality=>"1..1"} + + # This statusCode SHALL contain exactly one [1..1] @code, which SHALL be selected from ValueSet ProblemAct statusCode 2.16.840.1.113883.11.20.9.19 STATIC 2011-09-09 (CONF:19086). + constraint 'status_code.code', {:cardinality=>"1..1"} + + # SHALL contain exactly one [1..1] effectiveTime (CONF:7498). + constraint 'effective_time', {:cardinality=>"1..1"} + end + end +end \ No newline at end of file From 82de1fe60462e7d64ba02210e29bbfe14d27ae3f Mon Sep 17 00:00:00 2001 From: Alyssa Gardiner Date: Wed, 5 Oct 2022 14:34:54 -0400 Subject: [PATCH 2/6] Adding to ccd --- lib/ccd/autoloads.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/ccd/autoloads.rb b/lib/ccd/autoloads.rb index 677b0e0..0338b99 100644 --- a/lib/ccd/autoloads.rb +++ b/lib/ccd/autoloads.rb @@ -276,7 +276,9 @@ module Ccd autoload :ProductInstance, 'ccd/models/product_instance.rb' autoload :ProductInstanceTemplate, 'ccd/templates/product_instance_template.rb' autoload :ProgressNote, 'ccd/models/progress_note.rb' + autoload :ProgressNoteAct, 'ccd/models/progress_note.rb' autoload :ProgressNoteTemplate, 'ccd/templates/progress_note_template.rb' + autoload :ProgressNoteActTemplate, 'ccd/templates/progress_note_template.rb' autoload :PurposeOfReferenceObservation, 'ccd/models/purpose_of_reference_observation.rb' autoload :PurposeOfReferenceObservationTemplate, 'ccd/templates/purpose_of_reference_observation_template.rb' autoload :QuantityMeasurementObservation, 'ccd/models/quantity_measurement_observation.rb' From 441e1f0e15f64d3829d1c745e2667ae26a56c38b Mon Sep 17 00:00:00 2001 From: Alyssa Gardiner Date: Wed, 5 Oct 2022 14:36:55 -0400 Subject: [PATCH 3/6] Adding to ccd --- lib/ccd/autoloads.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ccd/autoloads.rb b/lib/ccd/autoloads.rb index 0338b99..015d2d3 100644 --- a/lib/ccd/autoloads.rb +++ b/lib/ccd/autoloads.rb @@ -276,9 +276,9 @@ module Ccd autoload :ProductInstance, 'ccd/models/product_instance.rb' autoload :ProductInstanceTemplate, 'ccd/templates/product_instance_template.rb' autoload :ProgressNote, 'ccd/models/progress_note.rb' - autoload :ProgressNoteAct, 'ccd/models/progress_note.rb' + autoload :ProgressNoteAct, 'ccd/models/progress_note_act.rb' autoload :ProgressNoteTemplate, 'ccd/templates/progress_note_template.rb' - autoload :ProgressNoteActTemplate, 'ccd/templates/progress_note_template.rb' + autoload :ProgressNoteActTemplate, 'ccd/templates/progress_note_act_template.rb' autoload :PurposeOfReferenceObservation, 'ccd/models/purpose_of_reference_observation.rb' autoload :PurposeOfReferenceObservationTemplate, 'ccd/templates/purpose_of_reference_observation_template.rb' autoload :QuantityMeasurementObservation, 'ccd/models/quantity_measurement_observation.rb' From d05e3f8ad6d5aa9cdc0a96c9f37cf5c0496ebc7a Mon Sep 17 00:00:00 2001 From: Alyssa Gardiner Date: Wed, 5 Oct 2022 14:38:03 -0400 Subject: [PATCH 4/6] fixing bundle audit --- .idea/workspace.xml | 59 +++++++++++++++++++++++++++++++++++++++++++++ ruby-cda.gemspec | 2 +- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 .idea/workspace.xml diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..1e775f7 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + 1664989252354 + + + + + + + + + \ No newline at end of file diff --git a/ruby-cda.gemspec b/ruby-cda.gemspec index 6fcfb93..7a7015d 100644 --- a/ruby-cda.gemspec +++ b/ruby-cda.gemspec @@ -15,7 +15,7 @@ Gem::Specification.new do |s| s.homepage = 'https://github.com/niquola/ruby-cda' s.add_dependency 'activesupport', '>= 5.0' - s.add_dependency 'nokogiri', '>= 1.6' + s.add_dependency 'nokogiri', '>= 1.13.4' s.add_dependency 'virtus', '>= 1.0' s.add_dependency 'i18n', '>= 1' From 68bfc073943306f2f79fe55018e13cccd245b2d3 Mon Sep 17 00:00:00 2001 From: Alyssa Gardiner Date: Wed, 5 Oct 2022 14:38:25 -0400 Subject: [PATCH 5/6] fixing bundle audit --- .idea/workspace.xml | 59 --------------------------------------------- 1 file changed, 59 deletions(-) delete mode 100644 .idea/workspace.xml diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 1e775f7..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - 1664989252354 - - - - - - - - - \ No newline at end of file From 15bb90a615cffde57b3257ba0a54cdde79c557bc Mon Sep 17 00:00:00 2001 From: Alyssa Gardiner Date: Wed, 5 Oct 2022 14:40:58 -0400 Subject: [PATCH 6/6] bundle update --- Gemfile.lock | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c939219..f71e5e5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,13 +4,13 @@ PATH ruby-cda (0.3.0) activesupport (>= 5.0) i18n (>= 1) - nokogiri (>= 1.6) + nokogiri (>= 1.13.4) virtus (>= 1.0) GEM remote: https://rubygems.org/ specs: - activesupport (7.0.2.3) + activesupport (7.0.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -25,35 +25,35 @@ GEM concurrent-ruby (1.1.10) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - diff-lcs (1.4.4) - i18n (1.10.0) + diff-lcs (1.5.0) + i18n (1.12.0) concurrent-ruby (~> 1.0) ice_nine (0.11.2) mini_portile2 (2.8.0) - minitest (5.15.0) - nokogiri (1.13.3) + minitest (5.16.3) + nokogiri (1.13.8) mini_portile2 (~> 2.8.0) racc (~> 1.4) racc (1.6.0) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) + rspec (3.11.0) + rspec-core (~> 3.11.0) + rspec-expectations (~> 3.11.0) + rspec-mocks (~> 3.11.0) rspec-collection_matchers (1.2.0) rspec-expectations (>= 2.99.0.beta1) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) + rspec-core (3.11.0) + rspec-support (~> 3.11.0) + rspec-expectations (3.11.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) + rspec-support (~> 3.11.0) + rspec-mocks (3.11.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-support (3.10.2) - rspec_junit_formatter (0.4.1) + rspec-support (~> 3.11.0) + rspec-support (3.11.1) + rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) thread_safe (0.3.6) - tzinfo (2.0.4) + tzinfo (2.0.5) concurrent-ruby (~> 1.0) virtus (2.0.0) axiom-types (~> 0.1)