From 98adca5d2cc2c04168df40f3e9d9b5062b697151 Mon Sep 17 00:00:00 2001 From: patrickgmayday Date: Wed, 12 Aug 2026 16:30:28 -0400 Subject: [PATCH 1/3] Use derived NPI type for claim care team providers --- ..._add_claim_care_team_provider_npi_type.sql | 37 ++ .../model/idr_claim_institutional_nch.py | 31 ++ .../model/idr_claim_institutional_ss.py | 26 ++ .../model/idr_claim_item_institutional_nch.py | 6 + .../model/idr_claim_item_institutional_ss.py | 6 + .../model/idr_claim_item_professional_nch.py | 6 + .../model/idr_claim_item_professional_ss.py | 6 + .../model/idr_claim_professional_nch.py | 11 + .../model/idr_claim_professional_ss.py | 11 + .../src/idr_pipeline/model/idr_claim_rx.py | 6 + .../ng/claim/model/AttendingCareTeam.java | 1 + .../server/ng/claim/model/CareTeamBase.java | 22 +- .../ng/claim/model/OperatingCareTeam.java | 1 + .../model/OtherInstitutionalCareTeam.java | 1 + .../model/OtherProfessionalCareTeam.java | 8 + ...therProfessionalSharedSystemsCareTeam.java | 8 + .../ng/claim/model/PrescribingCareTeam.java | 13 +- .../ng/claim/model/ProviderHistoryBase.java | 26 +- .../model/ReferringInstitutionalCareTeam.java | 1 + .../model/ReferringProfessionalCareTeam.java | 8 + .../ng/claim/model/RenderingCareTeam.java | 1 + .../ng/claim/model/RenderingCareTeamLine.java | 1 + .../ng/claim/model/ServiceCareTeam.java | 9 + .../server/ng/__snapshots__/EobReadIT.snap | 19 +- .../ng/__snapshots__/EobSamhsaFilterIT.snap | 6 +- .../server/ng/__snapshots__/EobSearchIT.snap | 334 ++++++++++-------- 26 files changed, 418 insertions(+), 187 deletions(-) create mode 100644 apps/bfd-db-migrator-ng/migrations/V1_39_0__add_claim_care_team_provider_npi_type.sql diff --git a/apps/bfd-db-migrator-ng/migrations/V1_39_0__add_claim_care_team_provider_npi_type.sql b/apps/bfd-db-migrator-ng/migrations/V1_39_0__add_claim_care_team_provider_npi_type.sql new file mode 100644 index 0000000000..bbff319cb4 --- /dev/null +++ b/apps/bfd-db-migrator-ng/migrations/V1_39_0__add_claim_care_team_provider_npi_type.sql @@ -0,0 +1,37 @@ +ALTER TABLE idr.claim_professional_ss +ADD COLUMN bfd_prvdr_othr_npi_type integer, +ADD COLUMN bfd_prvdr_rfrg_npi_type integer; + +ALTER TABLE idr.claim_professional_nch +ADD COLUMN bfd_prvdr_rfrg_npi_type integer, +ADD COLUMN bfd_prvdr_srvc_npi_type integer; + +ALTER TABLE idr.claim_item_institutional_nch +ADD COLUMN bfd_prvdr_rndrng_npi_type integer; + +ALTER TABLE idr.claim_institutional_nch +ADD COLUMN bfd_prvdr_atndg_npi_type integer, +ADD COLUMN bfd_prvdr_oprtg_npi_type integer, +ADD COLUMN bfd_prvdr_othr_npi_type integer, +ADD COLUMN bfd_prvdr_rndrg_npi_type integer, +ADD COLUMN bfd_prvdr_rfrg_npi_type integer, +ADD COLUMN bfd_prvdr_srvc_npi_type integer; + +ALTER TABLE idr.claim_item_institutional_ss +ADD COLUMN bfd_prvdr_rndrng_npi_type integer; + +ALTER TABLE idr.claim_institutional_ss +ADD COLUMN bfd_prvdr_atndg_npi_type integer, +ADD COLUMN bfd_prvdr_oprtg_npi_type integer, +ADD COLUMN bfd_prvdr_othr_npi_type integer, +ADD COLUMN bfd_prvdr_rndrg_npi_type integer, +ADD COLUMN bfd_prvdr_rfrg_npi_type integer; + +ALTER TABLE idr.claim_item_professional_nch +ADD COLUMN bfd_prvdr_rndrng_npi_type integer; + +ALTER TABLE idr.claim_item_professional_ss +ADD COLUMN bfd_prvdr_rndrng_npi_type integer; + +ALTER TABLE idr.claim_rx +ADD COLUMN bfd_prvdr_prscrbng_npi_type integer; diff --git a/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_institutional_nch.py b/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_institutional_nch.py index 1d38de32f0..a6d9bfe66c 100644 --- a/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_institutional_nch.py +++ b/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_institutional_nch.py @@ -54,6 +54,7 @@ clm_rlt_ocrnc_clause, provider_careteam_name_expr, provider_last_or_legal_name_expr, + provider_npi_type_expr, transform_default_date_to_null, transform_default_string, transform_null_date_to_min, @@ -322,6 +323,11 @@ class IdrClaimInstitutionalNch(IdrBaseModel): BeforeValidator(transform_default_string), ] + bfd_prvdr_atndg_npi_type: Annotated[ + int | None, + {EXPR: provider_npi_type_expr(ALIAS_PRVDR_ATNDG)}, + ] + prvdr_rfrg_prvdr_npi_num: Annotated[ str, {COLUMN_MAP: "prvdr_npi_num", ALIAS: ALIAS_PRVDR_RFRG}, @@ -333,6 +339,11 @@ class IdrClaimInstitutionalNch(IdrBaseModel): BeforeValidator(transform_default_string), ] + bfd_prvdr_rfrg_npi_type: Annotated[ + int | None, + {EXPR: provider_npi_type_expr(ALIAS_PRVDR_RFRG)}, + ] + prvdr_othr_prvdr_npi_num: Annotated[ str, {COLUMN_MAP: "prvdr_npi_num", ALIAS: ALIAS_PRVDR_OTHR}, @@ -344,6 +355,11 @@ class IdrClaimInstitutionalNch(IdrBaseModel): BeforeValidator(transform_default_string), ] + bfd_prvdr_othr_npi_type: Annotated[ + int | None, + {EXPR: provider_npi_type_expr(ALIAS_PRVDR_OTHR)}, + ] + prvdr_oprtg_prvdr_npi_num: Annotated[ str, {COLUMN_MAP: "prvdr_npi_num", ALIAS: ALIAS_PRVDR_OPRTG}, @@ -355,6 +371,11 @@ class IdrClaimInstitutionalNch(IdrBaseModel): BeforeValidator(transform_default_string), ] + bfd_prvdr_oprtg_npi_type: Annotated[ + int | None, + {EXPR: provider_npi_type_expr(ALIAS_PRVDR_OPRTG)}, + ] + prvdr_rndrg_prvdr_npi_num: Annotated[ str, {COLUMN_MAP: "prvdr_npi_num", ALIAS: ALIAS_PRVDR_RNDRNG}, @@ -366,6 +387,11 @@ class IdrClaimInstitutionalNch(IdrBaseModel): BeforeValidator(transform_default_string), ] + bfd_prvdr_rndrg_npi_type: Annotated[ + int | None, + {EXPR: provider_npi_type_expr(ALIAS_PRVDR_RNDRNG)}, + ] + prvdr_srvc_prvdr_npi_num: Annotated[ str, {COLUMN_MAP: "prvdr_npi_num", ALIAS: ALIAS_PRVDR_SRVC}, @@ -377,6 +403,11 @@ class IdrClaimInstitutionalNch(IdrBaseModel): BeforeValidator(transform_default_string), ] + bfd_prvdr_srvc_npi_type: Annotated[ + int | None, + {EXPR: provider_npi_type_expr(ALIAS_PRVDR_SRVC)}, + ] + prvdr_blg_prvdr_npi_num: Annotated[ str, {COLUMN_MAP: "prvdr_npi_num", ALIAS: ALIAS_PRVDR_BLG}, diff --git a/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_institutional_ss.py b/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_institutional_ss.py index a7a0b10d55..0d548f1272 100644 --- a/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_institutional_ss.py +++ b/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_institutional_ss.py @@ -57,6 +57,7 @@ clm_rlt_ocrnc_clause, provider_careteam_name_expr, provider_last_or_legal_name_expr, + provider_npi_type_expr, transform_default_date_to_null, transform_default_string, transform_null_date_to_min, @@ -318,6 +319,11 @@ class IdrClaimInstitutionalSs(IdrBaseModel): BeforeValidator(transform_default_string), ] + bfd_prvdr_atndg_npi_type: Annotated[ + int | None, + {EXPR: provider_npi_type_expr(ALIAS_PRVDR_ATNDG)}, + ] + prvdr_rfrg_prvdr_npi_num: Annotated[ str, {COLUMN_MAP: "prvdr_npi_num", ALIAS: ALIAS_PRVDR_RFRG}, @@ -329,6 +335,11 @@ class IdrClaimInstitutionalSs(IdrBaseModel): BeforeValidator(transform_default_string), ] + bfd_prvdr_rfrg_npi_type: Annotated[ + int | None, + {EXPR: provider_npi_type_expr(ALIAS_PRVDR_RFRG)}, + ] + prvdr_othr_prvdr_npi_num: Annotated[ str, {COLUMN_MAP: "prvdr_npi_num", ALIAS: ALIAS_PRVDR_OTHR}, @@ -340,6 +351,11 @@ class IdrClaimInstitutionalSs(IdrBaseModel): BeforeValidator(transform_default_string), ] + bfd_prvdr_othr_npi_type: Annotated[ + int | None, + {EXPR: provider_npi_type_expr(ALIAS_PRVDR_OTHR)}, + ] + prvdr_oprtg_prvdr_npi_num: Annotated[ str, {COLUMN_MAP: "prvdr_npi_num", ALIAS: ALIAS_PRVDR_OPRTG}, @@ -351,6 +367,11 @@ class IdrClaimInstitutionalSs(IdrBaseModel): BeforeValidator(transform_default_string), ] + bfd_prvdr_oprtg_npi_type: Annotated[ + int | None, + {EXPR: provider_npi_type_expr(ALIAS_PRVDR_OPRTG)}, + ] + prvdr_rndrg_prvdr_npi_num: Annotated[ str, {COLUMN_MAP: "prvdr_npi_num", ALIAS: ALIAS_PRVDR_RNDRNG}, @@ -362,6 +383,11 @@ class IdrClaimInstitutionalSs(IdrBaseModel): BeforeValidator(transform_default_string), ] + bfd_prvdr_rndrg_npi_type: Annotated[ + int | None, + {EXPR: provider_npi_type_expr(ALIAS_PRVDR_RNDRNG)}, + ] + prvdr_blg_prvdr_npi_num: Annotated[ str, {COLUMN_MAP: "prvdr_npi_num", ALIAS: ALIAS_PRVDR_BLG}, diff --git a/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_item_institutional_nch.py b/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_item_institutional_nch.py index 64ded80c95..407b4d16bb 100644 --- a/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_item_institutional_nch.py +++ b/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_item_institutional_nch.py @@ -40,6 +40,7 @@ clm_child_query, clm_query, provider_careteam_name_expr, + provider_npi_type_expr, transform_default_date_to_null, transform_default_hipps_code, transform_default_string, @@ -225,6 +226,11 @@ class IdrClaimItemInstitutionalNch(IdrBaseModel): BeforeValidator(transform_default_string), ] + bfd_prvdr_rndrng_npi_type: Annotated[ + int | None, + {EXPR: provider_npi_type_expr(ALIAS_PRVDR_RNDRNG)}, + ] + @override @staticmethod def table() -> str: diff --git a/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_item_institutional_ss.py b/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_item_institutional_ss.py index e095715af4..aee6088b8f 100644 --- a/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_item_institutional_ss.py +++ b/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_item_institutional_ss.py @@ -44,6 +44,7 @@ clm_child_query, clm_query, provider_careteam_name_expr, + provider_npi_type_expr, transform_default_date_to_null, transform_default_hipps_code, transform_default_string, @@ -236,6 +237,11 @@ class IdrClaimItemInstitutionalSs(IdrBaseModel): BeforeValidator(transform_default_string), ] + bfd_prvdr_rndrng_npi_type: Annotated[ + int | None, + {EXPR: provider_npi_type_expr(ALIAS_PRVDR_RNDRNG)}, + ] + # columns derived from v2_mdcr_clm_line_fiss_bnft_svg bfd_clm_bnft_svg_ansi_grp_1_cd: Annotated[ str, {ALIAS: ALIAS_LINE_FISS_BFNT_FLATTENED}, BeforeValidator(transform_default_string) diff --git a/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_item_professional_nch.py b/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_item_professional_nch.py index 34f3927721..8076899d12 100644 --- a/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_item_professional_nch.py +++ b/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_item_professional_nch.py @@ -37,6 +37,7 @@ clm_child_query, clm_query, provider_careteam_name_expr, + provider_npi_type_expr, transform_default_date_to_null, transform_default_string, transform_null_date_to_min, @@ -247,6 +248,11 @@ class IdrClaimItemProfessionalNch(IdrBaseModel): BeforeValidator(transform_default_string), ] + bfd_prvdr_rndrng_npi_type: Annotated[ + int | None, + {EXPR: provider_npi_type_expr(ALIAS_PRVDR_RNDRNG)}, + ] + @override @staticmethod def table() -> str: diff --git a/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_item_professional_ss.py b/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_item_professional_ss.py index aa5f0cc0b4..0631426855 100644 --- a/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_item_professional_ss.py +++ b/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_item_professional_ss.py @@ -39,6 +39,7 @@ clm_child_query, clm_query, provider_careteam_name_expr, + provider_npi_type_expr, transform_default_date_to_null, transform_default_string, transform_null_date_to_min, @@ -217,6 +218,11 @@ class IdrClaimItemProfessionalSs(IdrBaseModel): BeforeValidator(transform_default_string), ] + bfd_prvdr_rndrng_npi_type: Annotated[ + int | None, + {EXPR: provider_npi_type_expr(ALIAS_PRVDR_RNDRNG)}, + ] + @override @staticmethod def table() -> str: diff --git a/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_professional_nch.py b/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_professional_nch.py index f6899b37d4..63bcff302d 100644 --- a/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_professional_nch.py +++ b/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_professional_nch.py @@ -47,6 +47,7 @@ clm_rlt_ocrnc_clause, provider_careteam_name_expr, provider_last_or_legal_name_expr, + provider_npi_type_expr, transform_default_date_to_null, transform_default_string, transform_null_date_to_min, @@ -179,6 +180,11 @@ class IdrClaimProfessionalNch(IdrBaseModel): BeforeValidator(transform_default_string), ] + bfd_prvdr_rfrg_npi_type: Annotated[ + int | None, + {EXPR: provider_npi_type_expr(ALIAS_PRVDR_RFRG)}, + ] + prvdr_srvc_prvdr_npi_num: Annotated[ str, {COLUMN_MAP: "prvdr_npi_num", ALIAS: ALIAS_PRVDR_SRVC}, @@ -190,6 +196,11 @@ class IdrClaimProfessionalNch(IdrBaseModel): BeforeValidator(transform_default_string), ] + bfd_prvdr_srvc_npi_type: Annotated[ + int | None, + {EXPR: provider_npi_type_expr(ALIAS_PRVDR_SRVC)}, + ] + # columns derived from v2_mdcr_clm_ocrnc_sgntr_mbr bfd_clm_ncvrd_from_dt: Annotated[ date | None, diff --git a/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_professional_ss.py b/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_professional_ss.py index 7531b97568..2025b57a18 100644 --- a/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_professional_ss.py +++ b/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_professional_ss.py @@ -50,6 +50,7 @@ clm_rlt_ocrnc_clause, provider_careteam_name_expr, provider_last_or_legal_name_expr, + provider_npi_type_expr, transform_default_date_to_null, transform_default_string, transform_null_date_to_min, @@ -229,6 +230,11 @@ class IdrClaimProfessionalSs(IdrBaseModel): BeforeValidator(transform_default_string), ] + bfd_prvdr_rfrg_npi_type: Annotated[ + int | None, + {EXPR: provider_npi_type_expr(ALIAS_PRVDR_RFRG)}, + ] + prvdr_othr_prvdr_npi_num: Annotated[ str, {COLUMN_MAP: "prvdr_npi_num", ALIAS: ALIAS_PRVDR_OTHR}, @@ -240,6 +246,11 @@ class IdrClaimProfessionalSs(IdrBaseModel): BeforeValidator(transform_default_string), ] + bfd_prvdr_othr_npi_type: Annotated[ + int | None, + {EXPR: provider_npi_type_expr(ALIAS_PRVDR_OTHR)}, + ] + # columns derived from v2_mdcr_clm_ocrnc_sgntr_mbr bfd_clm_ncvrd_from_dt: Annotated[ date | None, diff --git a/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_rx.py b/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_rx.py index 0b66b2ac57..22c1eff87b 100644 --- a/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_rx.py +++ b/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_rx.py @@ -42,6 +42,7 @@ clm_query, provider_careteam_name_expr, provider_last_or_legal_name_expr, + provider_npi_type_expr, transform_default_date_to_null, transform_default_string, transform_null_date_to_min, @@ -241,6 +242,11 @@ class IdrClaimRx(IdrBaseModel): BeforeValidator(transform_default_string), ] + bfd_prvdr_prscrbng_npi_type: Annotated[ + int | None, + {EXPR: provider_npi_type_expr(ALIAS_PRVDR_PRSCRBNG)}, + ] + @override @staticmethod def table() -> str: diff --git a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/AttendingCareTeam.java b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/AttendingCareTeam.java index 20d1be8501..4cbc4fa0af 100644 --- a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/AttendingCareTeam.java +++ b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/AttendingCareTeam.java @@ -9,6 +9,7 @@ @AttributeOverride(name = "providerNpiNumber", column = @Column(name = "prvdr_atndg_prvdr_npi_num")) @AttributeOverride(name = "providerName", column = @Column(name = "bfd_prvdr_atndg_careteam_name")) @AttributeOverride(name = "specialtyCode", column = @Column(name = "clm_atndg_fed_prvdr_spclty_cd")) +@AttributeOverride(name = "npiType", column = @Column(name = "bfd_prvdr_atndg_npi_type")) public class AttendingCareTeam extends CareTeamBase { @Override diff --git a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/CareTeamBase.java b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/CareTeamBase.java index 006a6f9976..bcae905a8b 100644 --- a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/CareTeamBase.java +++ b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/CareTeamBase.java @@ -10,27 +10,19 @@ @MappedSuperclass public abstract class CareTeamBase extends ProviderHistoryBase { private Optional specialtyCode; + private Optional npiType; + + @Override + protected NpiType getNpiType() { + return NpiType.fromNpiTypeCode(npiType); + } @Override Optional toFhirCareTeamComponent( Integer sequence, Optional claimContext) { var careTeamComponent = super.toFhirCareTeamComponent(sequence, claimContext); - careTeamComponent.ifPresent( - ctc -> - specialtyCode.ifPresent( - sc -> { - ctc.setQualification(sc.toFhir()); - - // Determine NPI Type based on provider specialty code - var npiType = sc.getNpiType(); - if (npiType != NpiType.UNKNOWN) { - var reference = ctc.getProvider(); - reference.setType(npiType.getType()); - ctc.setProvider(reference); - } - })); - + ctc -> specialtyCode.ifPresent(sc -> ctc.setQualification(sc.toFhir()))); return careTeamComponent; } } diff --git a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/OperatingCareTeam.java b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/OperatingCareTeam.java index d62bfbe78c..2bcbbb952e 100644 --- a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/OperatingCareTeam.java +++ b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/OperatingCareTeam.java @@ -9,6 +9,7 @@ @AttributeOverride(name = "providerNpiNumber", column = @Column(name = "prvdr_oprtg_prvdr_npi_num")) @AttributeOverride(name = "providerName", column = @Column(name = "bfd_prvdr_oprtg_careteam_name")) @AttributeOverride(name = "specialtyCode", column = @Column(name = "clm_oprtg_fed_prvdr_spclty_cd")) +@AttributeOverride(name = "npiType", column = @Column(name = "bfd_prvdr_oprtg_npi_type")) public class OperatingCareTeam extends CareTeamBase { @Override diff --git a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/OtherInstitutionalCareTeam.java b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/OtherInstitutionalCareTeam.java index 737b0b5388..9cd06f8d28 100644 --- a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/OtherInstitutionalCareTeam.java +++ b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/OtherInstitutionalCareTeam.java @@ -9,6 +9,7 @@ @AttributeOverride(name = "providerNpiNumber", column = @Column(name = "prvdr_othr_prvdr_npi_num")) @AttributeOverride(name = "providerName", column = @Column(name = "bfd_prvdr_othr_careteam_name")) @AttributeOverride(name = "specialtyCode", column = @Column(name = "clm_othr_fed_prvdr_spclty_cd")) +@AttributeOverride(name = "npiType", column = @Column(name = "bfd_prvdr_othr_npi_type")) public class OtherInstitutionalCareTeam extends CareTeamBase { @Override diff --git a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/OtherProfessionalCareTeam.java b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/OtherProfessionalCareTeam.java index 7e22aacd97..3a0ac2080f 100644 --- a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/OtherProfessionalCareTeam.java +++ b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/OtherProfessionalCareTeam.java @@ -3,15 +3,23 @@ import jakarta.persistence.AttributeOverride; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; +import java.util.Optional; /** Attending Provider History. * */ @Embeddable @AttributeOverride(name = "providerNpiNumber", column = @Column(name = "prvdr_othr_prvdr_npi_num")) @AttributeOverride(name = "providerName", column = @Column(name = "bfd_prvdr_othr_careteam_name")) public class OtherProfessionalCareTeam extends ProviderHistoryBase { + @Column(name = "bfd_prvdr_othr_npi_type") + private Optional npiType; @Override protected CareTeamType getCareTeamType() { return CareTeamType.OTHER; } + + @Override + protected NpiType getNpiType() { + return NpiType.fromNpiTypeCode(npiType); + } } diff --git a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/OtherProfessionalSharedSystemsCareTeam.java b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/OtherProfessionalSharedSystemsCareTeam.java index 3fe0075bc5..f20630d827 100644 --- a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/OtherProfessionalSharedSystemsCareTeam.java +++ b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/OtherProfessionalSharedSystemsCareTeam.java @@ -3,15 +3,23 @@ import jakarta.persistence.AttributeOverride; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; +import java.util.Optional; /** Attending Provider History. * */ @Embeddable @AttributeOverride(name = "providerNpiNumber", column = @Column(name = "prvdr_othr_prvdr_npi_num")) @AttributeOverride(name = "providerName", column = @Column(name = "bfd_prvdr_othr_careteam_name")) public class OtherProfessionalSharedSystemsCareTeam extends ProviderHistoryBase { + @Column(name = "bfd_prvdr_othr_npi_type") + private Optional npiType; @Override protected CareTeamType getCareTeamType() { return CareTeamType.SUPERVISOR; } + + @Override + protected NpiType getNpiType() { + return NpiType.fromNpiTypeCode(npiType); + } } diff --git a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/PrescribingCareTeam.java b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/PrescribingCareTeam.java index 9012810ad4..65b4632a0e 100644 --- a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/PrescribingCareTeam.java +++ b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/PrescribingCareTeam.java @@ -15,6 +15,8 @@ name = "providerName", column = @Column(name = "bfd_prvdr_prscrbng_careteam_name")) public class PrescribingCareTeam extends ProviderHistoryBase { + @Column(name = "bfd_prvdr_prscrbng_npi_type") + private Optional npiType; @Column(name = "prvdr_prsbng_id_qlfyr_cd") private Optional providerQualifierCode; @@ -24,6 +26,11 @@ protected CareTeamType getCareTeamType() { return CareTeamType.PRESCRIBING; } + @Override + protected NpiType getNpiType() { + return NpiType.fromNpiTypeCode(npiType); + } + @Override Optional toFhirCareTeamComponent( Integer sequence, Optional claimContext) { @@ -36,7 +43,11 @@ Optional toFhirCareTeamComponent( var providerReference = ProviderFhirHelper.createProviderReferenceWithQualifier( npi, qualifier, getProviderName()); - providerReference.setType(NpiType.INDIVIDUAL.getType()); + + var npiType = getNpiType(); + if (npiType != NpiType.UNKNOWN) { + providerReference.setType(npiType.getType()); + } return getCareTeamComponent(sequence, providerReference); })); diff --git a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/ProviderHistoryBase.java b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/ProviderHistoryBase.java index 5c5762ff44..a895ca8afc 100644 --- a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/ProviderHistoryBase.java +++ b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/ProviderHistoryBase.java @@ -31,22 +31,16 @@ public enum NpiType { private final String type; static NpiType fromNpiTypeCode(Optional npiTypeCode) { - if (npiTypeCode.isPresent() && npiTypeCode.get().equals(2)) { - return ORGANIZATION; - } - return INDIVIDUAL; + return switch (npiTypeCode.orElse(1)) { + case 2 -> ORGANIZATION; + default -> INDIVIDUAL; + }; } } protected abstract CareTeamType getCareTeamType(); - protected ProviderHistoryBase.NpiType getNpiType() { - if (getProviderName().isEmpty()) { - return ProviderHistoryBase.NpiType.ORGANIZATION; - } else { - return ProviderHistoryBase.NpiType.INDIVIDUAL; - } - } + protected abstract NpiType getNpiType(); Optional toFhirCareTeamComponent( Integer sequence, Optional claimContext) { @@ -55,12 +49,10 @@ Optional toFhirCareTeamComponent( } var providerReference = ProviderFhirHelper.createProviderReference(providerNpiNumber.get(), providerName); - claimContext.ifPresent( - claimType -> { - if (claimType == ClaimContext.INSTITUTIONAL) { - providerReference.setType(NpiType.INDIVIDUAL.getType()); - } - }); + var npiType = getNpiType(); + if (npiType != NpiType.UNKNOWN) { + providerReference.setType(npiType.getType()); + } return getCareTeamComponent(sequence, providerReference); } diff --git a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/ReferringInstitutionalCareTeam.java b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/ReferringInstitutionalCareTeam.java index d3192f4b8c..e0e2c84e07 100644 --- a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/ReferringInstitutionalCareTeam.java +++ b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/ReferringInstitutionalCareTeam.java @@ -9,6 +9,7 @@ @AttributeOverride(name = "providerNpiNumber", column = @Column(name = "prvdr_rfrg_prvdr_npi_num")) @AttributeOverride(name = "providerName", column = @Column(name = "bfd_prvdr_rfrg_careteam_name")) @AttributeOverride(name = "specialtyCode", column = @Column(name = "clm_rfrg_fed_prvdr_spclty_cd")) +@AttributeOverride(name = "npiType", column = @Column(name = "bfd_prvdr_rfrg_npi_type")) public class ReferringInstitutionalCareTeam extends CareTeamBase { @Override diff --git a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/ReferringProfessionalCareTeam.java b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/ReferringProfessionalCareTeam.java index f1e580cfc9..ee8a74d1bd 100644 --- a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/ReferringProfessionalCareTeam.java +++ b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/ReferringProfessionalCareTeam.java @@ -3,15 +3,23 @@ import jakarta.persistence.AttributeOverride; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; +import java.util.Optional; /** Attending Provider History. * */ @Embeddable @AttributeOverride(name = "providerNpiNumber", column = @Column(name = "prvdr_rfrg_prvdr_npi_num")) @AttributeOverride(name = "providerName", column = @Column(name = "bfd_prvdr_rfrg_careteam_name")) public class ReferringProfessionalCareTeam extends ProviderHistoryBase { + @Column(name = "bfd_prvdr_rfrg_npi_type") + private Optional npiType; @Override protected CareTeamType getCareTeamType() { return CareTeamType.REFERRING; } + + @Override + protected NpiType getNpiType() { + return NpiType.fromNpiTypeCode(npiType); + } } diff --git a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/RenderingCareTeam.java b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/RenderingCareTeam.java index 2f6b6336fc..03788db867 100644 --- a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/RenderingCareTeam.java +++ b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/RenderingCareTeam.java @@ -9,6 +9,7 @@ @AttributeOverride(name = "providerNpiNumber", column = @Column(name = "prvdr_rndrg_prvdr_npi_num")) @AttributeOverride(name = "providerName", column = @Column(name = "bfd_prvdr_rndrg_careteam_name")) @AttributeOverride(name = "specialtyCode", column = @Column(name = "clm_rndrg_fed_prvdr_spclty_cd")) +@AttributeOverride(name = "npiType", column = @Column(name = "bfd_prvdr_rndrg_npi_type")) public class RenderingCareTeam extends CareTeamBase { @Override diff --git a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/RenderingCareTeamLine.java b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/RenderingCareTeamLine.java index d0b1c992f1..3be1466f96 100644 --- a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/RenderingCareTeamLine.java +++ b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/RenderingCareTeamLine.java @@ -11,6 +11,7 @@ column = @Column(name = "prvdr_rndrng_prvdr_npi_num")) @AttributeOverride(name = "providerName", column = @Column(name = "bfd_prvdr_rndrng_careteam_name")) @AttributeOverride(name = "specialtyCode", column = @Column(name = "clm_rndrg_fed_prvdr_spclty_cd")) +@AttributeOverride(name = "npiType", column = @Column(name = "bfd_prvdr_rndrng_npi_type")) public class RenderingCareTeamLine extends CareTeamBase { @Override diff --git a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/ServiceCareTeam.java b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/ServiceCareTeam.java index 1560927ee9..ba28d281a3 100644 --- a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/ServiceCareTeam.java +++ b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/ServiceCareTeam.java @@ -3,6 +3,7 @@ import jakarta.persistence.AttributeOverride; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; +import java.util.Optional; /** Attending Provider History. * */ @Embeddable @@ -10,8 +11,16 @@ @AttributeOverride(name = "providerName", column = @Column(name = "bfd_prvdr_srvc_careteam_name")) public class ServiceCareTeam extends ProviderHistoryBase { + @Column(name = "bfd_prvdr_srvc_npi_type") + private Optional npiType; + @Override protected CareTeamType getCareTeamType() { return CareTeamType.SERVICE; } + + @Override + protected NpiType getNpiType() { + return NpiType.fromNpiTypeCode(npiType); + } } diff --git a/apps/bfd-server-ng/src/test/java/gov/cms/bfd/server/ng/__snapshots__/EobReadIT.snap b/apps/bfd-server-ng/src/test/java/gov/cms/bfd/server/ng/__snapshots__/EobReadIT.snap index 58bf60258f..c6711ad66b 100644 --- a/apps/bfd-server-ng/src/test/java/gov/cms/bfd/server/ng/__snapshots__/EobReadIT.snap +++ b/apps/bfd-server-ng/src/test/java/gov/cms/bfd/server/ng/__snapshots__/EobReadIT.snap @@ -517,7 +517,7 @@ gov.cms.bfd.server.ng.EobReadIT.eobReadPhase1=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -1918,7 +1918,7 @@ gov.cms.bfd.server.ng.EobReadIT.eobReadPhase2=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -3001,7 +3001,8 @@ gov.cms.bfd.server.ng.EobReadIT.eobReadProfessionalClaim=[ } ] }, "value" : "1558719914" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -3028,7 +3029,8 @@ gov.cms.bfd.server.ng.EobReadIT.eobReadProfessionalClaim=[ } ] }, "value" : "1720749690" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -3701,7 +3703,7 @@ gov.cms.bfd.server.ng.EobReadIT.eobReadProfessionalClaimBillingOrg=[ }, "value" : "1558719914" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -3737,7 +3739,8 @@ gov.cms.bfd.server.ng.EobReadIT.eobReadProfessionalClaimBillingOrg=[ } ] }, "value" : "1720749690" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -4963,7 +4966,7 @@ gov.cms.bfd.server.ng.EobReadIT.eobReadValidLong=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -6724,7 +6727,7 @@ gov.cms.bfd.server.ng.EobReadIT.eobReadValidString=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { diff --git a/apps/bfd-server-ng/src/test/java/gov/cms/bfd/server/ng/__snapshots__/EobSamhsaFilterIT.snap b/apps/bfd-server-ng/src/test/java/gov/cms/bfd/server/ng/__snapshots__/EobSamhsaFilterIT.snap index 0714b8a1d0..fc755838d0 100644 --- a/apps/bfd-server-ng/src/test/java/gov/cms/bfd/server/ng/__snapshots__/EobSamhsaFilterIT.snap +++ b/apps/bfd-server-ng/src/test/java/gov/cms/bfd/server/ng/__snapshots__/EobSamhsaFilterIT.snap @@ -547,7 +547,7 @@ gov.cms.bfd.server.ng.EobSamhsaFilterIT.samhsaClaimsIncludeSecurityTagsWhenAllow }, "value" : "1003488552" }, - "type" : "Practitioner" + "type" : "Organization" }, "role" : { "coding" : [ { @@ -8225,7 +8225,7 @@ gov.cms.bfd.server.ng.EobSamhsaFilterIT.shouldFilterSamhsaNoCert[412457726]=[ }, "value" : "1003488552" }, - "type" : "Practitioner" + "type" : "Organization" }, "role" : { "coding" : [ { @@ -17869,7 +17869,7 @@ gov.cms.bfd.server.ng.EobSamhsaFilterIT.shouldFilterSamhsaSamhsaNotAllowedCert[4 }, "value" : "1003488552" }, - "type" : "Practitioner" + "type" : "Organization" }, "role" : { "coding" : [ { diff --git a/apps/bfd-server-ng/src/test/java/gov/cms/bfd/server/ng/__snapshots__/EobSearchIT.snap b/apps/bfd-server-ng/src/test/java/gov/cms/bfd/server/ng/__snapshots__/EobSearchIT.snap index a0922151a5..a6dc326d7c 100644 --- a/apps/bfd-server-ng/src/test/java/gov/cms/bfd/server/ng/__snapshots__/EobSearchIT.snap +++ b/apps/bfd-server-ng/src/test/java/gov/cms/bfd/server/ng/__snapshots__/EobSearchIT.snap @@ -2075,7 +2075,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByIdMultipleDuplicate[GET]=[ } ] }, "value" : "1558719914" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -2102,7 +2103,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByIdMultipleDuplicate[GET]=[ } ] }, "value" : "1720749690" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -3487,7 +3489,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByIdMultipleDuplicate[GET_WITH_SEARCH } ] }, "value" : "1558719914" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -3514,7 +3517,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByIdMultipleDuplicate[GET_WITH_SEARCH } ] }, "value" : "1720749690" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -4899,7 +4903,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByIdMultipleDuplicate[POST]=[ } ] }, "value" : "1558719914" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -4926,7 +4931,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByIdMultipleDuplicate[POST]=[ } ] }, "value" : "1720749690" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -6311,7 +6317,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByIdMultiple[GET]=[ } ] }, "value" : "1558719914" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -6338,7 +6345,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByIdMultiple[GET]=[ } ] }, "value" : "1720749690" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -7723,7 +7731,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByIdMultiple[GET_WITH_SEARCH]=[ } ] }, "value" : "1558719914" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -7750,7 +7759,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByIdMultiple[GET_WITH_SEARCH]=[ } ] }, "value" : "1720749690" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -9135,7 +9145,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByIdMultiple[POST]=[ } ] }, "value" : "1558719914" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -9162,7 +9173,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByIdMultiple[POST]=[ } ] }, "value" : "1720749690" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -10875,7 +10887,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchById[GET]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -12651,7 +12663,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchById[GET_WITH_SEARCH]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -14427,7 +14439,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchById[POST]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -16203,7 +16215,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByPatientLimitOffset[offset0]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -17982,7 +17994,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByPatientLimitOffset[offset1]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -19760,7 +19772,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByPatient[GET]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -21518,7 +21530,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByPatient[GET]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -23332,7 +23344,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByPatient[GET]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -24730,7 +24742,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByPatient[GET]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -26424,7 +26436,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByPatient[GET]=[ } ] }, "value" : "1558719914" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -26451,7 +26464,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByPatient[GET]=[ } ] }, "value" : "1720749690" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -27506,7 +27520,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByPatient[GET_WITH_SEARCH]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -29264,7 +29278,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByPatient[GET_WITH_SEARCH]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -31078,7 +31092,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByPatient[GET_WITH_SEARCH]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -32476,7 +32490,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByPatient[GET_WITH_SEARCH]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -34170,7 +34184,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByPatient[GET_WITH_SEARCH]=[ } ] }, "value" : "1558719914" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -34197,7 +34212,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByPatient[GET_WITH_SEARCH]=[ } ] }, "value" : "1720749690" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -35252,7 +35268,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByPatient[POST]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -37010,7 +37026,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByPatient[POST]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -38824,7 +38840,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByPatient[POST]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -40222,7 +40238,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByPatient[POST]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -41916,7 +41932,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByPatient[POST]=[ } ] }, "value" : "1558719914" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -41943,7 +41960,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByPatient[POST]=[ } ] }, "value" : "1720749690" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -43014,7 +43032,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchBySources[GET_WITH_SEARCH_WithCombine }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -44772,7 +44790,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchBySources[GET_WITH_SEARCH_WithCombine }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -47850,7 +47868,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchBySources[GET_WITH_SEARCH_WithSource_ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -49248,7 +49266,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchBySources[GET_WITH_SEARCH_WithSource_ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -50690,7 +50708,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchBySources[GET_WithCombinedTagOr]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -52448,7 +52466,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchBySources[GET_WithCombinedTagOr]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -55526,7 +55544,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchBySources[GET_WithSource_FISS]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -56924,7 +56942,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchBySources[GET_WithSource_FISS]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -58366,7 +58384,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchBySources[POST_WithCombinedTagOr]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -60124,7 +60142,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchBySources[POST_WithCombinedTagOr]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -63202,7 +63220,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchBySources[POST_WithSource_FISS]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -64600,7 +64618,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchBySources[POST_WithSource_FISS]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -66026,7 +66044,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WITH_SEARCH_WithCombinedTa }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -67784,7 +67802,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WITH_SEARCH_WithCombinedTa }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -70170,7 +70188,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WITH_SEARCH_WithCombinedTa }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -71928,7 +71946,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WITH_SEARCH_WithCombinedTa }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -73742,7 +73760,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WITH_SEARCH_WithCombinedTa }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -75436,7 +75454,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WITH_SEARCH_WithCombinedTa } ] }, "value" : "1558719914" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -75463,7 +75482,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WITH_SEARCH_WithCombinedTa } ] }, "value" : "1720749690" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -76534,7 +76554,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WITH_SEARCH_WithSystemTag_ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -78292,7 +78312,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WITH_SEARCH_WithSystemTag_ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -80106,7 +80126,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WITH_SEARCH_WithSystemTag_ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -81800,7 +81820,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WITH_SEARCH_WithSystemTag_ } ] }, "value" : "1558719914" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -81827,7 +81848,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WITH_SEARCH_WithSystemTag_ } ] }, "value" : "1720749690" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -82942,7 +82964,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WITH_SEARCH_WithTagFinalAc }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -84022,7 +84044,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WITH_SEARCH_WithTagFinalAc } ] }, "value" : "1558719914" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -84049,7 +84072,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WITH_SEARCH_WithTagFinalAc } ] }, "value" : "1720749690" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -85796,7 +85820,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WITH_SEARCH_WithTag_Shared }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -87194,7 +87218,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WITH_SEARCH_WithTag_Shared }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -88274,7 +88298,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WITH_SEARCH_WithTag_Shared } ] }, "value" : "1558719914" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -88301,7 +88326,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WITH_SEARCH_WithTag_Shared } ] }, "value" : "1720749690" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -89356,7 +89382,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WithCombinedTagOrDDPSNCH]= }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -91114,7 +91140,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WithCombinedTagOrDDPSNCH]= }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -93500,7 +93526,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WithCombinedTagOr]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -95258,7 +95284,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WithCombinedTagOr]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -97072,7 +97098,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WithCombinedTagOr]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -98766,7 +98792,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WithCombinedTagOr]=[ } ] }, "value" : "1558719914" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -98793,7 +98820,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WithCombinedTagOr]=[ } ] }, "value" : "1720749690" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -99864,7 +99892,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WithSystemTag_FinalAction] }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -101622,7 +101650,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WithSystemTag_FinalAction] }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -103436,7 +103464,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WithSystemTag_FinalAction] }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -105130,7 +105158,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WithSystemTag_FinalAction] } ] }, "value" : "1558719914" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -105157,7 +105186,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WithSystemTag_FinalAction] } ] }, "value" : "1720749690" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -106272,7 +106302,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WithTagFinalActionAndShare }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -107352,7 +107382,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WithTagFinalActionAndShare } ] }, "value" : "1558719914" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -107379,7 +107410,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WithTagFinalActionAndShare } ] }, "value" : "1720749690" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -109126,7 +109158,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WithTag_SharedSystem]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -110524,7 +110556,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WithTag_SharedSystem]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -111604,7 +111636,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WithTag_SharedSystem]=[ } ] }, "value" : "1558719914" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -111631,7 +111664,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WithTag_SharedSystem]=[ } ] }, "value" : "1720749690" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -112686,7 +112720,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[POST_WithCombinedTagOrDDPSNCH] }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -114444,7 +114478,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[POST_WithCombinedTagOrDDPSNCH] }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -116830,7 +116864,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[POST_WithCombinedTagOr]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -118588,7 +118622,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[POST_WithCombinedTagOr]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -120402,7 +120436,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[POST_WithCombinedTagOr]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -122096,7 +122130,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[POST_WithCombinedTagOr]=[ } ] }, "value" : "1558719914" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -122123,7 +122158,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[POST_WithCombinedTagOr]=[ } ] }, "value" : "1720749690" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -123194,7 +123230,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[POST_WithSystemTag_FinalAction }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -124952,7 +124988,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[POST_WithSystemTag_FinalAction }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -126766,7 +126802,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[POST_WithSystemTag_FinalAction }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -128460,7 +128496,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[POST_WithSystemTag_FinalAction } ] }, "value" : "1558719914" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -128487,7 +128524,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[POST_WithSystemTag_FinalAction } ] }, "value" : "1720749690" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -129602,7 +129640,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[POST_WithTagFinalActionAndShar }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -130682,7 +130720,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[POST_WithTagFinalActionAndShar } ] }, "value" : "1558719914" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -130709,7 +130748,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[POST_WithTagFinalActionAndShar } ] }, "value" : "1720749690" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -132456,7 +132496,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[POST_WithTag_SharedSystem]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -133854,7 +133894,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[POST_WithTag_SharedSystem]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -134934,7 +134974,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[POST_WithTag_SharedSystem]=[ } ] }, "value" : "1558719914" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -134961,7 +135002,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[POST_WithTag_SharedSystem]=[ } ] }, "value" : "1720749690" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -136016,7 +136058,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[GET_WITH_SEARCH_WithClaimType_ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -137830,7 +137872,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[GET_WITH_SEARCH_WithClaimType_ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -139228,7 +139270,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[GET_WITH_SEARCH_WithClaimType_ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -140654,7 +140696,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[GET_WITH_SEARCH_WithMultipleCl }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -142412,7 +142454,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[GET_WITH_SEARCH_WithMultipleCl }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -144226,7 +144268,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[GET_WITH_SEARCH_WithMultipleCl }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -145624,7 +145666,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[GET_WITH_SEARCH_WithMultipleCl }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -147050,7 +147092,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[GET_WITH_SEARCH_WithWildcard]= }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -148808,7 +148850,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[GET_WITH_SEARCH_WithWildcard]= }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -150622,7 +150664,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[GET_WITH_SEARCH_WithWildcard]= }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -152020,7 +152062,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[GET_WITH_SEARCH_WithWildcard]= }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -153714,7 +153756,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[GET_WITH_SEARCH_WithWildcard]= } ] }, "value" : "1558719914" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -153741,7 +153784,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[GET_WITH_SEARCH_WithWildcard]= } ] }, "value" : "1720749690" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -154796,7 +154840,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[GET_WithClaimType_outpatient]= }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -156610,7 +156654,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[GET_WithClaimType_outpatient]= }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -158008,7 +158052,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[GET_WithClaimType_outpatient]= }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -159434,7 +159478,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[GET_WithMultipleClaimTypes_hha }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -161192,7 +161236,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[GET_WithMultipleClaimTypes_hha }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -163006,7 +163050,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[GET_WithMultipleClaimTypes_hha }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -164404,7 +164448,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[GET_WithMultipleClaimTypes_hha }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -165830,7 +165874,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[GET_WithWildcard]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -167588,7 +167632,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[GET_WithWildcard]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -169402,7 +169446,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[GET_WithWildcard]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -170800,7 +170844,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[GET_WithWildcard]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -172494,7 +172538,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[GET_WithWildcard]=[ } ] }, "value" : "1558719914" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -172521,7 +172566,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[GET_WithWildcard]=[ } ] }, "value" : "1720749690" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -173576,7 +173622,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[POST_WithClaimType_outpatient] }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -175390,7 +175436,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[POST_WithClaimType_outpatient] }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -176788,7 +176834,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[POST_WithClaimType_outpatient] }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -178214,7 +178260,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[POST_WithMultipleClaimTypes_hh }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -179972,7 +180018,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[POST_WithMultipleClaimTypes_hh }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -181786,7 +181832,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[POST_WithMultipleClaimTypes_hh }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -183184,7 +183230,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[POST_WithMultipleClaimTypes_hh }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -184610,7 +184656,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[POST_WithWildcard]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -186368,7 +186414,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[POST_WithWildcard]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -188182,7 +188228,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[POST_WithWildcard]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -189580,7 +189626,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[POST_WithWildcard]=[ }, "value" : "1437702123" }, - "type" : "Organization" + "type" : "Practitioner" }, "qualification" : { "coding" : [ { @@ -191274,7 +191320,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[POST_WithWildcard]=[ } ] }, "value" : "1558719914" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { @@ -191301,7 +191348,8 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[POST_WithWildcard]=[ } ] }, "value" : "1720749690" - } + }, + "type" : "Practitioner" }, "role" : { "coding" : [ { From c5659cd0183f32bfa02f62221fd85b03dc1a8f87 Mon Sep 17 00:00:00 2001 From: patrickgmayday Date: Thu, 13 Aug 2026 10:39:17 -0400 Subject: [PATCH 2/3] SonarQube error for npiType var name resolution. --- .../bfd/server/ng/claim/model/rx/PrescribingCareTeam.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/rx/PrescribingCareTeam.java b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/rx/PrescribingCareTeam.java index f889221c9b..63e801a7a7 100644 --- a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/rx/PrescribingCareTeam.java +++ b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/rx/PrescribingCareTeam.java @@ -49,9 +49,9 @@ public Optional toFhirCareTeamComponent( ProviderFhirHelper.createProviderReferenceWithQualifier( npi, qualifier, getProviderName()); - var npiType = getNpiType(); - if (npiType != NpiType.UNKNOWN) { - providerReference.setType(npiType.getType()); + var providerNpiType = getNpiType(); + if (providerNpiType != NpiType.UNKNOWN) { + providerReference.setType(providerNpiType.getType()); } return getCareTeamComponent(sequence, providerReference); From 86af842ec1f8bb3660771cf4b9169e6a7a139e2c Mon Sep 17 00:00:00 2001 From: patrickgmayday Date: Thu, 13 Aug 2026 16:46:17 -0400 Subject: [PATCH 3/3] Add missing provider NPI mappings for billing as that is part of care team also. --- ..._add_claim_care_team_provider_npi_type.sql | 8 +- .../model/idr_claim_institutional_nch.py | 5 + .../model/idr_claim_institutional_ss.py | 5 + .../model/idr_claim_professional_nch.py | 5 + .../model/idr_claim_professional_ss.py | 5 + .../src/idr_pipeline/model/idr_claim_rx.py | 9 + .../BillingProviderInstitutional.java | 18 +- .../BillingProviderProfessional.java | 18 +- .../model/rx/ServiceProviderPharmacy.java | 15 +- .../server/ng/__snapshots__/EobReadIT.snap | 10 +- .../server/ng/__snapshots__/EobSearchIT.snap | 180 +++++++----------- 11 files changed, 128 insertions(+), 150 deletions(-) diff --git a/apps/bfd-db-migrator-ng/migrations/V1_39_0__add_claim_care_team_provider_npi_type.sql b/apps/bfd-db-migrator-ng/migrations/V1_39_0__add_claim_care_team_provider_npi_type.sql index bbff319cb4..4888285f89 100644 --- a/apps/bfd-db-migrator-ng/migrations/V1_39_0__add_claim_care_team_provider_npi_type.sql +++ b/apps/bfd-db-migrator-ng/migrations/V1_39_0__add_claim_care_team_provider_npi_type.sql @@ -1,8 +1,10 @@ ALTER TABLE idr.claim_professional_ss +ADD COLUMN bfd_blg_prvdr_npi_type integer, ADD COLUMN bfd_prvdr_othr_npi_type integer, ADD COLUMN bfd_prvdr_rfrg_npi_type integer; ALTER TABLE idr.claim_professional_nch +ADD COLUMN bfd_blg_prvdr_npi_type integer, ADD COLUMN bfd_prvdr_rfrg_npi_type integer, ADD COLUMN bfd_prvdr_srvc_npi_type integer; @@ -10,6 +12,7 @@ ALTER TABLE idr.claim_item_institutional_nch ADD COLUMN bfd_prvdr_rndrng_npi_type integer; ALTER TABLE idr.claim_institutional_nch +ADD COLUMN bfd_blg_prvdr_npi_type integer, ADD COLUMN bfd_prvdr_atndg_npi_type integer, ADD COLUMN bfd_prvdr_oprtg_npi_type integer, ADD COLUMN bfd_prvdr_othr_npi_type integer, @@ -21,6 +24,7 @@ ALTER TABLE idr.claim_item_institutional_ss ADD COLUMN bfd_prvdr_rndrng_npi_type integer; ALTER TABLE idr.claim_institutional_ss +ADD COLUMN bfd_blg_prvdr_npi_type integer, ADD COLUMN bfd_prvdr_atndg_npi_type integer, ADD COLUMN bfd_prvdr_oprtg_npi_type integer, ADD COLUMN bfd_prvdr_othr_npi_type integer, @@ -34,4 +38,6 @@ ALTER TABLE idr.claim_item_professional_ss ADD COLUMN bfd_prvdr_rndrng_npi_type integer; ALTER TABLE idr.claim_rx -ADD COLUMN bfd_prvdr_prscrbng_npi_type integer; +ADD COLUMN bfd_prvdr_prscrbng_npi_type integer, +ADD COLUMN bfd_srvc_prvdr_gnrc_id_npi_type integer, +ADD COLUMN bfd_srvc_prvdr_npi_type integer; diff --git a/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_institutional_nch.py b/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_institutional_nch.py index a6d9bfe66c..9db09e0185 100644 --- a/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_institutional_nch.py +++ b/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_institutional_nch.py @@ -424,6 +424,11 @@ class IdrClaimInstitutionalNch(IdrBaseModel): BeforeValidator(transform_default_string), ] + bfd_blg_prvdr_npi_type: Annotated[ + int | None, + {EXPR: provider_npi_type_expr(ALIAS_PRVDR_BLG)}, + ] + # Columns from V2_MDCR_CLM_RLT_COND_SGNTR_MBR clm_rlt_cond_cd: Annotated[ str, {ALIAS: ALIAS_RLT_COND}, BeforeValidator(transform_default_string) diff --git a/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_institutional_ss.py b/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_institutional_ss.py index 0d548f1272..1c0c1e57d6 100644 --- a/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_institutional_ss.py +++ b/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_institutional_ss.py @@ -404,6 +404,11 @@ class IdrClaimInstitutionalSs(IdrBaseModel): BeforeValidator(transform_default_string), ] + bfd_blg_prvdr_npi_type: Annotated[ + int | None, + {EXPR: provider_npi_type_expr(ALIAS_PRVDR_BLG)}, + ] + # Columns from V2_MDCR_CLM_RLT_COND_SGNTR_MBR clm_rlt_cond_cd: Annotated[ str, {ALIAS: ALIAS_RLT_COND}, BeforeValidator(transform_default_string) diff --git a/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_professional_nch.py b/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_professional_nch.py index 63bcff302d..68851089b6 100644 --- a/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_professional_nch.py +++ b/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_professional_nch.py @@ -169,6 +169,11 @@ class IdrClaimProfessionalNch(IdrBaseModel): BeforeValidator(transform_default_string), ] + bfd_blg_prvdr_npi_type: Annotated[ + int | None, + {EXPR: provider_npi_type_expr(ALIAS_PRVDR_BLG)}, + ] + prvdr_rfrg_prvdr_npi_num: Annotated[ str, {COLUMN_MAP: "prvdr_npi_num", ALIAS: ALIAS_PRVDR_RFRG}, diff --git a/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_professional_ss.py b/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_professional_ss.py index 2025b57a18..51e81178c6 100644 --- a/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_professional_ss.py +++ b/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_professional_ss.py @@ -219,6 +219,11 @@ class IdrClaimProfessionalSs(IdrBaseModel): BeforeValidator(transform_default_string), ] + bfd_blg_prvdr_npi_type: Annotated[ + int | None, + {EXPR: provider_npi_type_expr(ALIAS_PRVDR_BLG)}, + ] + prvdr_rfrg_prvdr_npi_num: Annotated[ str, {COLUMN_MAP: "prvdr_npi_num", ALIAS: ALIAS_PRVDR_RFRG}, diff --git a/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_rx.py b/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_rx.py index 22c1eff87b..d05dbf2c29 100644 --- a/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_rx.py +++ b/apps/bfd-pipeline-idr/src/idr_pipeline/model/idr_claim_rx.py @@ -231,6 +231,15 @@ class IdrClaimRx(IdrBaseModel): BeforeValidator(transform_default_string), ] + bfd_srvc_prvdr_npi_type: Annotated[ + int | None, + {EXPR: provider_npi_type_expr(ALIAS_PRVDR_SRVC)}, + ] + bfd_srvc_prvdr_gnrc_id_npi_type: Annotated[ + int | None, + {EXPR: provider_npi_type_expr(ALIAS_PRVDR_SRVC)}, + ] + prvdr_prscrbng_prvdr_npi_num: Annotated[ str, {COLUMN_MAP: "prvdr_npi_num", ALIAS: ALIAS_PRVDR_PRSCRBNG}, diff --git a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/institutional/BillingProviderInstitutional.java b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/institutional/BillingProviderInstitutional.java index 4290686b8f..fe31d832d8 100644 --- a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/institutional/BillingProviderInstitutional.java +++ b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/institutional/BillingProviderInstitutional.java @@ -7,7 +7,6 @@ import jakarta.persistence.AttributeOverride; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; -import jakarta.persistence.Transient; import java.util.Optional; import org.hl7.fhir.r4.model.Address; import org.hl7.fhir.r4.model.DomainResource; @@ -28,6 +27,9 @@ public class BillingProviderInstitutional extends ProviderHistoryBase { @Column(name = "prvdr_blg_1st_name") private Optional providerFirstName; + @Column(name = "bfd_blg_prvdr_npi_type") + private Optional npiType; + @Column(name = "clm_blg_prvdr_oscar_num") private Optional providerOscarNumber; @@ -36,21 +38,9 @@ public CareTeamType getCareTeamType() { return CareTeamType.BILLING; } - /** - * Derives the NPI_TYPE based on the presence of the providerLegalName. NPI_TYPE = INDIVIDUAL - * means the NPI is for an individual (legal name is null/empty). NPI_TYPE = ORGANIZATION means - * the NPI is for an organization (legal name is present). - * - * @return the NPI type - */ - @Transient @Override public ProviderHistoryBase.NpiType getNpiType() { - if (providerFirstName.isEmpty()) { - return ProviderHistoryBase.NpiType.ORGANIZATION; - } else { - return ProviderHistoryBase.NpiType.INDIVIDUAL; - } + return ProviderHistoryBase.NpiType.fromNpiTypeCode(npiType); } /** diff --git a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/professional/BillingProviderProfessional.java b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/professional/BillingProviderProfessional.java index b814130acc..f97f1ad38b 100644 --- a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/professional/BillingProviderProfessional.java +++ b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/professional/BillingProviderProfessional.java @@ -7,7 +7,6 @@ import jakarta.persistence.AttributeOverride; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; -import jakarta.persistence.Transient; import java.util.Optional; import org.hl7.fhir.r4.model.CodeableConcept; import org.hl7.fhir.r4.model.Coding; @@ -26,6 +25,9 @@ public class BillingProviderProfessional extends ProviderHistoryBase { @Column(name = "prvdr_blg_1st_name") private Optional providerFirstName; + @Column(name = "bfd_blg_prvdr_npi_type") + private Optional npiType; + @Column(name = "clm_blg_prvdr_tax_num") private Optional providerTaxNumber; @@ -34,21 +36,9 @@ public CareTeamType getCareTeamType() { return CareTeamType.BILLING; } - /** - * Derives the NPI_TYPE based on the presence of the providerLegalName. NPI_TYPE = INDIVIDUAL - * means the NPI is for an individual (legal name is null/empty). NPI_TYPE = ORGANIZATION means - * the NPI is for an organization (legal name is present). - * - * @return the NPI type - */ - @Transient @Override public ProviderHistoryBase.NpiType getNpiType() { - if (providerFirstName.isEmpty()) { - return ProviderHistoryBase.NpiType.ORGANIZATION; - } else { - return ProviderHistoryBase.NpiType.INDIVIDUAL; - } + return ProviderHistoryBase.NpiType.fromNpiTypeCode(npiType); } /** diff --git a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/rx/ServiceProviderPharmacy.java b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/rx/ServiceProviderPharmacy.java index b0c0f6223a..5ea2638a08 100644 --- a/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/rx/ServiceProviderPharmacy.java +++ b/apps/bfd-server-ng/src/main/java/gov/cms/bfd/server/ng/claim/model/rx/ServiceProviderPharmacy.java @@ -8,7 +8,6 @@ import jakarta.persistence.AttributeOverride; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; -import jakarta.persistence.Transient; import java.util.Optional; import org.hl7.fhir.r4.model.DomainResource; import org.hl7.fhir.r4.model.HumanName; @@ -27,6 +26,12 @@ public class ServiceProviderPharmacy extends ProviderHistoryBase { @Column(name = "prvdr_srvc_1st_name") private Optional providerFirstName; + @Column(name = "bfd_srvc_prvdr_npi_type") + private Optional npiType; + + @Column(name = "bfd_srvc_prvdr_gnrc_id_npi_type") + private Optional genericIdNpiType; + @Column(name = "prvdr_srvc_id_qlfyr_cd") private Optional providerQualifierCode; @@ -36,13 +41,9 @@ public CareTeamType getCareTeamType() { } @Override - @Transient public ProviderHistoryBase.NpiType getNpiType() { - if (providerFirstName.isEmpty() || getProviderNpiNumber().isEmpty()) { - return ProviderHistoryBase.NpiType.ORGANIZATION; - } else { - return ProviderHistoryBase.NpiType.INDIVIDUAL; - } + return ProviderHistoryBase.NpiType.fromNpiTypeCode( + npiType.isPresent() ? npiType : genericIdNpiType); } /** diff --git a/apps/bfd-server-ng/src/test/java/gov/cms/bfd/server/ng/__snapshots__/EobReadIT.snap b/apps/bfd-server-ng/src/test/java/gov/cms/bfd/server/ng/__snapshots__/EobReadIT.snap index c6711ad66b..8c33ae9ce9 100644 --- a/apps/bfd-server-ng/src/test/java/gov/cms/bfd/server/ng/__snapshots__/EobReadIT.snap +++ b/apps/bfd-server-ng/src/test/java/gov/cms/bfd/server/ng/__snapshots__/EobReadIT.snap @@ -3787,6 +3787,7 @@ gov.cms.bfd.server.ng.EobReadIT.eobReadProfessionalClaimBillingOrg=[ "value" : 2.3 } }, { + "active" : true, "id" : "1003488552", "identifier" : [ { "system" : "http://hl7.org/fhir/sid/us-npi", @@ -3800,13 +3801,10 @@ gov.cms.bfd.server.ng.EobReadIT.eobReadProfessionalClaimBillingOrg=[ "value" : "1003488552" } ], "meta" : { - "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Practitioner|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner|7.0.0" ] + "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Organization|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization|7.0.0" ] }, - "name" : [ { - "family" : "CBS Health Corporation", - "given" : [ "Wednesday" ] - } ], - "resourceType" : "Practitioner" + "name" : "CBS Health Corporation", + "resourceType" : "Organization" } ], "created" : "2025-08-15T00:00:00+00:00", "diagnosis" : [ { diff --git a/apps/bfd-server-ng/src/test/java/gov/cms/bfd/server/ng/__snapshots__/EobSearchIT.snap b/apps/bfd-server-ng/src/test/java/gov/cms/bfd/server/ng/__snapshots__/EobSearchIT.snap index a6dc326d7c..3dbfd3660d 100644 --- a/apps/bfd-server-ng/src/test/java/gov/cms/bfd/server/ng/__snapshots__/EobSearchIT.snap +++ b/apps/bfd-server-ng/src/test/java/gov/cms/bfd/server/ng/__snapshots__/EobSearchIT.snap @@ -26489,6 +26489,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByPatient[GET]=[ "name" : "Centers for Medicare and Medicaid Services", "resourceType" : "Organization" }, { + "active" : true, "id" : "1003488552", "identifier" : [ { "system" : "http://hl7.org/fhir/sid/us-npi", @@ -26502,13 +26503,10 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByPatient[GET]=[ "value" : "1003488552" } ], "meta" : { - "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Practitioner|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner|7.0.0" ] + "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Organization|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization|7.0.0" ] }, - "name" : [ { - "family" : "CBS Health Corporation", - "given" : [ "Wednesday" ] - } ], - "resourceType" : "Practitioner" + "name" : "CBS Health Corporation", + "resourceType" : "Organization" } ], "created" : "2025-08-15T00:00:00+00:00", "id" : "3351266481403", @@ -34237,6 +34235,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByPatient[GET_WITH_SEARCH]=[ "name" : "Centers for Medicare and Medicaid Services", "resourceType" : "Organization" }, { + "active" : true, "id" : "1003488552", "identifier" : [ { "system" : "http://hl7.org/fhir/sid/us-npi", @@ -34250,13 +34249,10 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByPatient[GET_WITH_SEARCH]=[ "value" : "1003488552" } ], "meta" : { - "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Practitioner|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner|7.0.0" ] + "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Organization|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization|7.0.0" ] }, - "name" : [ { - "family" : "CBS Health Corporation", - "given" : [ "Wednesday" ] - } ], - "resourceType" : "Practitioner" + "name" : "CBS Health Corporation", + "resourceType" : "Organization" } ], "created" : "2025-08-15T00:00:00+00:00", "id" : "3351266481403", @@ -41985,6 +41981,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByPatient[POST]=[ "name" : "Centers for Medicare and Medicaid Services", "resourceType" : "Organization" }, { + "active" : true, "id" : "1003488552", "identifier" : [ { "system" : "http://hl7.org/fhir/sid/us-npi", @@ -41998,13 +41995,10 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByPatient[POST]=[ "value" : "1003488552" } ], "meta" : { - "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Practitioner|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner|7.0.0" ] + "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Organization|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization|7.0.0" ] }, - "name" : [ { - "family" : "CBS Health Corporation", - "given" : [ "Wednesday" ] - } ], - "resourceType" : "Practitioner" + "name" : "CBS Health Corporation", + "resourceType" : "Organization" } ], "created" : "2025-08-15T00:00:00+00:00", "id" : "3351266481403", @@ -75507,6 +75501,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WITH_SEARCH_WithCombinedTa "name" : "Centers for Medicare and Medicaid Services", "resourceType" : "Organization" }, { + "active" : true, "id" : "1003488552", "identifier" : [ { "system" : "http://hl7.org/fhir/sid/us-npi", @@ -75520,13 +75515,10 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WITH_SEARCH_WithCombinedTa "value" : "1003488552" } ], "meta" : { - "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Practitioner|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner|7.0.0" ] + "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Organization|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization|7.0.0" ] }, - "name" : [ { - "family" : "CBS Health Corporation", - "given" : [ "Wednesday" ] - } ], - "resourceType" : "Practitioner" + "name" : "CBS Health Corporation", + "resourceType" : "Organization" } ], "created" : "2025-08-15T00:00:00+00:00", "id" : "3351266481403", @@ -81873,6 +81865,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WITH_SEARCH_WithSystemTag_ "name" : "Centers for Medicare and Medicaid Services", "resourceType" : "Organization" }, { + "active" : true, "id" : "1003488552", "identifier" : [ { "system" : "http://hl7.org/fhir/sid/us-npi", @@ -81886,13 +81879,10 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WITH_SEARCH_WithSystemTag_ "value" : "1003488552" } ], "meta" : { - "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Practitioner|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner|7.0.0" ] + "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Organization|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization|7.0.0" ] }, - "name" : [ { - "family" : "CBS Health Corporation", - "given" : [ "Wednesday" ] - } ], - "resourceType" : "Practitioner" + "name" : "CBS Health Corporation", + "resourceType" : "Organization" } ], "created" : "2025-08-15T00:00:00+00:00", "id" : "3351266481403", @@ -84097,6 +84087,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WITH_SEARCH_WithTagFinalAc "name" : "Centers for Medicare and Medicaid Services", "resourceType" : "Organization" }, { + "active" : true, "id" : "1003488552", "identifier" : [ { "system" : "http://hl7.org/fhir/sid/us-npi", @@ -84110,13 +84101,10 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WITH_SEARCH_WithTagFinalAc "value" : "1003488552" } ], "meta" : { - "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Practitioner|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner|7.0.0" ] + "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Organization|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization|7.0.0" ] }, - "name" : [ { - "family" : "CBS Health Corporation", - "given" : [ "Wednesday" ] - } ], - "resourceType" : "Practitioner" + "name" : "CBS Health Corporation", + "resourceType" : "Organization" } ], "created" : "2025-08-15T00:00:00+00:00", "id" : "3351266481403", @@ -88351,6 +88339,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WITH_SEARCH_WithTag_Shared "name" : "Centers for Medicare and Medicaid Services", "resourceType" : "Organization" }, { + "active" : true, "id" : "1003488552", "identifier" : [ { "system" : "http://hl7.org/fhir/sid/us-npi", @@ -88364,13 +88353,10 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WITH_SEARCH_WithTag_Shared "value" : "1003488552" } ], "meta" : { - "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Practitioner|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner|7.0.0" ] + "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Organization|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization|7.0.0" ] }, - "name" : [ { - "family" : "CBS Health Corporation", - "given" : [ "Wednesday" ] - } ], - "resourceType" : "Practitioner" + "name" : "CBS Health Corporation", + "resourceType" : "Organization" } ], "created" : "2025-08-15T00:00:00+00:00", "id" : "3351266481403", @@ -98845,6 +98831,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WithCombinedTagOr]=[ "name" : "Centers for Medicare and Medicaid Services", "resourceType" : "Organization" }, { + "active" : true, "id" : "1003488552", "identifier" : [ { "system" : "http://hl7.org/fhir/sid/us-npi", @@ -98858,13 +98845,10 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WithCombinedTagOr]=[ "value" : "1003488552" } ], "meta" : { - "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Practitioner|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner|7.0.0" ] + "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Organization|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization|7.0.0" ] }, - "name" : [ { - "family" : "CBS Health Corporation", - "given" : [ "Wednesday" ] - } ], - "resourceType" : "Practitioner" + "name" : "CBS Health Corporation", + "resourceType" : "Organization" } ], "created" : "2025-08-15T00:00:00+00:00", "id" : "3351266481403", @@ -105211,6 +105195,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WithSystemTag_FinalAction] "name" : "Centers for Medicare and Medicaid Services", "resourceType" : "Organization" }, { + "active" : true, "id" : "1003488552", "identifier" : [ { "system" : "http://hl7.org/fhir/sid/us-npi", @@ -105224,13 +105209,10 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WithSystemTag_FinalAction] "value" : "1003488552" } ], "meta" : { - "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Practitioner|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner|7.0.0" ] + "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Organization|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization|7.0.0" ] }, - "name" : [ { - "family" : "CBS Health Corporation", - "given" : [ "Wednesday" ] - } ], - "resourceType" : "Practitioner" + "name" : "CBS Health Corporation", + "resourceType" : "Organization" } ], "created" : "2025-08-15T00:00:00+00:00", "id" : "3351266481403", @@ -107435,6 +107417,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WithTagFinalActionAndShare "name" : "Centers for Medicare and Medicaid Services", "resourceType" : "Organization" }, { + "active" : true, "id" : "1003488552", "identifier" : [ { "system" : "http://hl7.org/fhir/sid/us-npi", @@ -107448,13 +107431,10 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WithTagFinalActionAndShare "value" : "1003488552" } ], "meta" : { - "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Practitioner|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner|7.0.0" ] + "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Organization|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization|7.0.0" ] }, - "name" : [ { - "family" : "CBS Health Corporation", - "given" : [ "Wednesday" ] - } ], - "resourceType" : "Practitioner" + "name" : "CBS Health Corporation", + "resourceType" : "Organization" } ], "created" : "2025-08-15T00:00:00+00:00", "id" : "3351266481403", @@ -111689,6 +111669,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WithTag_SharedSystem]=[ "name" : "Centers for Medicare and Medicaid Services", "resourceType" : "Organization" }, { + "active" : true, "id" : "1003488552", "identifier" : [ { "system" : "http://hl7.org/fhir/sid/us-npi", @@ -111702,13 +111683,10 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[GET_WithTag_SharedSystem]=[ "value" : "1003488552" } ], "meta" : { - "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Practitioner|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner|7.0.0" ] + "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Organization|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization|7.0.0" ] }, - "name" : [ { - "family" : "CBS Health Corporation", - "given" : [ "Wednesday" ] - } ], - "resourceType" : "Practitioner" + "name" : "CBS Health Corporation", + "resourceType" : "Organization" } ], "created" : "2025-08-15T00:00:00+00:00", "id" : "3351266481403", @@ -122183,6 +122161,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[POST_WithCombinedTagOr]=[ "name" : "Centers for Medicare and Medicaid Services", "resourceType" : "Organization" }, { + "active" : true, "id" : "1003488552", "identifier" : [ { "system" : "http://hl7.org/fhir/sid/us-npi", @@ -122196,13 +122175,10 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[POST_WithCombinedTagOr]=[ "value" : "1003488552" } ], "meta" : { - "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Practitioner|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner|7.0.0" ] + "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Organization|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization|7.0.0" ] }, - "name" : [ { - "family" : "CBS Health Corporation", - "given" : [ "Wednesday" ] - } ], - "resourceType" : "Practitioner" + "name" : "CBS Health Corporation", + "resourceType" : "Organization" } ], "created" : "2025-08-15T00:00:00+00:00", "id" : "3351266481403", @@ -128549,6 +128525,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[POST_WithSystemTag_FinalAction "name" : "Centers for Medicare and Medicaid Services", "resourceType" : "Organization" }, { + "active" : true, "id" : "1003488552", "identifier" : [ { "system" : "http://hl7.org/fhir/sid/us-npi", @@ -128562,13 +128539,10 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[POST_WithSystemTag_FinalAction "value" : "1003488552" } ], "meta" : { - "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Practitioner|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner|7.0.0" ] + "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Organization|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization|7.0.0" ] }, - "name" : [ { - "family" : "CBS Health Corporation", - "given" : [ "Wednesday" ] - } ], - "resourceType" : "Practitioner" + "name" : "CBS Health Corporation", + "resourceType" : "Organization" } ], "created" : "2025-08-15T00:00:00+00:00", "id" : "3351266481403", @@ -130773,6 +130747,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[POST_WithTagFinalActionAndShar "name" : "Centers for Medicare and Medicaid Services", "resourceType" : "Organization" }, { + "active" : true, "id" : "1003488552", "identifier" : [ { "system" : "http://hl7.org/fhir/sid/us-npi", @@ -130786,13 +130761,10 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[POST_WithTagFinalActionAndShar "value" : "1003488552" } ], "meta" : { - "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Practitioner|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner|7.0.0" ] + "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Organization|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization|7.0.0" ] }, - "name" : [ { - "family" : "CBS Health Corporation", - "given" : [ "Wednesday" ] - } ], - "resourceType" : "Practitioner" + "name" : "CBS Health Corporation", + "resourceType" : "Organization" } ], "created" : "2025-08-15T00:00:00+00:00", "id" : "3351266481403", @@ -135027,6 +134999,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[POST_WithTag_SharedSystem]=[ "name" : "Centers for Medicare and Medicaid Services", "resourceType" : "Organization" }, { + "active" : true, "id" : "1003488552", "identifier" : [ { "system" : "http://hl7.org/fhir/sid/us-npi", @@ -135040,13 +135013,10 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByTags[POST_WithTag_SharedSystem]=[ "value" : "1003488552" } ], "meta" : { - "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Practitioner|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner|7.0.0" ] + "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Organization|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization|7.0.0" ] }, - "name" : [ { - "family" : "CBS Health Corporation", - "given" : [ "Wednesday" ] - } ], - "resourceType" : "Practitioner" + "name" : "CBS Health Corporation", + "resourceType" : "Organization" } ], "created" : "2025-08-15T00:00:00+00:00", "id" : "3351266481403", @@ -153809,6 +153779,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[GET_WITH_SEARCH_WithWildcard]= "name" : "Centers for Medicare and Medicaid Services", "resourceType" : "Organization" }, { + "active" : true, "id" : "1003488552", "identifier" : [ { "system" : "http://hl7.org/fhir/sid/us-npi", @@ -153822,13 +153793,10 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[GET_WITH_SEARCH_WithWildcard]= "value" : "1003488552" } ], "meta" : { - "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Practitioner|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner|7.0.0" ] + "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Organization|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization|7.0.0" ] }, - "name" : [ { - "family" : "CBS Health Corporation", - "given" : [ "Wednesday" ] - } ], - "resourceType" : "Practitioner" + "name" : "CBS Health Corporation", + "resourceType" : "Organization" } ], "created" : "2025-08-15T00:00:00+00:00", "id" : "3351266481403", @@ -172591,6 +172559,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[GET_WithWildcard]=[ "name" : "Centers for Medicare and Medicaid Services", "resourceType" : "Organization" }, { + "active" : true, "id" : "1003488552", "identifier" : [ { "system" : "http://hl7.org/fhir/sid/us-npi", @@ -172604,13 +172573,10 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[GET_WithWildcard]=[ "value" : "1003488552" } ], "meta" : { - "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Practitioner|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner|7.0.0" ] + "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Organization|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization|7.0.0" ] }, - "name" : [ { - "family" : "CBS Health Corporation", - "given" : [ "Wednesday" ] - } ], - "resourceType" : "Practitioner" + "name" : "CBS Health Corporation", + "resourceType" : "Organization" } ], "created" : "2025-08-15T00:00:00+00:00", "id" : "3351266481403", @@ -191373,6 +191339,7 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[POST_WithWildcard]=[ "name" : "Centers for Medicare and Medicaid Services", "resourceType" : "Organization" }, { + "active" : true, "id" : "1003488552", "identifier" : [ { "system" : "http://hl7.org/fhir/sid/us-npi", @@ -191386,13 +191353,10 @@ gov.cms.bfd.server.ng.EobSearchIT.eobSearchByType[POST_WithWildcard]=[ "value" : "1003488552" } ], "meta" : { - "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Practitioner|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner|7.0.0" ] + "profile" : [ "http://hl7.org/fhir/us/carin-bb/StructureDefinition/C4BB-Organization|2.2.0", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization|7.0.0" ] }, - "name" : [ { - "family" : "CBS Health Corporation", - "given" : [ "Wednesday" ] - } ], - "resourceType" : "Practitioner" + "name" : "CBS Health Corporation", + "resourceType" : "Organization" } ], "created" : "2025-08-15T00:00:00+00:00", "id" : "3351266481403",