oddb2xml 3.0.8 → 3.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5391f07cc4388c80d6347856c433d40002143f8a368af6d45ceb3f0662861bf
-  data.tar.gz: c02c407165679d39512f8d23de883f870c0a9d89d723c85f1bd3172b73f3bbd4
+  metadata.gz: 371c2ba25fb99bf0255bc0d336b0ae8a8a0cee64e9cd869e249e7fe7cd1d9da0
+  data.tar.gz: b85bd319a9179098af8c97bd6c1d8671a1e1cf656c0e83fdc7a0ede20ccf60fc
 SHA512:
-  metadata.gz: 10f45b9f5aa5095073260bc034be15d643484fbb9e717b847e839ad04a508f121aa6c6ed6ab8efd0e64c7e3eebea7b839182dd5af70cbe9a30b38f7334f2ebd8
-  data.tar.gz: 69c6642e96ff6abb51ded2519f770e69e09d49a8b8b52c7121f287f47e34fccc4679f8643246d85ce74f32702cb0d26e53992140d19d6c0c4fcaab272bc459e1
+  metadata.gz: bab282fd20949a78607099dba3d64288cc63809b9e25f3e95015cd7f826a274a4010f9654117710976391561524c8f57b2c0727ed8b9ef7e8511f5fe9cd31c72
+  data.tar.gz: b4eef9e9aa441a567ac050c0ff27170ef8f9d64f8f9993b7c014ee9b7e79241ba6d5f917b956649cb194fcb59e8b06694db4d8e4500f113adb3f1212236d8430

data/CLAUDE.md

@@ -47,7 +47,7 @@ The system follows a **download → extract → build → compress** pipeline:
 
 6. **Compressor** (`lib/oddb2xml/compressor.rb`) — Optional ZIP/TAR.GZ output compression.
 
