oddb2xml 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c01ea6ec31975e297588db6fe417753aed570dc5ddf6123facf03a21224adf5
-  data.tar.gz: 74074f93366162137d62bca64833e98564137f80dde6481f567dd844b0d0ae14
+  metadata.gz: a5391f07cc4388c80d6347856c433d40002143f8a368af6d45ceb3f0662861bf
+  data.tar.gz: c02c407165679d39512f8d23de883f870c0a9d89d723c85f1bd3172b73f3bbd4
 SHA512:
-  metadata.gz: 1ab9e25407b856b59ae06f1ec07ae93cf462ba0dfda587cf7f6e8dd22440e44df22ca67e49d4144ac60e27e7fc9cc8eccd7ee0b5888cec0ee32782a02cf0b48c
-  data.tar.gz: da022887409106853d0c8c114a337edcae566d5573f7febc8e34642e923269790192d87519144324e90bf93df78f187b12bcf6f7ca28429781d23ff28dcaff99
+  metadata.gz: 10f45b9f5aa5095073260bc034be15d643484fbb9e717b847e839ad04a508f121aa6c6ed6ab8efd0e64c7e3eebea7b839182dd5af70cbe9a30b38f7334f2ebd8
+  data.tar.gz: 69c6642e96ff6abb51ded2519f770e69e09d49a8b8b52c7121f287f47e34fccc4679f8643246d85ce74f32702cb0d26e53992140d19d6c0c4fcaab272bc459e1

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).
+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)).
 
 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.7)
+    oddb2xml (3.0.8)
       csv
       htmlentities
       httpi

data/History.txt

@@ -1,3 +1,6 @@
+=== 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).
+
 === 3.0.7 / 06.05.2026
 * oddb_product.xml: emit one <INDICATION_CODE code="XXXXX.NN" cud_id="DRUG.NN">limitation text</INDICATION_CODE> child per indication on each <PRD>. Source: FHIR ClinicalUseDefinition resources joined with the reimbursement RegulatedAuthorization's FOPHDossierNumber. Counted on the live FOPH feed: 539 products carry a total of 1,293 codes; all have non-empty indication text. Resolves the missing wiring between FhirExtractor and Builder noted in 3.0.6 (issue #113).
 

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.7
+    /opt/src/oddb2xml/bin/oddb2xml version 3.0.8
     Usage:
     oddb2xml [option]
       produced files are found under data
@@ -329,6 +329,30 @@ drugs from **2026-07-01**; from **2027-01-01** insurers may reject
 invoices without it. See issue
 [#113](https://github.com/zdavatz/oddb2xml/issues/113).
 
+## Limitation texts in `--fhir` mode
+
+In 3.0.8 we fixed empty `<DescriptionDe/Fr/It>` on every `<Limitation>`
+in the FHIR-built output. The live BAG FHIR feed does **not** carry
+limitation text inline on the `regulatedAuthorization-limitation`
+extension. Instead the extension holds a `limitationIndication`
+reference to a `ClinicalUseDefinition` whose
+`indication.diseaseSymptomProcedure.concept.text` is the actual text:
+
+```
+RegulatedAuthorization/65839
+  └─ indication.extension[limitation]
+       ├─ status, statusDate, period, firstLimitationDate
+       └─ limitationIndication → ClinicalUseDefinition/NORDIMET
+                                  └─ concept.text = "Wird nicht ..."
+```
+
+The CUDs are identical in `id` across the three per-language NDJSON
+files (`foph-sl-export-latest-{de,fr,it}.ndjson`); only the
+`concept.text` differs. `FhirExtractor` resolves DE from the primary
+file and merges FR/IT in via the same CUD id. Coverage on the live
+feed went from 0 / 9'108 to 9'108 / 9'108 (100 %). See issue
+[#116](https://github.com/zdavatz/oddb2xml/issues/116).
+
 ## Refdata data-quality compensation
 
 Refdata.Articles.xml from `files.refdata.ch` ships with a number of recurring

data/lib/oddb2xml/fhir_support.rb

@@ -167,6 +167,16 @@ module Oddb2xml
         parse_entries
       end
 
+      # Lookup map: CUD id (e.g. "NORDIMET" or "GLIVEC.01") => indication text.
+      # Used to resolve limitation texts that are stored as a reference on
+      # the RegulatedAuthorization rather than inline.
+      def cud_text_by_id
+        @cud_text_by_id ||= @clinical_use_definitions.each_with_object({}) do |cud, acc|
+          next unless cud.id && cud.text
+          acc[cud.id] = cud.text
+        end
+      end
+
       private
 
       def parse_entries
@@ -383,7 +393,11 @@ module Oddb2xml
           when "statusDate"
             limitation[:status_date] = sub_ext["valueDate"]
           when "limitationText"
+            # Not present in the live FHIR feed — kept for forward-compat.
             limitation[:text] = sub_ext["valueString"]
+          when "limitationIndication"
+            ref = sub_ext.dig("valueReference", "reference")
+            limitation[:cud_ref] = ref&.sub(%r{\A.*ClinicalUseDefinition/}, "")
           when "period"
             limitation[:start_date] = sub_ext.dig("valuePeriod", "start")
             limitation[:end_date] = sub_ext.dig("valuePeriod", "end")
@@ -467,11 +481,15 @@ module Oddb2xml
 
           # Find prices and additional data for this package
           pack.Prices = create_prices_for_package(bundle, pkg)
-          
+
           # Add limitations and cost share
           pack.Limitations = create_limitations_for_package(bundle, pkg)
           pack.CostShare = get_cost_share_for_package(bundle, pkg)
 
+          # Per-language CUD text map so merge_language can fill in
+          # DescriptionFr / DescriptionIt for limitations without re-parsing.
+          pack.CudTextById = bundle.cud_text_by_id
+
           pack
         end
 
@@ -533,23 +551,32 @@ module Oddb2xml
 
         return nil unless reimbursement
         return nil if reimbursement.limitations.empty?
-        
+
+        cud_texts = bundle.cud_text_by_id
+
         # Convert FHIR limitations to OpenStruct format
         limitations = OpenStruct.new
         limitations.Limitation = reimbursement.limitations.map do |lim|
+          # The actual limitation text lives in the referenced
+          # ClinicalUseDefinition (limitationIndication reference) — the
+          # `limitationText` sub-extension is absent in the live BAG feed.
+          cud_ref = lim[:cud_ref]
+          text_de = lim[:text] || (cud_ref && cud_texts[cud_ref]) || ""
+
           limitation = OpenStruct.new
           limitation.LimitationCode = ""  # Not in FHIR
           limitation.LimitationType = ""  # Could derive from status
           limitation.LimitationNiveau = ""  # Not in FHIR
           limitation.LimitationValue = ""  # Not in FHIR
-          limitation.DescriptionDe = lim[:text] || ""
-          limitation.DescriptionFr = ""  # May need separate language version
-          limitation.DescriptionIt = ""  # May need separate language version
+          limitation.LimitationCudRef = cud_ref  # carried through for FR/IT resolution
+          limitation.DescriptionDe = text_de
+          limitation.DescriptionFr = ""  # filled by merge_language from FR bundle
+          limitation.DescriptionIt = ""  # filled by merge_language from IT bundle
           limitation.ValidFromDate = lim[:status_date] || lim[:start_date] || ""
           limitation.ValidThruDate = lim[:end_date] || ""
           limitation
         end
-        
+
         limitations
       end
       
@@ -751,6 +778,7 @@ module Oddb2xml
                   desc_de: lim.DescriptionDe || "",
                   desc_fr: lim.DescriptionFr || "",
                   desc_it: lim.DescriptionIt || "",
+                  cud_ref: lim.LimitationCudRef,
                   vdate: lim.ValidFromDate || "",
                   del: is_deleted
                 }
@@ -796,6 +824,7 @@ module Oddb2xml
       name_accessor = "Name#{lang.capitalize}"
       name_key = "name_#{lang}".to_sym
       desc_key = "desc_#{lang}".to_sym
+      lim_desc_key = "desc_#{lang}".to_sym
 
       result.Preparations.Preparation.each do |seq|
         next unless seq && seq.Packs && seq.Packs.Pack
@@ -822,6 +851,19 @@ module Oddb2xml
           if desc && !desc.empty? && item[:packages][ean13]
             item[:packages][ean13][desc_key] = desc
           end
+
+          # Resolve FR/IT limitation texts via the CUD reference captured
+          # during the DE pass. The CUD id (e.g. "NORDIMET") is identical
+          # across languages; only the text differs.
+          pkg_entry = item[:packages][ean13]
+          cud_texts = pac.respond_to?(:CudTextById) ? pac.CudTextById : nil
+          if pkg_entry && cud_texts && pkg_entry[:limitations]
+            pkg_entry[:limitations].each do |lim|
+              ref = lim[:cud_ref]
+              text = ref && cud_texts[ref]
+              lim[lim_desc_key] = text if text && !text.empty?
+            end
+          end
         end
       end
     end

data/lib/oddb2xml/version.rb

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

data/spec/fhir_spec.rb

@@ -1,4 +1,6 @@
 require "spec_helper"
+require "json"
+require "tempfile"
 require "oddb2xml/downloader"
 require "oddb2xml/extractor"
 require "oddb2xml/fhir_support"
@@ -52,6 +54,92 @@ describe "FHIR Indikationscode support" do
     end
   end
 
+  describe Oddb2xml::FhirExtractor, "limitation text resolution" do
+    # Build language-variant copies of the Cyramza fixture in-memory:
+    # the live FHIR feed never stores limitation text inline, only a
+    # reference to a ClinicalUseDefinition whose `concept.text` differs
+    # per language. We translate the CUD text + MPD product name and
+    # write the modified bundle to a Tempfile so the multi-language
+    # path can be exercised end-to-end.
+    def language_variant(source_path, lang_code, cud_texts, product_name)
+      bundle = JSON.parse(File.read(source_path))
+      bundle["entry"].each do |entry|
+        res = entry["resource"]
+        case res["resourceType"]
+        when "MedicinalProductDefinition"
+          res["name"].each do |name|
+            usage = name.dig("usage", 0, "language", "coding", 0)
+            usage["code"] = lang_code if usage
+            name["productName"] = product_name
+          end
+        when "ClinicalUseDefinition"
+          text = cud_texts[res["id"]]
+          if text
+            res["indication"]["diseaseSymptomProcedure"]["concept"]["text"] = text
+          end
+        end
+      end
+      file = Tempfile.new(["cyramza-#{lang_code}", ".ndjson"])
+      file.write(JSON.generate(bundle))
+      file.flush
+      file
+    end
+
+    let(:fr_file) do
+      language_variant(
+        cyramza_fixture, "fr-CH",
+        {
+          "CYRAMZA.01" => "FR limitation pour CYRAMZA.01",
+          "CYRAMZA.02" => "FR limitation pour CYRAMZA.02"
+        },
+        "Cyramza FR"
+      )
+    end
+
+    let(:it_file) do
+      language_variant(
+        cyramza_fixture, "it-CH",
+        {
+          "CYRAMZA.01" => "IT limitazione per CYRAMZA.01",
+          "CYRAMZA.02" => "IT limitazione per CYRAMZA.02"
+        },
+        "Cyramza IT"
+      )
+    end
+
+    after do
+      [fr_file, it_file].each do |f|
+        f.close
+        f.unlink
+      end
+    end
+
+    it "fills DescriptionDe from the referenced ClinicalUseDefinition" do
+      data = described_class.new(cyramza_fixture).to_hash
+      pkg = data.values.first[:packages].values.first
+      texts = pkg[:limitations].map { |l| l[:desc_de] }
+      expect(texts).to include(start_with("In Kombination mit Paclitaxel"))
+      expect(texts).to include(start_with("In Kombination mit FOLFIRI"))
+      # CUD reference is carried through so merge_language can resolve FR/IT.
+      expect(pkg[:limitations].map { |l| l[:cud_ref] }).to include("CYRAMZA.01", "CYRAMZA.02")
+    end
+
+    it "fills DescriptionFr / DescriptionIt from the language-specific bundles" do
+      files = {"de" => cyramza_fixture, "fr" => fr_file.path, "it" => it_file.path}
+      data = described_class.new(files).to_hash
+      pkg = data.values.first[:packages].values.first
+
+      by_ref = pkg[:limitations].each_with_object({}) { |l, h| h[l[:cud_ref]] = l }
+
+      expect(by_ref["CYRAMZA.01"][:desc_fr]).to eq("FR limitation pour CYRAMZA.01")
+      expect(by_ref["CYRAMZA.02"][:desc_fr]).to eq("FR limitation pour CYRAMZA.02")
+      expect(by_ref["CYRAMZA.01"][:desc_it]).to eq("IT limitazione per CYRAMZA.01")
+      expect(by_ref["CYRAMZA.02"][:desc_it]).to eq("IT limitazione per CYRAMZA.02")
+      # DE text is still there.
+      expect(by_ref["CYRAMZA.01"][:desc_de]).to start_with("In Kombination mit Paclitaxel")
+    end
+  end
+
   describe Oddb2xml::Builder, "PRD INDICATION_CODE emission" do
     it "emits one <INDICATION_CODE> child per indication on the PRD" do
       items = Oddb2xml::FhirExtractor.new(cyramza_fixture).to_hash

metadata

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