candidhealth 0.43.1 → 0.45.0

data/lib/candidhealth/charge_capture/v_1/types/charge_capture_data.rb

@@ -5,10 +5,17 @@ require_relative "../../../encounters/v_4/types/intervention"
 require_relative "../../../claim_submission/v_1/types/external_claim_submission_create"
 require_relative "../../../service_lines/v_2/types/service_line_create"
 require_relative "../../../encounters/v_4/types/patient_history_category"
-require_relative "../../../billing_notes/v_2/types/billing_note_optional"
+require_relative "../../../billing_notes/v_2/types/billing_note_base"
+require_relative "../../../individual/types/patient_update_with_optional_address"
+require_relative "../../../service_facility/types/encounter_service_facility_update_with_optional_address"
+require_relative "../../../encounter_providers/v_2/types/rendering_provider_update_with_optional_address"
+require_relative "../../../encounter_providers/v_2/types/initial_referring_provider_update_with_optional_address"
+require_relative "../../../encounter_providers/v_2/types/referring_provider_update_with_optional_address"
+require_relative "../../../encounter_providers/v_2/types/supervising_provider_update_with_optional_address"
+require_relative "../../../encounter_providers/v_2/types/billing_provider_update_with_optional_address"
+require_relative "../../../commons/types/street_address_short_zip_optional"
 require "date"
 require_relative "../../../encounters/v_4/types/clinical_note_category_create"
-require_relative "../../../commons/types/street_address_long_zip"
 require_relative "../../../encounters/v_4/types/billable_status_type"
 require_relative "../../../encounters/v_4/types/responsible_party_type"
 require_relative "../../../encounters/v_4/types/synchronicity_type"
@@ -16,17 +23,10 @@ require_relative "../../../commons/types/facility_type_code"
 require_relative "../../../individual/types/subscriber_create"
 require_relative "../../../encounters/v_4/types/service_authorization_exception_code"
 require_relative "../../../commons/types/delay_reason_code"
-require_relative "../../../individual/types/patient_update"
 require_relative "../../../custom_schemas/v_1/types/schema_instance"
 require_relative "../../../encounters/v_4/types/vitals_update"
 require_relative "../../../encounters/v_4/types/medication"
-require_relative "../../../encounter_providers/v_2/types/rendering_provider_update"
-require_relative "../../../service_facility/types/encounter_service_facility_update"
 require_relative "../../../guarantor/v_1/types/guarantor_update"
-require_relative "../../../encounter_providers/v_2/types/billing_provider_update"
-require_relative "../../../encounter_providers/v_2/types/supervising_provider_update"
-require_relative "../../../encounter_providers/v_2/types/referring_provider_update"
-require_relative "../../../encounter_providers/v_2/types/initial_referring_provider_update"
 require_relative "../../../encounters/v_4/types/epsdt_referral"
 require_relative "../../../encounters/v_4/types/claim_supplemental_information"
 require "ostruct"
@@ -56,9 +56,53 @@ module CandidApiClient
           attr_reader :service_lines
           # @return [Array<CandidApiClient::Encounters::V4::Types::PatientHistoryCategory>]
           attr_reader :patient_histories
-          # @return [Array<CandidApiClient::BillingNotes::V2::Types::BillingNoteOptional>] Spot to store misc, human-readable, notes about this encounter to be
+          # @return [Array<CandidApiClient::BillingNotes::V2::Types::BillingNoteBase>] Spot to store misc, human-readable, notes about this encounter to be
           #  used in the billing process.
           attr_reader :billing_notes
+          # @return [CandidApiClient::Individual::Types::PatientUpdateWithOptionalAddress] Contains the identification information of the individual receiving medical
+          #  services.
+          attr_reader :patient
+          # @return [CandidApiClient::ServiceFacility::Types::EncounterServiceFacilityUpdateWithOptionalAddress] Encounter Service facility is typically the location a medical service was
+          #  rendered, such as a provider office or hospital. For telehealth, service
+          #  facility can represent the provider's location when the service was delivered
+          #  (e.g., home), or the location where an in-person visit would have taken place,
+          #  whichever is easier to identify. If the provider is in-network, service facility
+          #  may be defined in payer contracts. Box 32 on the CMS-1500 claim form. Note that
+          #  for an in-network claim to be successfully adjudicated, the service facility
+          #  address listed on claims must match what was provided to the payer during the
+          #  credentialing process.
+          attr_reader :service_facility
+          # @return [CandidApiClient::EncounterProviders::V2::Types::RenderingProviderUpdateWithOptionalAddress] The rendering provider is the practitioner -- physician, nurse practitioner,
+          #  etc. -- performing the service.
+          #  For telehealth services, the rendering provider performs the visit, asynchronous
+          #  communication, or other service. The rendering provider address should generally
+          #  be the same as the service facility address.
+          attr_reader :rendering_provider
+          # @return [CandidApiClient::EncounterProviders::V2::Types::InitialReferringProviderUpdateWithOptionalAddress] The second iteration of Loop ID-2310. Use code "P3 - Primary Care Provider" in
+          #  this loop to
+          #  indicate the initial referral from the primary care provider or whatever
+          #  provider wrote the initial referral for this patient's episode of care being
+          #  billed/reported in this transaction.
+          attr_reader :initial_referring_provider
+          # @return [CandidApiClient::EncounterProviders::V2::Types::ReferringProviderUpdateWithOptionalAddress] The final provider who referred the services that were rendered.
+          #  All physicians who order services or refer Medicare beneficiaries must
+          #  report this data.
+          attr_reader :referring_provider
+          # @return [CandidApiClient::EncounterProviders::V2::Types::SupervisingProviderUpdateWithOptionalAddress] Required when the rendering provider is supervised by a physician. If not
+          #  required by this implementation guide, do not send.
+          attr_reader :supervising_provider
+          # @return [CandidApiClient::EncounterProviders::V2::Types::BillingProviderUpdateWithOptionalAddress] The billing provider is the provider or business entity submitting the claim.
+          #  Billing provider may be, but is not necessarily, the same person/NPI as the
+          #  rendering provider. From a payer's perspective, this represents the person or
+          #  entity being reimbursed. When a contract exists with the target payer, the
+          #  billing provider should be the entity contracted with the payer. In some
+          #  circumstances, this will be an individual provider. In that case, submit that
+          #  provider's NPI and the tax ID (TIN) that the provider gave to the payer during
+          #  contracting. In other cases, the billing entity will be a medical group. If so,
+          #  submit the group NPI and the group's tax ID. Box 33 on the CMS-1500 claim form.
+          attr_reader :billing_provider
+          # @return [CandidApiClient::Commons::Types::StreetAddressShortZipOptional] Specifies the address to which payments for the claim should be sent.
+          attr_reader :pay_to_address
           # @return [Boolean] Whether this patient has authorized insurance payments to be made to you, not
           #  them. If false, patient may receive reimbursement. Box 13 on the CMS-1500 claim
           #  form.
@@ -84,8 +128,6 @@ module CandidApiClient
           # @return [Array<CandidApiClient::Encounters::V4::Types::ClinicalNoteCategoryCreate>] Holds a collection of clinical observations made by healthcare providers during
           #  patient encounters.
           attr_reader :clinical_notes
-          # @return [CandidApiClient::Commons::Types::StreetAddressLongZip] Specifies the address to which payments for the claim should be sent.
-          attr_reader :pay_to_address
           # @return [CandidApiClient::Encounters::V4::Types::BillableStatusType] Defines if the Encounter is to be billed by Candid to the responsible_party.
           #  Examples for when this should be set to NOT_BILLABLE include if the Encounter
           #  has not occurred yet or if there is no intention of ever billing the
@@ -159,9 +201,6 @@ module CandidApiClient
           # @return [CandidApiClient::Commons::Types::DelayReasonCode] 837i Loop2300, CLM-1300 Box 20
           #  Code indicating the reason why a request was delayed
           attr_reader :delay_reason_code
-          # @return [CandidApiClient::Individual::Types::PatientUpdate] Contains the identification information of the individual receiving medical
-          #  services.
-          attr_reader :patient
           # @return [Boolean] Whether this patient has authorized the release of medical information
           #  for billing purpose.
           #  Box 12 on the CMS-1500 claim form.
@@ -182,47 +221,8 @@ module CandidApiClient
           #  Note all current existing medications on encounter will be overridden with this
           #  list.
           attr_reader :existing_medications
-          # @return [CandidApiClient::EncounterProviders::V2::Types::RenderingProviderUpdate] The rendering provider is the practitioner -- physician, nurse practitioner,
-          #  etc. -- performing the service.
-          #  For telehealth services, the rendering provider performs the visit, asynchronous
-          #  communication, or other service. The rendering provider address should generally
-          #  be the same as the service facility address.
-          attr_reader :rendering_provider
-          # @return [CandidApiClient::ServiceFacility::Types::EncounterServiceFacilityUpdate] Encounter Service facility is typically the location a medical service was
-          #  rendered, such as a provider office or hospital. For telehealth, service
-          #  facility can represent the provider's location when the service was delivered
-          #  (e.g., home), or the location where an in-person visit would have taken place,
-          #  whichever is easier to identify. If the provider is in-network, service facility
-          #  may be defined in payer contracts. Box 32 on the CMS-1500 claim form. Note that
-          #  for an in-network claim to be successfully adjudicated, the service facility
-          #  address listed on claims must match what was provided to the payer during the
-          #  credentialing process.
-          attr_reader :service_facility
           # @return [CandidApiClient::Guarantor::V1::Types::GuarantorUpdate] Personal and contact info for the guarantor of the patient responsibility.
           attr_reader :guarantor
-          # @return [CandidApiClient::EncounterProviders::V2::Types::BillingProviderUpdate] The billing provider is the provider or business entity submitting the claim.
-          #  Billing provider may be, but is not necessarily, the same person/NPI as the
-          #  rendering provider. From a payer's perspective, this represents the person or
-          #  entity being reimbursed. When a contract exists with the target payer, the
-          #  billing provider should be the entity contracted with the payer. In some
-          #  circumstances, this will be an individual provider. In that case, submit that
-          #  provider's NPI and the tax ID (TIN) that the provider gave to the payer during
-          #  contracting. In other cases, the billing entity will be a medical group. If so,
-          #  submit the group NPI and the group's tax ID. Box 33 on the CMS-1500 claim form.
-          attr_reader :billing_provider
-          # @return [CandidApiClient::EncounterProviders::V2::Types::SupervisingProviderUpdate] Required when the rendering provider is supervised by a physician. If not
-          #  required by this implementation guide, do not send.
-          attr_reader :supervising_provider
-          # @return [CandidApiClient::EncounterProviders::V2::Types::ReferringProviderUpdate] The final provider who referred the services that were rendered.
-          #  All physicians who order services or refer Medicare beneficiaries must
-          #  report this data.
-          attr_reader :referring_provider
-          # @return [CandidApiClient::EncounterProviders::V2::Types::InitialReferringProviderUpdate] The second iteration of Loop ID-2310. Use code "P3 - Primary Care Provider" in
-          #  this loop to
-          #  indicate the initial referral from the primary care provider or whatever
-          #  provider wrote the initial referral for this patient's episode of care being
-          #  billed/reported in this transaction.
-          attr_reader :initial_referring_provider
           # @return [String] Refers to REF\*9F on the 837p. Value cannot be greater than 50 characters.
           attr_reader :referral_number
           # @return [CandidApiClient::Encounters::V4::Types::EpsdtReferral] Refers Box 24H on the CMS1500 form and Loop 2300 CRC - EPSDT Referral on the
@@ -231,6 +231,9 @@ module CandidApiClient
           # @return [Array<CandidApiClient::Encounters::V4::Types::ClaimSupplementalInformation>] Refers to Loop 2300 - Segment PWK on the 837P form. No more than 10 entries are
           #  permitted.
           attr_reader :claim_supplemental_information
+          # @return [String] When Medicaid is billed as the secondary payer the Carrier Code is used to
+          #  identify the primary payer. This is required for certain states.
+          attr_reader :secondary_payer_carrier_code
           # @return [OpenStruct] Additional properties unmapped to the current class definition
           attr_reader :additional_properties
           # @return [Object]
@@ -253,8 +256,44 @@ module CandidApiClient
           #  `service_line.diagnosis_pointers`must contain at least one entry which should be
           #  in bounds of the diagnoses list field.
           # @param patient_histories [Array<CandidApiClient::Encounters::V4::Types::PatientHistoryCategory>]
-          # @param billing_notes [Array<CandidApiClient::BillingNotes::V2::Types::BillingNoteOptional>] Spot to store misc, human-readable, notes about this encounter to be
+          # @param billing_notes [Array<CandidApiClient::BillingNotes::V2::Types::BillingNoteBase>] Spot to store misc, human-readable, notes about this encounter to be
           #  used in the billing process.
+          # @param patient [CandidApiClient::Individual::Types::PatientUpdateWithOptionalAddress] Contains the identification information of the individual receiving medical
+          #  services.
+          # @param service_facility [CandidApiClient::ServiceFacility::Types::EncounterServiceFacilityUpdateWithOptionalAddress] Encounter Service facility is typically the location a medical service was
+          #  rendered, such as a provider office or hospital. For telehealth, service
+          #  facility can represent the provider's location when the service was delivered
+          #  (e.g., home), or the location where an in-person visit would have taken place,
+          #  whichever is easier to identify. If the provider is in-network, service facility
+          #  may be defined in payer contracts. Box 32 on the CMS-1500 claim form. Note that
+          #  for an in-network claim to be successfully adjudicated, the service facility
+          #  address listed on claims must match what was provided to the payer during the
+          #  credentialing process.
+          # @param rendering_provider [CandidApiClient::EncounterProviders::V2::Types::RenderingProviderUpdateWithOptionalAddress] The rendering provider is the practitioner -- physician, nurse practitioner,
+          #  etc. -- performing the service.
+          #  For telehealth services, the rendering provider performs the visit, asynchronous
+          #  communication, or other service. The rendering provider address should generally
+          #  be the same as the service facility address.
+          # @param initial_referring_provider [CandidApiClient::EncounterProviders::V2::Types::InitialReferringProviderUpdateWithOptionalAddress] The second iteration of Loop ID-2310. Use code "P3 - Primary Care Provider" in
+          #  this loop to
+          #  indicate the initial referral from the primary care provider or whatever
+          #  provider wrote the initial referral for this patient's episode of care being
+          #  billed/reported in this transaction.
+          # @param referring_provider [CandidApiClient::EncounterProviders::V2::Types::ReferringProviderUpdateWithOptionalAddress] The final provider who referred the services that were rendered.
+          #  All physicians who order services or refer Medicare beneficiaries must
+          #  report this data.
+          # @param supervising_provider [CandidApiClient::EncounterProviders::V2::Types::SupervisingProviderUpdateWithOptionalAddress] Required when the rendering provider is supervised by a physician. If not
+          #  required by this implementation guide, do not send.
+          # @param billing_provider [CandidApiClient::EncounterProviders::V2::Types::BillingProviderUpdateWithOptionalAddress] The billing provider is the provider or business entity submitting the claim.
+          #  Billing provider may be, but is not necessarily, the same person/NPI as the
+          #  rendering provider. From a payer's perspective, this represents the person or
+          #  entity being reimbursed. When a contract exists with the target payer, the
+          #  billing provider should be the entity contracted with the payer. In some
+          #  circumstances, this will be an individual provider. In that case, submit that
+          #  provider's NPI and the tax ID (TIN) that the provider gave to the payer during
+          #  contracting. In other cases, the billing entity will be a medical group. If so,
+          #  submit the group NPI and the group's tax ID. Box 33 on the CMS-1500 claim form.
+          # @param pay_to_address [CandidApiClient::Commons::Types::StreetAddressShortZipOptional] Specifies the address to which payments for the claim should be sent.
           # @param benefits_assigned_to_provider [Boolean] Whether this patient has authorized insurance payments to be made to you, not
           #  them. If false, patient may receive reimbursement. Box 13 on the CMS-1500 claim
           #  form.
@@ -274,7 +313,6 @@ module CandidApiClient
           #  be overridden with this list.
           # @param clinical_notes [Array<CandidApiClient::Encounters::V4::Types::ClinicalNoteCategoryCreate>] Holds a collection of clinical observations made by healthcare providers during
           #  patient encounters.
-          # @param pay_to_address [CandidApiClient::Commons::Types::StreetAddressLongZip] Specifies the address to which payments for the claim should be sent.
           # @param billable_status [CandidApiClient::Encounters::V4::Types::BillableStatusType] Defines if the Encounter is to be billed by Candid to the responsible_party.
           #  Examples for when this should be set to NOT_BILLABLE include if the Encounter
           #  has not occurred yet or if there is no intention of ever billing the
@@ -331,8 +369,6 @@ module CandidApiClient
           #  related to the patient's pregnancy.de
           # @param delay_reason_code [CandidApiClient::Commons::Types::DelayReasonCode] 837i Loop2300, CLM-1300 Box 20
           #  Code indicating the reason why a request was delayed
-          # @param patient [CandidApiClient::Individual::Types::PatientUpdate] Contains the identification information of the individual receiving medical
-          #  services.
           # @param patient_authorized_release [Boolean] Whether this patient has authorized the release of medical information
           #  for billing purpose.
           #  Box 12 on the CMS-1500 claim form.
@@ -349,62 +385,38 @@ module CandidApiClient
           # @param existing_medications [Array<CandidApiClient::Encounters::V4::Types::Medication>] Existing medications that should be on the encounter.
           #  Note all current existing medications on encounter will be overridden with this
           #  list.
-          # @param rendering_provider [CandidApiClient::EncounterProviders::V2::Types::RenderingProviderUpdate] The rendering provider is the practitioner -- physician, nurse practitioner,
-          #  etc. -- performing the service.
-          #  For telehealth services, the rendering provider performs the visit, asynchronous
-          #  communication, or other service. The rendering provider address should generally
-          #  be the same as the service facility address.
-          # @param service_facility [CandidApiClient::ServiceFacility::Types::EncounterServiceFacilityUpdate] Encounter Service facility is typically the location a medical service was
-          #  rendered, such as a provider office or hospital. For telehealth, service
-          #  facility can represent the provider's location when the service was delivered
-          #  (e.g., home), or the location where an in-person visit would have taken place,
-          #  whichever is easier to identify. If the provider is in-network, service facility
-          #  may be defined in payer contracts. Box 32 on the CMS-1500 claim form. Note that
-          #  for an in-network claim to be successfully adjudicated, the service facility
-          #  address listed on claims must match what was provided to the payer during the
-          #  credentialing process.
           # @param guarantor [CandidApiClient::Guarantor::V1::Types::GuarantorUpdate] Personal and contact info for the guarantor of the patient responsibility.
-          # @param billing_provider [CandidApiClient::EncounterProviders::V2::Types::BillingProviderUpdate] The billing provider is the provider or business entity submitting the claim.
-          #  Billing provider may be, but is not necessarily, the same person/NPI as the
-          #  rendering provider. From a payer's perspective, this represents the person or
-          #  entity being reimbursed. When a contract exists with the target payer, the
-          #  billing provider should be the entity contracted with the payer. In some
-          #  circumstances, this will be an individual provider. In that case, submit that
-          #  provider's NPI and the tax ID (TIN) that the provider gave to the payer during
-          #  contracting. In other cases, the billing entity will be a medical group. If so,
-          #  submit the group NPI and the group's tax ID. Box 33 on the CMS-1500 claim form.
-          # @param supervising_provider [CandidApiClient::EncounterProviders::V2::Types::SupervisingProviderUpdate] Required when the rendering provider is supervised by a physician. If not
-          #  required by this implementation guide, do not send.
-          # @param referring_provider [CandidApiClient::EncounterProviders::V2::Types::ReferringProviderUpdate] The final provider who referred the services that were rendered.
-          #  All physicians who order services or refer Medicare beneficiaries must
-          #  report this data.
-          # @param initial_referring_provider [CandidApiClient::EncounterProviders::V2::Types::InitialReferringProviderUpdate] The second iteration of Loop ID-2310. Use code "P3 - Primary Care Provider" in
-          #  this loop to
-          #  indicate the initial referral from the primary care provider or whatever
-          #  provider wrote the initial referral for this patient's episode of care being
-          #  billed/reported in this transaction.
           # @param referral_number [String] Refers to REF\*9F on the 837p. Value cannot be greater than 50 characters.
           # @param epsdt_referral [CandidApiClient::Encounters::V4::Types::EpsdtReferral] Refers Box 24H on the CMS1500 form and Loop 2300 CRC - EPSDT Referral on the
           #  837P form
           # @param claim_supplemental_information [Array<CandidApiClient::Encounters::V4::Types::ClaimSupplementalInformation>] Refers to Loop 2300 - Segment PWK on the 837P form. No more than 10 entries are
           #  permitted.
+          # @param secondary_payer_carrier_code [String] When Medicaid is billed as the secondary payer the Carrier Code is used to
+          #  identify the primary payer. This is required for certain states.
           # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
           # @return [CandidApiClient::ChargeCapture::V1::Types::ChargeCaptureData]
           def initialize(diagnoses: OMIT, interventions: OMIT, external_claim_submission: OMIT, service_lines: OMIT,
-                         patient_histories: OMIT, billing_notes: OMIT, benefits_assigned_to_provider: OMIT, prior_authorization_number: OMIT, external_id: OMIT, date_of_service: OMIT, tag_ids: OMIT, clinical_notes: OMIT, pay_to_address: OMIT, billable_status: OMIT, responsible_party: OMIT, provider_accepts_assignment: OMIT, synchronicity: OMIT, place_of_service_code: OMIT, appointment_type: OMIT, end_date_of_service: OMIT, subscriber_primary: OMIT, subscriber_secondary: OMIT, subscriber_tertiary: OMIT, additional_information: OMIT, service_authorization_exception_code: OMIT, admission_date: OMIT, discharge_date: OMIT, onset_of_current_illness_or_symptom_date: OMIT, last_menstrual_period_date: OMIT, delay_reason_code: OMIT, patient: OMIT, patient_authorized_release: OMIT, schema_instances: OMIT, vitals: OMIT, existing_medications: OMIT, rendering_provider: OMIT, service_facility: OMIT, guarantor: OMIT, billing_provider: OMIT, supervising_provider: OMIT, referring_provider: OMIT, initial_referring_provider: OMIT, referral_number: OMIT, epsdt_referral: OMIT, claim_supplemental_information: OMIT, additional_properties: nil)
+                         patient_histories: OMIT, billing_notes: OMIT, patient: OMIT, service_facility: OMIT, rendering_provider: OMIT, initial_referring_provider: OMIT, referring_provider: OMIT, supervising_provider: OMIT, billing_provider: OMIT, pay_to_address: OMIT, benefits_assigned_to_provider: OMIT, prior_authorization_number: OMIT, external_id: OMIT, date_of_service: OMIT, tag_ids: OMIT, clinical_notes: OMIT, billable_status: OMIT, responsible_party: OMIT, provider_accepts_assignment: OMIT, synchronicity: OMIT, place_of_service_code: OMIT, appointment_type: OMIT, end_date_of_service: OMIT, subscriber_primary: OMIT, subscriber_secondary: OMIT, subscriber_tertiary: OMIT, additional_information: OMIT, service_authorization_exception_code: OMIT, admission_date: OMIT, discharge_date: OMIT, onset_of_current_illness_or_symptom_date: OMIT, last_menstrual_period_date: OMIT, delay_reason_code: OMIT, patient_authorized_release: OMIT, schema_instances: OMIT, vitals: OMIT, existing_medications: OMIT, guarantor: OMIT, referral_number: OMIT, epsdt_referral: OMIT, claim_supplemental_information: OMIT, secondary_payer_carrier_code: OMIT, additional_properties: nil)
             @diagnoses = diagnoses if diagnoses != OMIT
             @interventions = interventions if interventions != OMIT
             @external_claim_submission = external_claim_submission if external_claim_submission != OMIT
             @service_lines = service_lines if service_lines != OMIT
             @patient_histories = patient_histories if patient_histories != OMIT
             @billing_notes = billing_notes if billing_notes != OMIT
+            @patient = patient if patient != OMIT
+            @service_facility = service_facility if service_facility != OMIT
+            @rendering_provider = rendering_provider if rendering_provider != OMIT
+            @initial_referring_provider = initial_referring_provider if initial_referring_provider != OMIT
+            @referring_provider = referring_provider if referring_provider != OMIT
+            @supervising_provider = supervising_provider if supervising_provider != OMIT
+            @billing_provider = billing_provider if billing_provider != OMIT
+            @pay_to_address = pay_to_address if pay_to_address != OMIT
             @benefits_assigned_to_provider = benefits_assigned_to_provider if benefits_assigned_to_provider != OMIT
             @prior_authorization_number = prior_authorization_number if prior_authorization_number != OMIT
             @external_id = external_id if external_id != OMIT
             @date_of_service = date_of_service if date_of_service != OMIT
             @tag_ids = tag_ids if tag_ids != OMIT
             @clinical_notes = clinical_notes if clinical_notes != OMIT
-            @pay_to_address = pay_to_address if pay_to_address != OMIT
             @billable_status = billable_status if billable_status != OMIT
             @responsible_party = responsible_party if responsible_party != OMIT
             @provider_accepts_assignment = provider_accepts_assignment if provider_accepts_assignment != OMIT
@@ -426,21 +438,15 @@ module CandidApiClient
             end
             @last_menstrual_period_date = last_menstrual_period_date if last_menstrual_period_date != OMIT
             @delay_reason_code = delay_reason_code if delay_reason_code != OMIT
-            @patient = patient if patient != OMIT
             @patient_authorized_release = patient_authorized_release if patient_authorized_release != OMIT
             @schema_instances = schema_instances if schema_instances != OMIT
             @vitals = vitals if vitals != OMIT
             @existing_medications = existing_medications if existing_medications != OMIT
-            @rendering_provider = rendering_provider if rendering_provider != OMIT
-            @service_facility = service_facility if service_facility != OMIT
             @guarantor = guarantor if guarantor != OMIT
-            @billing_provider = billing_provider if billing_provider != OMIT
-            @supervising_provider = supervising_provider if supervising_provider != OMIT
-            @referring_provider = referring_provider if referring_provider != OMIT
-            @initial_referring_provider = initial_referring_provider if initial_referring_provider != OMIT
             @referral_number = referral_number if referral_number != OMIT
             @epsdt_referral = epsdt_referral if epsdt_referral != OMIT
             @claim_supplemental_information = claim_supplemental_information if claim_supplemental_information != OMIT
+            @secondary_payer_carrier_code = secondary_payer_carrier_code if secondary_payer_carrier_code != OMIT
             @additional_properties = additional_properties
             @_field_set = {
               "diagnoses": diagnoses,
@@ -449,13 +455,20 @@ module CandidApiClient
               "service_lines": service_lines,
               "patient_histories": patient_histories,
               "billing_notes": billing_notes,
+              "patient": patient,
+              "service_facility": service_facility,
+              "rendering_provider": rendering_provider,
+              "initial_referring_provider": initial_referring_provider,
+              "referring_provider": referring_provider,
+              "supervising_provider": supervising_provider,
+              "billing_provider": billing_provider,
+              "pay_to_address": pay_to_address,
               "benefits_assigned_to_provider": benefits_assigned_to_provider,
               "prior_authorization_number": prior_authorization_number,
               "external_id": external_id,
               "date_of_service": date_of_service,
               "tag_ids": tag_ids,
               "clinical_notes": clinical_notes,
-              "pay_to_address": pay_to_address,
               "billable_status": billable_status,
               "responsible_party": responsible_party,
               "provider_accepts_assignment": provider_accepts_assignment,
@@ -473,21 +486,15 @@ module CandidApiClient
               "onset_of_current_illness_or_symptom_date": onset_of_current_illness_or_symptom_date,
               "last_menstrual_period_date": last_menstrual_period_date,
               "delay_reason_code": delay_reason_code,
-              "patient": patient,
               "patient_authorized_release": patient_authorized_release,
               "schema_instances": schema_instances,
               "vitals": vitals,
               "existing_medications": existing_medications,
-              "rendering_provider": rendering_provider,
-              "service_facility": service_facility,
               "guarantor": guarantor,
-              "billing_provider": billing_provider,
-              "supervising_provider": supervising_provider,
-              "referring_provider": referring_provider,
-              "initial_referring_provider": initial_referring_provider,
               "referral_number": referral_number,
               "epsdt_referral": epsdt_referral,
-              "claim_supplemental_information": claim_supplemental_information
+              "claim_supplemental_information": claim_supplemental_information,
+              "secondary_payer_carrier_code": secondary_payer_carrier_code
             }.reject do |_k, v|
               v == OMIT
             end
@@ -524,7 +531,55 @@ module CandidApiClient
             end
             billing_notes = parsed_json["billing_notes"]&.map do |item|
               item = item.to_json
-              CandidApiClient::BillingNotes::V2::Types::BillingNoteOptional.from_json(json_object: item)
+              CandidApiClient::BillingNotes::V2::Types::BillingNoteBase.from_json(json_object: item)
+            end
+            if parsed_json["patient"].nil?
+              patient = nil
+            else
+              patient = parsed_json["patient"].to_json
+              patient = CandidApiClient::Individual::Types::PatientUpdateWithOptionalAddress.from_json(json_object: patient)
+            end
+            if parsed_json["service_facility"].nil?
+              service_facility = nil
+            else
+              service_facility = parsed_json["service_facility"].to_json
+              service_facility = CandidApiClient::ServiceFacility::Types::EncounterServiceFacilityUpdateWithOptionalAddress.from_json(json_object: service_facility)
+            end
+            if parsed_json["rendering_provider"].nil?
+              rendering_provider = nil
+            else
+              rendering_provider = parsed_json["rendering_provider"].to_json
+              rendering_provider = CandidApiClient::EncounterProviders::V2::Types::RenderingProviderUpdateWithOptionalAddress.from_json(json_object: rendering_provider)
+            end
+            if parsed_json["initial_referring_provider"].nil?
+              initial_referring_provider = nil
+            else
+              initial_referring_provider = parsed_json["initial_referring_provider"].to_json
+              initial_referring_provider = CandidApiClient::EncounterProviders::V2::Types::InitialReferringProviderUpdateWithOptionalAddress.from_json(json_object: initial_referring_provider)
+            end
+            if parsed_json["referring_provider"].nil?
+              referring_provider = nil
+            else
+              referring_provider = parsed_json["referring_provider"].to_json
+              referring_provider = CandidApiClient::EncounterProviders::V2::Types::ReferringProviderUpdateWithOptionalAddress.from_json(json_object: referring_provider)
+            end
+            if parsed_json["supervising_provider"].nil?
+              supervising_provider = nil
+            else
+              supervising_provider = parsed_json["supervising_provider"].to_json
+              supervising_provider = CandidApiClient::EncounterProviders::V2::Types::SupervisingProviderUpdateWithOptionalAddress.from_json(json_object: supervising_provider)
+            end
+            if parsed_json["billing_provider"].nil?
+              billing_provider = nil
+            else
+              billing_provider = parsed_json["billing_provider"].to_json
+              billing_provider = CandidApiClient::EncounterProviders::V2::Types::BillingProviderUpdateWithOptionalAddress.from_json(json_object: billing_provider)
+            end
+            if parsed_json["pay_to_address"].nil?
+              pay_to_address = nil
+            else
+              pay_to_address = parsed_json["pay_to_address"].to_json
+              pay_to_address = CandidApiClient::Commons::Types::StreetAddressShortZipOptional.from_json(json_object: pay_to_address)
             end
             benefits_assigned_to_provider = struct["benefits_assigned_to_provider"]
             prior_authorization_number = struct["prior_authorization_number"]
@@ -535,12 +590,6 @@ module CandidApiClient
               item = item.to_json
               CandidApiClient::Encounters::V4::Types::ClinicalNoteCategoryCreate.from_json(json_object: item)
             end
-            if parsed_json["pay_to_address"].nil?
-              pay_to_address = nil
-            else
-              pay_to_address = parsed_json["pay_to_address"].to_json
-              pay_to_address = CandidApiClient::Commons::Types::StreetAddressLongZip.from_json(json_object: pay_to_address)
-            end
             billable_status = struct["billable_status"]
             responsible_party = struct["responsible_party"]
             provider_accepts_assignment = struct["provider_accepts_assignment"]
@@ -579,12 +628,6 @@ module CandidApiClient
                                            Date.parse(parsed_json["last_menstrual_period_date"])
                                          end
             delay_reason_code = struct["delay_reason_code"]
-            if parsed_json["patient"].nil?
-              patient = nil
-            else
-              patient = parsed_json["patient"].to_json
-              patient = CandidApiClient::Individual::Types::PatientUpdate.from_json(json_object: patient)
-            end
             patient_authorized_release = struct["patient_authorized_release"]
             schema_instances = parsed_json["schema_instances"]&.map do |item|
               item = item.to_json
@@ -600,48 +643,12 @@ module CandidApiClient
               item = item.to_json
               CandidApiClient::Encounters::V4::Types::Medication.from_json(json_object: item)
             end
-            if parsed_json["rendering_provider"].nil?
-              rendering_provider = nil
-            else
-              rendering_provider = parsed_json["rendering_provider"].to_json
-              rendering_provider = CandidApiClient::EncounterProviders::V2::Types::RenderingProviderUpdate.from_json(json_object: rendering_provider)
-            end
-            if parsed_json["service_facility"].nil?
-              service_facility = nil
-            else
-              service_facility = parsed_json["service_facility"].to_json
-              service_facility = CandidApiClient::ServiceFacility::Types::EncounterServiceFacilityUpdate.from_json(json_object: service_facility)
-            end
             if parsed_json["guarantor"].nil?
               guarantor = nil
             else
               guarantor = parsed_json["guarantor"].to_json
               guarantor = CandidApiClient::Guarantor::V1::Types::GuarantorUpdate.from_json(json_object: guarantor)
             end
-            if parsed_json["billing_provider"].nil?
-              billing_provider = nil
-            else
-              billing_provider = parsed_json["billing_provider"].to_json
-              billing_provider = CandidApiClient::EncounterProviders::V2::Types::BillingProviderUpdate.from_json(json_object: billing_provider)
-            end
-            if parsed_json["supervising_provider"].nil?
-              supervising_provider = nil
-            else
-              supervising_provider = parsed_json["supervising_provider"].to_json
-              supervising_provider = CandidApiClient::EncounterProviders::V2::Types::SupervisingProviderUpdate.from_json(json_object: supervising_provider)
-            end
-            if parsed_json["referring_provider"].nil?
-              referring_provider = nil
-            else
-              referring_provider = parsed_json["referring_provider"].to_json
-              referring_provider = CandidApiClient::EncounterProviders::V2::Types::ReferringProviderUpdate.from_json(json_object: referring_provider)
-            end
-            if parsed_json["initial_referring_provider"].nil?
-              initial_referring_provider = nil
-            else
-              initial_referring_provider = parsed_json["initial_referring_provider"].to_json
-              initial_referring_provider = CandidApiClient::EncounterProviders::V2::Types::InitialReferringProviderUpdate.from_json(json_object: initial_referring_provider)
-            end
             referral_number = struct["referral_number"]
             if parsed_json["epsdt_referral"].nil?
               epsdt_referral = nil
@@ -653,6 +660,7 @@ module CandidApiClient
               item = item.to_json
               CandidApiClient::Encounters::V4::Types::ClaimSupplementalInformation.from_json(json_object: item)
             end
+            secondary_payer_carrier_code = struct["secondary_payer_carrier_code"]
             new(
               diagnoses: diagnoses,
               interventions: interventions,
@@ -660,13 +668,20 @@ module CandidApiClient
               service_lines: service_lines,
               patient_histories: patient_histories,
               billing_notes: billing_notes,
+              patient: patient,
+              service_facility: service_facility,
+              rendering_provider: rendering_provider,
+              initial_referring_provider: initial_referring_provider,
+              referring_provider: referring_provider,
+              supervising_provider: supervising_provider,
+              billing_provider: billing_provider,
+              pay_to_address: pay_to_address,
               benefits_assigned_to_provider: benefits_assigned_to_provider,
               prior_authorization_number: prior_authorization_number,
               external_id: external_id,
               date_of_service: date_of_service,
               tag_ids: tag_ids,
               clinical_notes: clinical_notes,
-              pay_to_address: pay_to_address,
               billable_status: billable_status,
               responsible_party: responsible_party,
               provider_accepts_assignment: provider_accepts_assignment,
@@ -684,21 +699,15 @@ module CandidApiClient
               onset_of_current_illness_or_symptom_date: onset_of_current_illness_or_symptom_date,
               last_menstrual_period_date: last_menstrual_period_date,
               delay_reason_code: delay_reason_code,
-              patient: patient,
               patient_authorized_release: patient_authorized_release,
               schema_instances: schema_instances,
               vitals: vitals,
               existing_medications: existing_medications,
-              rendering_provider: rendering_provider,
-              service_facility: service_facility,
               guarantor: guarantor,
-              billing_provider: billing_provider,
-              supervising_provider: supervising_provider,
-              referring_provider: referring_provider,
-              initial_referring_provider: initial_referring_provider,
               referral_number: referral_number,
               epsdt_referral: epsdt_referral,
               claim_supplemental_information: claim_supplemental_information,
+              secondary_payer_carrier_code: secondary_payer_carrier_code,
               additional_properties: struct
             )
           end
@@ -723,13 +732,20 @@ module CandidApiClient
             obj.service_lines&.is_a?(Array) != false || raise("Passed value for field obj.service_lines is not the expected type, validation failed.")
             obj.patient_histories&.is_a?(Array) != false || raise("Passed value for field obj.patient_histories is not the expected type, validation failed.")
             obj.billing_notes&.is_a?(Array) != false || raise("Passed value for field obj.billing_notes is not the expected type, validation failed.")