-7. **FHIR support** (`lib/oddb2xml/fhir_support.rb`) — Self-contained module providing `FhirDownloader` and FHIR NDJSON parsing. Activated via `--fhir` (or `--fhir-url=<URL>`). Downloads per-language NDJSON files (`foph-sl-export-latest-{de,fr,it}.ndjson`) from `epl.bag.admin.ch` to populate French and Italian product names/descriptions. Maps legal status codes `756005022007` and `756005022008` to Swissmedic category D. Parses `ClinicalUseDefinition` resources and combines each indication's `.NN` id-suffix with the reimbursement RA's `FOPHDossierNumber` to construct the BAG **Indikationscode** (`XXXXX.NN`); exposed as `item[:indication_codes]` and per-package `:indication_codes` (each entry a `{code:, cud_id:, text:}` hash). From 3.0.7 onwards, `Builder#build_product` emits one `<INDICATION_CODE code="XXXXX.NN" cud_id="DRUG.NN">limitation text</INDICATION_CODE>` child per indication on every `<PRD>` in `oddb_product.xml`; live feed numbers: 539 products / 1,293 codes / 100 % with non-empty indication text. Mandatory on prescriptions/invoices for SL price-model drugs from 2026-07-01 — see issue [#113](https://github.com/zdavatz/oddb2xml/issues/113). **Limitation texts** (3.0.8 onwards): the `regulatedAuthorization-limitation` extension has no inline `limitationText` in the live BAG feed — it carries a `limitationIndication` reference to a `ClinicalUseDefinition` whose `indication.diseaseSymptomProcedure.concept.text` is the actual text. The parser stores the ref as `cud_ref` on each Limitation, `Bundle#cud_text_by_id` resolves DE, and `merge_language` propagates FR/IT from the per-language NDJSON files via the same CUD id. Coverage on the live feed jumped from 0 / 9'108 to 9'108 / 9'108 (issue [#116](https://github.com/zdavatz/oddb2xml/issues/116)).
+7. **FHIR support** (`lib/oddb2xml/fhir_support.rb`) — Self-contained module providing `FhirDownloader` and FHIR NDJSON parsing. Activated via `--fhir` (or `--fhir-url=<URL>`). Downloads per-language NDJSON files (`foph-sl-export-latest-{de,fr,it}.ndjson`) from `epl.bag.admin.ch` to populate French and Italian product names/descriptions. Maps legal status codes `756005022007` and `756005022008` to Swissmedic category D. Reads the BAG **Indikationscode** (`XXXXX.NN`) from the explicit `indicationCode` extension on each `RegulatedAuthorization.indication[].extension[regulatedAuthorization-limitation]` (BAG SL FHIR export >= v2.0.5; handled from 3.0.10). The BAG changelog states the limitation code (`ClinicalUseDefinition.id`) and the indication code are **independent** fields, so the older derivation — combining each indication CUD's `.NN` id-suffix with the reimbursement RA's `FOPHDossierNumber` — is kept only as a fallback for feeds lacking the extension. Exposed as `item[:indication_codes]` and per-package `:indication_codes` (each entry a `{code:, cud_id:, text:}` hash, where `cud_id` is the `limitationIndication` CUD reference used to resolve the text). From 3.0.7 onwards, `Builder#build_product` emits one `<INDICATION_CODE code="XXXXX.NN" cud_id="DRUG.NN">limitation text</INDICATION_CODE>` child per indication on every `<PRD>` in `oddb_product.xml`; live feed numbers: 539 products / 1,293 codes / 100 % with non-empty indication text. Mandatory on prescriptions/invoices for SL price-model drugs from 2026-07-01 — see issue [#113](https://github.com/zdavatz/oddb2xml/issues/113). **Limitation texts** (3.0.8 onwards): the `regulatedAuthorization-limitation` extension has no inline `limitationText` in the live BAG feed — it carries a `limitationIndication` reference to a `ClinicalUseDefinition` whose `indication.diseaseSymptomProcedure.concept.text` is the actual text. The parser stores the ref as `cud_ref` on each Limitation, `Bundle#cud_text_by_id` resolves DE, and `merge_language` propagates FR/IT from the per-language NDJSON files via the same CUD id. Coverage on the live feed jumped from 0 / 9'108 to 9'108 / 9'108 (issue [#116](https://github.com/zdavatz/oddb2xml/issues/116)).
 
 8. **Refdata cleanup** (`lib/oddb2xml/refdata_cleanup.rb`) — Compensates for known data-quality issues in upstream Refdata.Articles.xml before they reach the output. Each fix is guarded by a Swissmedic-side heuristic (e.g. comma in `substance_swissmedic` to distinguish mono products from real combinations). Currently fixes the doubled-dose template bug (`X mg / X mg / Stk`). Called from `Builder#apply_refdata_description_cleanups!` at the start of `prepare_articles`. See GitHub issue #112 for the catalogue.
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oddb2xml (3.0.8)
+    oddb2xml (3.0.10)
       csv
       htmlentities
       httpi

data/History.txt

@@ -1,3 +1,9 @@
+=== 3.0.10 / 01.06.2026
+* FHIR: read the BAG Indikationscode (XXXXX.NN) from the explicit `indicationCode` extension now carried on each limitation (BAG SL FHIR export >= v2.0.5) instead of reconstructing it from FOPHDossierNumber + the ClinicalUseDefinition id suffix. The changelog states the limitation code (CUD id) and the indication code are independent fields, so the old derivation was no longer guaranteed correct. Falls back to the previous derivation for older feeds that lack the extension. Output is identical on the current live feed. Other changelog items (limitation text moved to ClinicalUseDefinition, sanitized CUD ids, un-truncated `<` in texts, deduplicated/ordered Ingredients) were already handled or are transparent upstream fixes.
+
+=== 3.0.9 / 01.06.2026
+* FHIR is now the default source for -e/--extended and -b/--firstbase. As of June 2026, running oddb2xml -e or oddb2xml -b downloads the FOPH/BAG FHIR NDJSON feed instead of the BAG-XML Spezialitätenliste. Plain runs are unchanged. Opt out with --no-fhir; explicit --fhir/--fhir-url still work.
+
 === 3.0.8 / 28.05.2026
 * FHIR: fix empty <DescriptionDe/Fr/It> on every <Limitation>. The live BAG FHIR feed does not carry limitation text inline; it stores a `limitationIndication` reference to a `ClinicalUseDefinition` whose `indication.diseaseSymptomProcedure.concept.text` holds the actual text (one per language). FR/IT come from the per-language NDJSON files and are merged via the CUD id. Result on the live feed: 9'108 / 9'108 limitations (100%) now carry text, up from 0% (issue #116).
 

data/README.md

@@ -51,7 +51,7 @@ HIN (http://hin.ch) creates daily the actual file. They can be downloaded from `
 see `--help`.
 
 ```
-    /opt/src/oddb2xml/bin/oddb2xml version 3.0.8
+    /opt/src/oddb2xml/bin/oddb2xml version 3.0.10
     Usage:
     oddb2xml [option]
       produced files are found under data
@@ -64,6 +64,8 @@ see `--help`.
     --fhir                    Use FHIR NDJSON format from FOPH/BAG instead of XML
                                                           from Spezialitätenliste. Downloads per-language
                                                           NDJSON files (de, fr, it) from epl.bag.admin.ch.
+                                                          Default ON for -e/--extended and -b/--firstbase
+                                                          since June 2026; disable with --no-fhir.
     --fhir-url=<s>            Specific FHIR NDJSON URL to download (implies --fhir)
     -f, --format=<s>          File format F, default is xml. {xml|dat}
                                                           If F is given, -o option is ignored. (Default: xml)
@@ -97,7 +99,8 @@ $ oddb2xml -t md                        # => md_article.xml, md_product.xml, md_
 $ oddb2xml -a nonpharma -t md -c tar.gz # => md_xml_dd.mm.yyyy_hh.mm.tar.gz
 $ oddb2xml -f dat                       # => oddb.dat
 $ oddb2xml -f dat -a nonpharma          # => oddb_with_migel.dat
-$ oddb2xml -e                           # => oddb_article.xml
+$ oddb2xml -e                           # => oddb_article.xml (FHIR source by default since June 2026)
+$ oddb2xml -e --no-fhir                  # => oddb_article.xml using the old BAG-XML Spezialitätenliste
 ```
 
 output.
@@ -308,13 +311,18 @@ indication on each `<PRD>` in `oddb_product.xml`:
 </PRD>
 ```
 
-The code is built per FHIR bundle by combining the
-`FOPHDossierNumber` from the reimbursement `RegulatedAuthorization`
-(`XXXXX`) with the `.NN` suffix of each sibling
-`ClinicalUseDefinition` whose `type == "indication"` (e.g.
-`CYRAMZA.01` / `CYRAMZA.02` → `20403.01` / `20403.02`).  The element
-body carries the human-readable indication text from
-`indication.diseaseSymptomProcedure.concept.text`.
+Since 3.0.10 the code is read directly from the explicit
+`indicationCode` extension carried on each limitation
+(`RegulatedAuthorization.indication[].extension[regulatedAuthorization-limitation]`),
+introduced in the BAG SL FHIR export ≥ v2.0.5 (e.g. `20403.01` /
+`20403.02`). The BAG changelog states that the limitation code
+(`ClinicalUseDefinition.id`) and the indication code are **independent**
+fields, so the previous reconstruction from `FOPHDossierNumber` + the
+`.NN` CUD-id suffix is no longer used (it is kept only as a fallback for
+older feeds without the extension). `cud_id` still carries the
+`limitationIndication` reference, and the element body carries the
+human-readable indication text from the referenced
+`ClinicalUseDefinition`'s `indication.diseaseSymptomProcedure.concept.text`.
 
 The same data is also exposed in-memory on each item and package as
 `item[:indication_codes]` (an array of `{code:, cud_id:, text:}`

data/lib/oddb2xml/fhir_support.rb

@@ -395,6 +395,11 @@ module Oddb2xml
           when "limitationText"
             # Not present in the live FHIR feed — kept for forward-compat.
             limitation[:text] = sub_ext["valueString"]
+          when "indicationCode"
+            # Authoritative BAG Indikationscode XXXXX.NN (feed >= v2.0.5).
+            # Independent of the CUD id, so it must be read here rather than
+            # reconstructed from FOPHDossierNumber + CUD suffix.
+            limitation[:indication_code] = sub_ext["valueString"]
           when "limitationIndication"
             ref = sub_ext.dig("valueReference", "reference")
             limitation[:cud_ref] = ref&.sub(%r{\A.*ClinicalUseDefinition/}, "")
@@ -591,7 +596,30 @@ module Oddb2xml
 
       def build_indication_codes(bundle)
         reimbursement = bundle.authorizations.find(&:reimbursement_sl?)
-        dossier = reimbursement&.foph_dossier_no
+        return [] unless reimbursement
+
+        cud_texts = bundle.cud_text_by_id
+
+        # Preferred (BAG feed >= v2.0.5): read the explicit `indicationCode`
+        # carried on each limitation. The changelog warns that the limitation
+        # code (CUD id) and the indication code are independent, so we must NOT
+        # reconstruct XXXXX.NN from the CUD id suffix. Text is resolved via the
+        # limitationIndication reference (cud_ref) into the CUD's text.
+        from_ext = reimbursement.limitations.each_with_object([]) do |lim, acc|
+          code = lim[:indication_code]
+          next unless code && !code.empty?
+          cud_ref = lim[:cud_ref]
+          acc << OpenStruct.new(
+            code: code,
+            cud_id: cud_ref,
+            text: (cud_ref && cud_texts[cud_ref]) || lim[:text]
+          )
+        end
+        return from_ext unless from_ext.empty?
+
+        # Fallback for older feeds without the indicationCode extension:
+        # derive XXXXX.NN from FOPHDossierNumber + each indication CUD's suffix.
+        dossier = reimbursement.foph_dossier_no
         return [] unless dossier && !bundle.clinical_use_definitions.empty?
 
         bundle.clinical_use_definitions.each_with_object([]) do |cud, acc|

data/lib/oddb2xml/options.rb

@@ -22,7 +22,7 @@ module Oddb2xml
         opt :extended, "pharma, non-pharma plus prices and non-pharma from zurrose.
                             Products without EAN-Code will also be listed.
                             File oddb_calc.xml will also be generated"
-        opt :fhir, "Use FHIR NDJSON format from FOPH/BAG instead of XML from Spezialitätenliste", default: false, short: :none
+        opt :fhir, "Use FHIR NDJSON format from FOPH/BAG instead of XML from Spezialitätenliste. Default ON for -e/--extended and -b/--firstbase since June 2026; disable with --no-fhir", default: false, short: :none
         opt :fhir_url, "Specific FHIR NDJSON URL to download (implies --fhir)", type: :string, default: nil, short: :none
         opt :format, "File format F, default is xml. {xml|dat}
                             If F is given, -o option is ignored.", type: :string, default: "xml"
@@ -71,6 +71,11 @@ module Oddb2xml
         @opts[:extended] = true
         @opts[:price] = :zurrose
       end
+      # From June 2026, -e/--extended and -b/--firstbase default to the FHIR
+      # (FOPH/BAG NDJSON) source. Users can still opt out with --no-fhir.
+      if (@opts[:extended] || @opts[:firstbase]) && !@opts[:fhir_given]
+        @opts[:fhir] = true
+      end
       # FHIR URL implies FHIR mode
       if @opts[:fhir_url]
         @opts[:fhir] = true

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "3.0.8"
+  VERSION = "3.0.10"
 end

data/spec/fhir_spec.rb

@@ -32,11 +32,46 @@ describe "FHIR Indikationscode support" do
   end
 
   describe Oddb2xml::FHIR::PreparationsParser do
-    it "constructs XXXXX.NN indication codes from FOPHDossierNumber + CUD suffix" do
+    it "reads the explicit indicationCode (XXXXX.NN) from each limitation" do
       parser = described_class.new(cyramza_fixture)
       prep = parser.preparations.first
       codes = prep.IndicationCodes.map(&:code)
       expect(codes).to include("20403.01", "20403.02")
+      # cud_id still carries the CUD reference so the text can be resolved.
+      expect(prep.IndicationCodes.map(&:cud_id)).to include("CYRAMZA.01", "CYRAMZA.02")
+    end
+
+    it "uses the explicit indicationCode field, not a dossier+CUD-suffix derivation" do
+      # The BAG changelog (>= v2.0.5) states the limitation code (CUD id) and
+      # the indication code are independent. Rewrite the explicit indicationCode
+      # values so they no longer correspond to FOPHDossierNumber + CUD suffix,
+      # and confirm the parser surfaces the explicit values verbatim.
+      bundle = JSON.parse(File.read(cyramza_fixture))
+      bundle["entry"].each do |entry|
+        res = entry["resource"]
+        next unless res["resourceType"] == "RegulatedAuthorization"
+        Array(res["indication"]).each do |ind|
+          Array(ind["extension"]).each do |ext|
+            next unless ext["url"].to_s.include?("regulatedAuthorization-limitation")
+            Array(ext["extension"]).each do |sub|
+              sub["valueString"] = "99999.77" if sub["url"] == "indicationCode"
+            end
+          end
+        end
+      end
+
+      file = Tempfile.new(["cyramza-indc", ".ndjson"])
+      begin
+        file.write(JSON.generate(bundle))
+        file.flush
+        parser = described_class.new(file.path)
+        codes = parser.preparations.first.IndicationCodes.map(&:code)
+        expect(codes).to all(eq("99999.77"))
+        expect(codes).not_to include("20403.01", "20403.02")
+      ensure
+        file.close
+        file.unlink
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.0.10
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger