stupidedi 1.4.0 → 1.4.1

data/lib/stupidedi/transaction_sets/005010/implementations/X220A1-BE834.rb

@@ -21,7 +21,7 @@ module Stupidedi
                 b::Element(e::Required,    "Transaction Set Reference Number", b::MaxLength(50)),
                 b::Element(e::Required,    "Transaction Set Creation Date"),
                 b::Element(e::Required,    "Transaction Set Creation Time"),
-                b::Element(e::NotUsed,     "Time Zone Code"),
+                b::Element(e::Situational, "Time Zone Code"),
                 b::Element(e::Situational, "Original Transaction Set Reference Number"),
                 b::Element(e::NotUsed,     "Transaction Type Code"),
                 b::Element(e::Required,    "Action Code", b::Values("2", "4", "RX")),
@@ -86,7 +86,7 @@ module Stupidedi
                   b::Element(e::Required,    "Member Indicator", b::Values("N", "Y")),
                   b::Element(e::Required,    "Individual Relationship Code", b::Values("01", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "23", "24", "25", "26", "31", "38", "53", "60", "D2", "G8", "G9")),
                   b::Element(e::Required,    "Maintenance Type Code", b::Values("001", "021", "024", "025", "030")),
-                  b::Element(e::Situational, "Maintenance Reason Code", b::Values("01", "03", "04", "05", "06", "07", "08", "09", "10", "11", "14", "15", "16", "17", "18", "20", "21", "22", "25", "26", "27", "28", "29", "31", "32", "33", "37", "38", "39", "40", "41", "43", "59", "AA", "AB", "AC", "AD", "AE", "AF", "AG", "AH", "AI", "AJ", "AL", "EC", "XN", "XT")),
+                  b::Element(e::Situational, "Maintenance Reason Code", b::Values("01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "14", "15", "16", "17", "18", "20", "21", "22", "25", "26", "27", "28", "29", "31", "32", "33", "37", "38", "39", "40", "41", "43", "59", "AA", "AB", "AC", "AD", "AE", "AF", "AG", "AH", "AI", "AJ", "AL", "EC", "XN", "XT")),
                   b::Element(e::Required,    "Benefit Status Code", b::Values("A", "C", "S", "T")),
                   b::Element(e::Situational, "MEDICARE STATUS CODE",
                     b::Element(e::Required,    "Medicare Plan Code", b::Values("A", "B", "C", "D", "E")),

data/lib/stupidedi/transaction_sets/005010/implementations/X279-HB271.rb

@@ -92,7 +92,7 @@ module Stupidedi
                   b::Segment(400, s::REF, "Information Receiver Additional Identification", r::Situational, d::RepeatCount.bounded(9),
                     b::Element(e::Required,    "Reference Identification Qualifier", b::Values("0B", "1C", "1D", "1J", "4A", "CT", "EL", "EO", "HPI", "JD", "N5", "N7", "Q4", "SY", "TJ")),
                     b::Element(e::Required,    "Reference Identification"),
-                    b::Element(e::Situational, "Information Receiver Addtional Identifier State"),
+                    b::Element(e::Situational, "Information Receiver Additional Identifier State"),
                     b::Element(e::NotUsed,     "REFERENCE IDENTIFIER")),
                   b::Segment(850, s::AAA, "Information Receiver Request Validation", r::Situational, d::RepeatCount.bounded(9),
                     b::Element(e::Required,    "Valid Request Indicator", b::Values("N", "Y")),
@@ -176,7 +176,7 @@ module Stupidedi
                     b::Element(e::NotUsed,     "Industry Code")),
                   b::Segment(1100, s::INS, "Subscriber Relationship", r::Situational, d::RepeatCount.bounded(1),
                     b::Element(e::Required,    "Insured Indicator", b::Values("Y")),
-                    b::Element(e::Required,    "Individual Relationsihp Code", b::Values("18")),
+                    b::Element(e::Required,    "Individual Relationship Code", b::Values("18")),
                     b::Element(e::Situational, "Maintenance Type Code", b::Values("001")),
                     b::Element(e::Situational, "Maintenance Reason Code", b::Values("25")),
                     b::Element(e::NotUsed,     "Benefit Status Code"),
@@ -285,7 +285,7 @@ module Stupidedi
                     b::Element(e::Required,    "Information Status Code", b::Values("A", "C", "L", "O", "P", "S", "T")),
                     b::Element(e::Required,    "Employment Status Code", b::Values("AE", "AO", "AS", "AT", "AU", "CC", "DD", "HD", "IR", "LX", "PE", "RE", "RM", "RR", "RU")),
                     b::Element(e::Required,    "Government Service Affiliation Code", b::Values("A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "Q", "R", "S", "U", "W")),
-                    b::Element(e::Situational, "Descrption"),
+                    b::Element(e::Situational, "Description"),
                     b::Element(e::Situational, "Military Service Rank", b::Values("A1", "A2", "A3", "B1", "B2", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "C8", "C9", "E1", "F1", "F2", "F3", "F4", "G1", "G4", "L1", "L2", "L3", "L4", "L5", "L6", "M1", "M2", "M3", "M4", "M5", "M6", "P1", "P2", "P3", "P4", "P5", "R1", "R2", "S1", "S2", "S3", "S4", "S5", "S6", "S7", "S8", "S9", "SA", "SB", "SC", "T1", "V1", "W1")),
                     b::Element(e::Situational, "Date Time Period Format Qualifier", b::Values("D8", "RD8")),
                     b::Element(e::Situational, "Date Time Period")),
@@ -346,8 +346,8 @@ module Stupidedi
                       b::Element(e::NotUsed,     "Printer Carriage Control Code"),
                       b::Element(e::NotUsed,     "Number")),
 
-                    d::LoopDef.build("2115C SUBSCRIBER ELEGIBILITY OR BENEFIT ADDITIONAL INFORMATION", d::RepeatCount.bounded(10),
-                      b::Segment(2600, s::III, "Subscriber Elegibility or Benefit Additional Information", r::Situational, d::RepeatCount.bounded(1),
+                    d::LoopDef.build("2115C SUBSCRIBER ELIGIBILITY OR BENEFIT ADDITIONAL INFORMATION", d::RepeatCount.bounded(10),
+                      b::Segment(2600, s::III, "Subscriber Eligibility or Benefit Additional Information", r::Situational, d::RepeatCount.bounded(1),
                         b::Element(e::Situational, "Code List Qualifier Code", b::Values("GR", "NI", "ZZ")),
                         b::Element(e::Situational, "Industry Code"),
                         b::Element(e::Situational, "Code Category", b::Values("44")),
@@ -382,7 +382,7 @@ module Stupidedi
                           b::Element(e::Situational, "Benefit Related Entity Name Suffix"),
                           b::Element(e::Situational, "Identification Code Qualifier", b::Values("24", "34", "46", "FA", "FI", "II", "MI", "NI", "PI", "PP", "SV", "XV", "XX")),
                           b::Element(e::Situational, "Identification Code"),
-                          b::Element(e::Situational, "Benefit Related Entity Relationsihp Code", b::Values("01", "02", "27", "41", "48", "65", "72")),
+                          b::Element(e::Situational, "Benefit Related Entity Relationship Code", b::Values("01", "02", "27", "41", "48", "65", "72")),
                           b::Element(e::NotUsed,     "Entity Identifier Code"),
                           b::Element(e::NotUsed,     "Name Last or Organization Name")),
                         b::Segment(3600, s::N3, "Subscriber Benefit Related Entity Address", r::Situational, d::RepeatCount.bounded(1),
@@ -445,7 +445,7 @@ module Stupidedi
                     b::Element(e::NotUsed,     "Name Last or Organization Name")),
                   b::Segment(400, s::REF, "Dependent Additional Identification", r::Situational, d::RepeatCount.bounded(9),
                     b::Element(e::Required,    "Reference Identification Qualifier", b::Values("18", "1L", "49", "6P", "CT", "EA", "EJ", "F6", "GH", "HJ", "IF", "IG", "MRC", "N6", "NQ", "Q4", "SY", "Y4")),
-                    b::Element(e::Required,    "Dependent Supplemental Identfier"),
+                    b::Element(e::Required,    "Dependent Supplemental Identifier"),
                     b::Element(e::Situational, "Plan, Group or Plan Network Name"),
                     b::Element(e::NotUsed,     "REFERENCE IDENTIFIER")),
                   b::Segment(600, s::N3, "Dependent Address", r::Situational, d::RepeatCount.bounded(1),
@@ -495,7 +495,7 @@ module Stupidedi
                     b::Element(e::NotUsed,     "Student Status Code"),
                     b::Element(e::NotUsed,     "Yes/No Condition or Response Code"),
                     b::Element(e::NotUsed,     "Date Time Period Format Qualifier"),
-                    b::Element(e::NotUsed,     "Date TIme Period"),
+                    b::Element(e::NotUsed,     "Date Time Period"),
                     b::Element(e::NotUsed,     "Confidentiality Code"),
                     b::Element(e::NotUsed,     "City Name"),
                     b::Element(e::NotUsed,     "State or Province Code"),
@@ -582,10 +582,10 @@ module Stupidedi
                       b::Element(e::NotUsed,     "Version Identifier"),
                       b::Element(e::NotUsed,     "Industry Code"),
                       b::Element(e::NotUsed,     "Yes/No Condition or Response")),
-                    b::Element(e::NotUsed,     "HEALTH CARE CODE INFROMATION"),
-                    b::Element(e::NotUsed,     "HEALTH CARE CODE INFROMATION"),
-                    b::Element(e::NotUsed,     "HEALTH CARE CODE INFROMATION"),
-                    b::Element(e::NotUsed,     "HEALTH CARE CODE INFROMATION")),
+                    b::Element(e::NotUsed,     "HEALTH CARE CODE INFORMATION"),
+                    b::Element(e::NotUsed,     "HEALTH CARE CODE INFORMATION"),
+                    b::Element(e::NotUsed,     "HEALTH CARE CODE INFORMATION"),
+                    b::Element(e::NotUsed,     "HEALTH CARE CODE INFORMATION")),
                   b::Segment(1200, s::DTP, "Dependent Date", r::Situational, d::RepeatCount.bounded(9),
                     b::Element(e::Required,    "Date Time Qualifier", b::Values("096", "102", "152", "291", "307", "318", "340", "341", "342", "343", "346", "347", "356", "357", "382", "435", "442", "458", "472", "539", "540", "636", "771")),
                     b::Element(e::Required,    "Date Time Period Format Qualifier", b::Values("D8", "RD8")),
@@ -593,7 +593,7 @@ module Stupidedi
                   b::Segment(1275, s::MPI, "Dependent Military Personnel Information", r::Situational, d::RepeatCount.bounded(1),
                     b::Element(e::Required,    "Information Status Code", b::Values("A", "C", "L", "O", "P", "S", "T")),
                     b::Element(e::Required,    "Employment Status Code", b::Values("AE", "AO", "AS", "AT", "AU", "CC", "DD", "HD", "IR", "LX", "PE", "RE", "RM", "RR", "RU")),
-                    b::Element(e::Required,    "Government Service Affilition Code", b::Values("A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "Q", "R", "S", "U", "W")),
+                    b::Element(e::Required,    "Government Service Affiliation Code", b::Values("A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "Q", "R", "S", "U", "W")),
                     b::Element(e::Situational, "Description"),
                     b::Element(e::Situational, "Military Service Rank", b::Values("A1", "A2", "A3", "B1", "B2", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "C8", "C9", "E1", "F1", "F2", "F3", "F4", "G1", "G4", "L1", "L2", "L3", "L4", "L5", "L6", "M1", "M2", "M3", "M4", "M5", "M6", "P1", "P2", "P3", "P4", "P5", "R1", "R2", "S1", "S2", "S3", "S4", "S5", "S6", "S7", "S8", "S9", "SA", "SB", "SC", "T1", "V1", "W1")),
                     b::Element(e::Situational, "Date Time Period Format Qualifier", b::Values("D8", "RD8")),

data/lib/stupidedi/transaction_sets/005010/implementations/X279A1-HB271.rb

@@ -357,8 +357,8 @@ module Stupidedi
                       b::Element(e::NotUsed,     "Printer Carriage Control Code"),
                       b::Element(e::NotUsed,     "Number")),
 
-                    d::LoopDef.build("2115C SUBSCRIBER ELEGIBILITY OR BENEFIT ADDITIONAL INFORMATION", d::RepeatCount.bounded(10),
-                      b::Segment(2600, s::III, "Subscriber Elegibility or Benefit Additional Information", r::Situational, d::RepeatCount.bounded(1),
+                    d::LoopDef.build("2115C SUBSCRIBER ELIGIBILITY OR BENEFIT ADDITIONAL INFORMATION", d::RepeatCount.bounded(10),
+                      b::Segment(2600, s::III, "Subscriber Eligibility or Benefit Additional Information", r::Situational, d::RepeatCount.bounded(1),
                         b::Element(e::Situational, "Code List Qualifier Code", b::Values("GR", "NI", "ZZ")),
                         b::Element(e::Situational, "Industry Code"),
                         b::Element(e::Situational, "Code Category", b::Values("44")),

data/lib/stupidedi/transaction_sets/builder.rb

@@ -7,8 +7,12 @@ module Stupidedi
     # {Builder} is a simple DSL for construction a transaction set
     #
     module Builder
+
+      autoload :Dsl, "stupidedi/transaction_sets/builder/dsl"
+
     end
 
+
     class << Builder
       # @return [Schema::TransactionSetDef]
       def build(functional_group, id, name, *table_defs)
@@ -150,7 +154,7 @@ module Stupidedi
         end
 
         allowed_values = arguments.select{|x| x.is_a?(Array) and x.head == :Values }
-
+        
         if allowed_values.length == 1
           begin
             changes[:allowed_values] = element_use.allowed_values.replace(allowed_values.head.last)

data/lib/stupidedi/transaction_sets/builder/dsl.rb

@@ -0,0 +1,192 @@
+module Stupidedi
+  module TransactionSets
+    module Builder
+      class Dsl
+
+        ##
+        # Build a definition for a given document using DSL-style.
+        # DSL style is a bit easier to use than manually building a syntax tree.
+        def self.build(shortcode, code, name, &block)
+          body = DocumentBodyDSL.new(&block).tables
+          Builder.build(shortcode, code, name, *body)
+        end
+
+        private
+
+        ##
+        # Syntax for DSLs in which you can define elements.
+        module ElementSyntax
+
+          ##
+          # Define an element within this block
+          def element(*args)
+            add_element(Builder::Element(*args))
+          end
+
+          ##
+          # Define a composite element within this block, using a sub-block for the sub-elements
+          def composite(*args, &block)
+            subelements = SegmentBodyDSL.new(&block).elements
+            add_element(Builder::Element(*(args + subelements)))
+          end
+
+        end
+
+        ##
+        # Syntax for DSLs in which you can define segments.
+        module SegmentSyntax
+
+          def segment(pos, type, name, requirement, repeat, &block)
+            elements = SegmentBodyDSL.new(&block).elements
+            segment = Builder::Segment(
+              pos,
+              type,
+              name,
+              requirement,
+              repeat,
+              *elements
+            )
+
+            add_segment(segment)
+          end
+
+        end
+
+        ##
+        # Syntax for DSLs in which you can define loops.
+        module LoopSyntax
+
+          ##
+          # Define a loop within this block.
+          # The underscore is there because "loop" is a ruby keyword.
+          def loop_(name, repeat, &block)
+            body = LoopBodyDSL.new(&block).elements
+            add_loop(Schema::LoopDef.build(name, repeat, *body))
+          end
+
+        end
+
+        ##
+        # Syntax for DSLs in which you can define tables.
+        module TableSyntax
+
+          ##
+          # Define a header table within this block.
+          def table_header(name, &block)
+            add_table(Schema::TableDef.header(name, *get_table_contents(&block)))
+          end
+
+          ##
+          # Define a detail table within this block
+          def table_detail(name, &block)
+            add_table(Schema::TableDef.detail(name, *get_table_contents(&block)))
+          end
+
+          ##
+          # Helper method to get the body of a table.
+          def get_table_contents(&block)
+            TableBodyDSL.new(&block).elements
+          end
+
+        end
+
+        ##
+        # Syntax for DSLs in which you can define values lists.
+        module ValuesSyntax
+
+          def values(*args)
+            Builder::Values(*args)
+          end
+
+        end
+
+        ##
+        # A DSL for the body of a loop, which allows defining loops and segments
+        class LoopBodyDSL
+
+          include LoopSyntax
+          include SegmentSyntax
+
+          def initialize(&block)
+            @elements = []
+            instance_eval(&block)
+          end
+
+          attr_accessor :elements
+
+          def add_loop(loop_)
+            elements << loop_
+          end
+
+          def add_segment(segment)
+            elements << segment
+          end
+
+        end
+
+        ##
+        # A DSL for the body of a segment, which allows defining elements and using
+        # values lists.
+        class SegmentBodyDSL
+
+          include ElementSyntax
+          include ValuesSyntax
+
+          def initialize(&block)
+            @elements = []
+            instance_eval(&block)
+          end
+
+          def add_element(e)
+            @elements << e
+          end
+
+          attr_accessor :elements
+        end
+
+        ##
+        # A DSL for the body of a table, which allows defining segments and loops.
+        class TableBodyDSL
+
+          include LoopSyntax
+          include SegmentSyntax
+
+          def initialize(&block)
+            @elements = []
+            instance_eval(&block)
+          end
+
+          def add_loop(l)
+            @elements << l
+          end
+
+          def add_segment(segment)
+            @elements << segment
+          end
+
+          attr_accessor :elements
+        end
+
+        ##
+        # A DSL for the body of a document, which allows defining tables.
+        class DocumentBodyDSL
+
+          include TableSyntax
+
+          def initialize(&block)
+            @tables = []
+            instance_eval(&block)
+          end
+
+          attr_accessor :tables
+
+          def add_table(table)
+            tables << table
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/stupidedi/values/composite_element_val.rb

@@ -17,8 +17,6 @@ module Stupidedi
 
       def_delegators :@usage, :definition, :descriptor
 
-      def_delegators "@children.head", :position
-
       def initialize(children, usage)
         @children, @usage =
           children, usage
@@ -31,6 +29,15 @@ module Stupidedi
           changes.fetch(:usage, @usage)
       end
 
+      def position
+        if @children.present?
+          @children.head.position
+        else
+          # GH-194
+          "<position unknown>"
+        end
+      end
+
       # @return false
       def leaf?
         false

data/lib/stupidedi/values/repeated_element_val.rb

@@ -86,7 +86,7 @@ module Stupidedi
 
       # @return [Boolean]
       def ==(other)
-        eql?(other)
+        eql?(other) or \
          (other.definition == definition and
           other.children   == @children)
       end

data/lib/stupidedi/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Stupidedi
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

data/lib/stupidedi/versions/005010/element_defs.rb

@@ -64,11 +64,15 @@ module Stupidedi
           s::CodeList.build(
             "03"  => "Dependent",
             "13"  => "Contracted Service Provider",
+            "17"  => "Consultant's Office",
+            "1E"  => "Health Maintenance Organization (HMO)",
             "1G"  => "Oncology Center",
+            "1H"  => "Kidney Dialysis Unit",
             "1I"  => "Preferred Provider Organization (PPO)",
             "1O"  => "Acute Care Hospital",
             "1P"  => "Provider",
             "1Q"  => "Military Facility",
+            "1R"  => "University, College or School",
             "1S"  => "Outpatient Surgicenter",
             "1T"  => "Physician, Clinic or Group Practice",
             "1U"  => "Long Term Care Facility",
@@ -77,17 +81,21 @@ module Stupidedi
             "1X"  => "Laboratory",
             "1Y"  => "Retail Pharmacy",
             "1Z"  => "Home Health Care",
+            "28"  => "Subcontractor",
             "2A"  => "Federal, State, County or City Facility",
             "2B"  => "Third-Party Administrator",
             "2D"  => "Miscellaneous Health Care Facility",
             "2E"  => "Non-Health Care Miscellaneous Facility",
             "2I"  => "Church Operated Facility",
+            "2K"  => "Partnership",
             "2J"  => "Individial",
             "2P"  => "Public Health Service Facility",
+            "2Q"  => "Veterans Aadministration Facility",
             "2S"  => "Public Health Service Indian Service Facility",
             "2T"  => "Department of Justice Facility",
             "2Y"  => "General Medical and Surgical Facility",
             "2Z"  => "Hospital Unit of an Institution (Prison Hospital, College Infirmary, etc.)",
+            "30"  => "Service Supplier",
             "31"  => "Postal Mailing Address",
             "36"  => "Employer",
             "3A"  => "Hospital Unit Within an Institution for the Mentally Retarded",
@@ -111,31 +119,94 @@ module Stupidedi
             "3S"  => "Institution for Mental Retardation",
             "3T"  => "Alcoholism and Other Chemical Dependency Facility",
             "3U"  => "General Inpatient Care for AIDS/ARC Facility",
+            "3V"  => "AIDS/ARC Unit",
+            "3W"  => "Specialized Outpatient Program for AIDS/ARC",
+            "3X"  => "Alcohol/Drug Abuse or Dependency Inpatient Unit",
+            "3Y"  => "Alcohol/Drug Abuse or Dependency Outpatient Services",
             "3Z"  => "Arthritis Treatment Center",
             "40"  => "Receiver",
             "41"  => "Submitter",
+            "43"  => "Claimant Authorized Representative",
+            "44"  => "Data Processing Service Bureau",
             "45"  => "Drop-off Location",
+            "4A"  => "Birthing Room/LDRP Room",
+            "4B"  => "Burn Care Unit",
             "4C"  => "Cardiac Catherization Labratory",
             "4D"  => "Open-Heart Surgery Facility",
+            "4E"  => "Cardiac Intensive Car Unit",
             "4F"  => "Angioplasty Facility",
             "4G"  => "Chronic Obstructive Pulmonary Disease Service Facility",
+            "4H"  => "Emergency Department",
             "4I"  => "Trauma Center (Certified)",
+            "4J"  => "Extracorporeal Shock-Wave Lithotripter (ESWL) Unit",
             "4K"  => "Fitness Center",
             "4L"  => "Genetic Counseling/Screening Services",
             "4M"  => "Adult Day Care Program Facility",
+            "4N"  => "Alzheimer's Diagnostic/assessment Service",
             "4O"  => "Comprehensive Geriatric Assessment Facility",
+            "4P"  => "Emergency Response (Geriatric) Unit",
+            "4Q"  => "Geriatric Acute Care Unit",
             "4R"  => "Geriatric Clinics",
             "4S"  => "Respite Care Facility",
+            "4U"  => "Patient Education Unit",
             "4V"  => "Community Health Promotion Facility",
             "4W"  => "Worksite Health Promotion Facility",
             "4X"  => "Hemodialysis Facility",
+            "4Y"  => "Home Health Services",
+            "4Z"  => "Hospice",
+            # yes, the lack of commas are in the document
+            # yes, this makes me very sad
+            "5A"  => "Medical Surgical or Other Intensive Care Unit",
             "5B"  => "Hisopathology Laboratory",
+            "5C"  => "Blood Bank",
+            "5D"  => "Neonatal Intensive Care Unit",
+            "5E"  => "Obstetrics Unit",
+            "5F"  => "Occupational Health Services",
+            "5G"  => "Organized Outpatient Services",
+            "5H"  => "Pediatric Acute Inpatient Unit",
+            "5I"  => "Psychiatric Child/Adolescent Services",
+            "5J"  => "Psychiatric Consultation-Liaison Services",
+            "5K"  => "Psychiatric Education Services",
+            "5L"  => "Psychiatric Emergency Services",
+            "5M"  => "Psychiatric Geriatric Services",
+            "5N"  => "Psychiatric Inpatient Unit",
+            "5O"  => "Psychiatric Outpatient Services",
+            "5P"  => "Psychiatric Partial Hospitalization Program",
+            "5Q"  => "Megavoltage Radiation Therapy Unit",
+            "5R"  => "Radioactive Implants Unit",
             "5S"  => "Therapeutic Radioisotope Facility",
+            "5T"  => "X-Ray Radiation Therapy Unit",
+            "5U"  => "CT Scanner Unit",
             "5V"  => "Diagnostic Radioisotope Facility",
             "5W"  => "Magnetic Resonance Imaging (MRI) Facility",
+            "5X"  => "Ultrasound Unit",
+            "5Y"  => "Rehabilitation Inpatient Unit",
+            "5Z"  => "Rehabilitation Outpatient Services",
+            "61"  => "Performed At",
             "62"  => "Applicant's Employer",
+            "6A"  => "Reproductive Health Services",
+            "6B"  => "Skilled Nursing or Other Long-Term Care Unit",
+            "6C"  => "Single Photon Emission Computerized Tomography (SPECT) Unit",
+            "6D"  => "Organized Social Work Service Facility",
+            "6E"  => "Outpatient Social Work Services",
+            "6F"  => "Emergency Department Social Work Services",
+            "6G"  => "Sports Medicine Clinic/Services",
+            "6H"  => "Hospital Auxiliary Unit",
+            "6I"  => "Patient Representative Services",
+            "6J"  => "Volunteer Services Department",
+            "6K"  => "Putpatient Surgery Services",
+            "6L"  => "Organ/Tissue Transplant Unit",
             "6M"  => "Orthopedic Surgery Facility",
+            "6N"  => "Occupational Therapy Services",
+            "6O"  => "Physical Therapy Services",
+            "6P"  => "Recreational Therapy Services",
+            "6Q"  => "Respiratory Therapy Services",
+            "6R"  => "Speech Therapy Services",
+            "6S"  => "Women's Health Center/Services",
             "6U"  => "Cardiac Rehabilitation Program Facility",
+            "6V"  => "non-Invasive Cardiac Assessment Services",
+            "6W"  => "Emergency Medical Technician",
+            "6X"  => "Disciplinary Contact",
             "6Y"  => "Case Manager",
             "70"  => "Prior Incorrect Insured",
             "71"  => "Attending Physician",
@@ -144,37 +215,60 @@ module Stupidedi
             "74"  => "Corrected Insured",
             "75"  => "Participant",
             "77"  => "Service Location",
+            "7C"  => "Place of Occurence",
             "7O"  => "Federally Chartered Facility",
             "80"  => "Hospital",
             "82"  => "Rendering Provider",
+            "84"  => "Subscriber's Employer",
             "85"  => "Billing Provider",
             "87"  => "Pay-to Provider",
             "8B"  => "Primary Residence",
+            "95"  => "Research Institute",
             "98"  => "Receiver",
             "9K"  => "Key Person",
             "AG"  => "Agent/Agency",
             "AY"  => "Clearinghouse",
             "BO"  => "Broker or Sales Office",
+            "CK"  => "Pharmacist",
+            "CZ"  => "Admitting Surgeon",
             "D0"  => "Admitting Physician",
+            "D2"  => "Commerical Insurer",
             "DD"  => "Assistant Surgeon",
+            "DJ"  => "Consulting Physician",
             "DK"  => "Ordering Physician",
             "DN"  => "Referring Provider",
             "DQ"  => "Supervising Physician",
+            "DO"  => "Dependent Name",
+            "DQ"  => "Supervising Physician",
+            # RESTART HERE
             "E1"  => "Person or Other Entity Legally Responsible for a Child",
+            "E2"  => "Person or Other Entity With Whom a Child Resides",
+            "E7"  => "Previous Employer",
+            "E9"  => "Participating Laboratory",
             "EI"  => "Executor of Estate",
             "EXS" => "Ex-spouse",
             "EY"  => "@todo",
             "FA"  => "Facility",
+            "FD"  => "Physical Address",
+            "FE"  => "Mail Address",
             "FS"  => "Final Scheduled Destination",
+            "G0"  => "Dependent Insured",
             "G3"  => "Clinic",
             "GB"  => "Other Insured",
+            "GD"  => "Guardian",
+            "GI"  => "Paramedic",
+            "GJ"  => "Paramedical Company",
+            "GK"  => "Previous Insured",
+            "GM"  => "Spouse Insured",
             "GP"  => "Gateway Provider",
             "GD"  => "Guardian",
             "GW"  => "Group",
+            "GY"  => "Treatment Facility",
             "HF"  => "Healthcare Professional Shortage Area (HPSA) Facility",
             "HH"  => "Home Health Agency",
             "HK"  => "Subscriber",
             "I3"  => "Independent Physicians Association (IPA)",
+            "IJ"  => "Injection Point",
             "IL"  => "Insured or Subscriber",
             "IN"  => "Insurer",
             "J6"  => "Power of Attorney",
@@ -183,36 +277,57 @@ module Stupidedi
             "LR"  => "Legal Representative",
             "M5"  => "Migrant Health Clinic",
             "M8"  => "Educational Institution",
+            "MR"  => "Medical INsurance Carrier",
             "MSC" => "Mammography Screening Center",
             "ND"  => "Next Destination",
             "O4"  => "Factor",
+            "OB"  => "Ordered By",
             "OC"  => "Origin Carrier",
             "OD"  => "Doctor of Optometry",
             "OOP" => "Other Operating Physician",
             "OX"  => "Oxygen Therapy Facility",
             "P0"  => "Patient Facility",
+            "P2"  => "Primary Insured or Subscriber",
             "P3"  => "Primary Care Provider",
             "P4"  => "Prior Insurance Carrier",
             "P5"  => "Plan Sponsor",
+            "P6"  => "Third Party Reviewing Preferred Provider Organization (PPO)",
+            "P7"  => "Third Party Reviewing Preferred Provider Organization (PPO)",
             "PE"  => "Payee",
+            "PT"  => "Party to Receive Test Report",
             "PTP" => "Pay-to Plan Name",
             "PR"  => "Payer",
             "PRP" => "Primary Payer",
+            "PV"  => "Party performing certification",
             "PW"  => "Pickup Address",
             "QA"  => "Pharmacy",
             "QB"  => "Purchase Service Provider",
             "QC"  => "Patient",
             "QD"  => "Responsible Party",
+            "QE"  => "Policyholder",
+            "QH"  => "Physician",
+            "QK"  => "Managed Care",
+            "QL"  => "Chiropractor",
             "QN"  => "Dentist",
             "QM"  => "Dialysis Centers",
+            "QO"  => "Doctor of Osteopathy",
+            "QS"  => "Podiatrist",
             "QV"  => "Group Practice",
+            "QY"  => "Medical Doctor",
             "R3"  => "Next Scheduled Destination",
+            "RC"  => "Receiving Location",
+            "RW"  => "Rural Health Clinic",
             "S1"  => "Parent",
             "S3"  => "Custodial Parent",
+            "S4"  => "Skilled Nursing Facility",
             "SEP" => "Secondary Payer",
             "SJ"  => "Service Provider",
+            "SU"  => "Suppplier/Manufacturer",
+            # Used to identify the geographic location where a patient is transferred or diverted
+            "T4"  => "Transfer Point",
             "TL"  => "Testing Laboratory",
             "TP"  => "Primary Taxpayer",
+            "TQ"  => "Third Party Reviewing Organization (TPO)",
             "TT"  => "Transfer To",
             "TTP" => "Tertiary Payer",
             "TU"  => "Third Party Repricing Organization (TPO)",
@@ -371,6 +486,7 @@ module Stupidedi
             "T4"  => "Signal Code",
             "TJ"  => "Federal Taxpayer's Identification Number",
             "TV"  => s::CodeList.external("224"),
+            "VV"  => "Voucher",
             "VY"  => "Link Sequence Number",
             "Y4"  => "Agency Claim Number",
             "WH"  => "Master Reference (Link) Number",
@@ -1477,7 +1593,58 @@ module Stupidedi
             "I12" => "Implementation Pattern Match Failure",
             "I13" => "Implementation Dependent 'Not Used' Data Element Present"))
         E623  = t::ID.new(:E623 , "Time Code"                            , 2, 2,
-          s::CodeList.external("94"))
+          s::CodeList.build(
+            "01" => "Equivalent to ISO P01",
+            "02" => "Equivalent to ISO P02",
+            "03" => "Equivalent to ISO P03",
+            "04" => "Equivalent to ISO P04",
+            "05" => "Equivalent to ISO P05",
+            "06" => "Equivalent to ISO P06",
+            "07" => "Equivalent to ISO P07",
+            "08" => "Equivalent to ISO P08",
+            "09" => "Equivalent to ISO P09",
+            "10" => "Equivalent to ISO P10",
+            "11" => "Equivalent to ISO P11",
+            "12" => "Equivalent to ISO P12",
+            "13" => "Equivalent to ISO M12",
+            "14" => "Equivalent to ISO M11",
+            "15" => "Equivalent to ISO M10",
+            "16" => "Equivalent to ISO M09",
+            "17" => "Equivalent to ISO M08",
+            "18" => "Equivalent to ISO M07",
+            "19" => "Equivalent to ISO M06",
+            "20" => "Equivalent to ISO M05",
+            "21" => "Equivalent to ISO M04",
+            "22" => "Equivalent to ISO M03",
+            "23" => "Equivalent to ISO M02",
+            "24" => "Equivalent to ISO M01",
+            "AD" => "Alaska Daylight Time",
+            "AS" => "Alaska Standard Time",
+            "AT" => "Alaska Time",
+            "CD" => "Central Daylight Time",
+            "CS" => "Central Standard Time",
+            "CT" => "Central Time",
+            "ED" => "Eastern Daylight Time",
+            "ES" => "Eastern Standard Time",
+            "ET" => "Eastern Time",
+            "GM" => "Greenwich Mean Time",
+            "HD" => "Hawaii-Aleutian Daylight Time",
+            "HS" => "Hawaii-Aleutian Standard Time",
+            "HT" => "Hawaii-Aleutian Time",
+            "LT" => "Local Time",
+            "MD" => "Mountain Daylight Time",
+            "MS" => "Mountain Standard Time",
+            "MT" => "Mountain Time",
+            "ND" => "Newfoundland Daylight Time",
+            "NS" => "Newfoundland Standard Time",
+            "NT" => "Newfoundland Time",
+            "PD" => "Pacific Daylight Time",
+            "PS" => "Pacific Standard Time",
+            "PT" => "Pacific Time",
+            "TD" => "Atlantic Daylight Time",
+            "TS" => "Atlantic Standard Time",
+            "TT" => "Atlantic Time",
+            "UT" => "Universal Time Coordinate"))
         E628  = t::AN.new(:E628 , "Hierachical ID Number"                , 1, 12)
         E639  = t::ID.new(:E639 , "Basis of Unit Price Code"             , 2, 2)
         E640  = t::ID.new(:E640 , "Transaction Type Code"                , 2, 2,