+            obj.patient.nil? || CandidApiClient::Individual::Types::PatientUpdateWithOptionalAddress.validate_raw(obj: obj.patient)
+            obj.service_facility.nil? || CandidApiClient::ServiceFacility::Types::EncounterServiceFacilityUpdateWithOptionalAddress.validate_raw(obj: obj.service_facility)
+            obj.rendering_provider.nil? || CandidApiClient::EncounterProviders::V2::Types::RenderingProviderUpdateWithOptionalAddress.validate_raw(obj: obj.rendering_provider)
+            obj.initial_referring_provider.nil? || CandidApiClient::EncounterProviders::V2::Types::InitialReferringProviderUpdateWithOptionalAddress.validate_raw(obj: obj.initial_referring_provider)
+            obj.referring_provider.nil? || CandidApiClient::EncounterProviders::V2::Types::ReferringProviderUpdateWithOptionalAddress.validate_raw(obj: obj.referring_provider)
+            obj.supervising_provider.nil? || CandidApiClient::EncounterProviders::V2::Types::SupervisingProviderUpdateWithOptionalAddress.validate_raw(obj: obj.supervising_provider)
+            obj.billing_provider.nil? || CandidApiClient::EncounterProviders::V2::Types::BillingProviderUpdateWithOptionalAddress.validate_raw(obj: obj.billing_provider)
+            obj.pay_to_address.nil? || CandidApiClient::Commons::Types::StreetAddressShortZipOptional.validate_raw(obj: obj.pay_to_address)
             obj.benefits_assigned_to_provider&.is_a?(Boolean) != false || raise("Passed value for field obj.benefits_assigned_to_provider is not the expected type, validation failed.")
             obj.prior_authorization_number&.is_a?(String) != false || raise("Passed value for field obj.prior_authorization_number is not the expected type, validation failed.")
             obj.external_id&.is_a?(String) != false || raise("Passed value for field obj.external_id is not the expected type, validation failed.")
             obj.date_of_service&.is_a?(Date) != false || raise("Passed value for field obj.date_of_service is not the expected type, validation failed.")
             obj.tag_ids&.is_a?(Array) != false || raise("Passed value for field obj.tag_ids is not the expected type, validation failed.")
             obj.clinical_notes&.is_a?(Array) != false || raise("Passed value for field obj.clinical_notes is not the expected type, validation failed.")
-            obj.pay_to_address.nil? || CandidApiClient::Commons::Types::StreetAddressLongZip.validate_raw(obj: obj.pay_to_address)
             obj.billable_status&.is_a?(CandidApiClient::Encounters::V4::Types::BillableStatusType) != false || raise("Passed value for field obj.billable_status is not the expected type, validation failed.")
             obj.responsible_party&.is_a?(CandidApiClient::Encounters::V4::Types::ResponsiblePartyType) != false || raise("Passed value for field obj.responsible_party is not the expected type, validation failed.")
             obj.provider_accepts_assignment&.is_a?(Boolean) != false || raise("Passed value for field obj.provider_accepts_assignment is not the expected type, validation failed.")
@@ -747,21 +763,15 @@ module CandidApiClient
             obj.onset_of_current_illness_or_symptom_date&.is_a?(Date) != false || raise("Passed value for field obj.onset_of_current_illness_or_symptom_date is not the expected type, validation failed.")
             obj.last_menstrual_period_date&.is_a?(Date) != false || raise("Passed value for field obj.last_menstrual_period_date is not the expected type, validation failed.")
             obj.delay_reason_code&.is_a?(CandidApiClient::Commons::Types::DelayReasonCode) != false || raise("Passed value for field obj.delay_reason_code is not the expected type, validation failed.")
-            obj.patient.nil? || CandidApiClient::Individual::Types::PatientUpdate.validate_raw(obj: obj.patient)
             obj.patient_authorized_release&.is_a?(Boolean) != false || raise("Passed value for field obj.patient_authorized_release is not the expected type, validation failed.")
             obj.schema_instances&.is_a?(Array) != false || raise("Passed value for field obj.schema_instances is not the expected type, validation failed.")
             obj.vitals.nil? || CandidApiClient::Encounters::V4::Types::VitalsUpdate.validate_raw(obj: obj.vitals)
             obj.existing_medications&.is_a?(Array) != false || raise("Passed value for field obj.existing_medications is not the expected type, validation failed.")
-            obj.rendering_provider.nil? || CandidApiClient::EncounterProviders::V2::Types::RenderingProviderUpdate.validate_raw(obj: obj.rendering_provider)
-            obj.service_facility.nil? || CandidApiClient::ServiceFacility::Types::EncounterServiceFacilityUpdate.validate_raw(obj: obj.service_facility)
             obj.guarantor.nil? || CandidApiClient::Guarantor::V1::Types::GuarantorUpdate.validate_raw(obj: obj.guarantor)
-            obj.billing_provider.nil? || CandidApiClient::EncounterProviders::V2::Types::BillingProviderUpdate.validate_raw(obj: obj.billing_provider)
-            obj.supervising_provider.nil? || CandidApiClient::EncounterProviders::V2::Types::SupervisingProviderUpdate.validate_raw(obj: obj.supervising_provider)
-            obj.referring_provider.nil? || CandidApiClient::EncounterProviders::V2::Types::ReferringProviderUpdate.validate_raw(obj: obj.referring_provider)
-            obj.initial_referring_provider.nil? || CandidApiClient::EncounterProviders::V2::Types::InitialReferringProviderUpdate.validate_raw(obj: obj.initial_referring_provider)
             obj.referral_number&.is_a?(String) != false || raise("Passed value for field obj.referral_number is not the expected type, validation failed.")
             obj.epsdt_referral.nil? || CandidApiClient::Encounters::V4::Types::EpsdtReferral.validate_raw(obj: obj.epsdt_referral)
             obj.claim_supplemental_information&.is_a?(Array) != false || raise("Passed value for field obj.claim_supplemental_information is not the expected type, validation failed.")
+            obj.secondary_payer_carrier_code&.is_a?(String) != false || raise("Passed value for field obj.secondary_payer_carrier_code is not the expected type, validation failed.")
           end
         end
       end