oddb2xml 2.8.8 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea00be9580b566423310928701c47e82bed4f155a8a6f1886860de7b09acee12
-  data.tar.gz: 337b097eb66100e7f36306580d973e9035f2cee65fc3d70b619852ef07ea6c46
+  metadata.gz: be613b5666463eb06459f7f21d24a4c0942178ebd96610d134e890d138a3d582
+  data.tar.gz: ca8cb89b1de25a375aaffe013f7e46c4fafe0a9b87beefa9eca6e6575b2a0bb9
 SHA512:
-  metadata.gz: a3dd25aceabc19a287516a85cc00dab5f7f78ee99dc7ebe13f1aa772194ada5912306eb4abaa06db1c45e5a431bee9fb94196c43a8cfeb40d61344fb8da84896
-  data.tar.gz: 52b4f223291df57b5062c6fd139d0a5b0d5c4833502a6464f2c2940637b6fbd3417b956eee813f4e179f18742f016ffa343126ddfa28746cf5a8f43b4811ef20
+  metadata.gz: d3b03befd32d4c382b6135a6ab61a5f69e87a0840b4836bcb664e71fcc9e892276db9fc6fd5fff27377076a792ee5c72692ab83c1d61e7aa0b5796c26fbc7c15
+  data.tar.gz: 60acf84e26c7251dc7d3d1b822d41d06933672cdf4292f66ff3e183365f369a6a5cb81d8d14a95636aaf3234224b12b2a2e1133f5c68b7d399a0d8384cd2a03e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oddb2xml (2.8.8)
+    oddb2xml (2.9.0)
       htmlentities
       httpi
       mechanize

data/lib/oddb2xml/builder.rb

@@ -1649,7 +1649,14 @@ module Oddb2xml
                   xml.LPPV "true" if @lppvs[pkg_gtin.to_s] # detect_nincd
                   if item && item[:deductible]
                     case item[:deductible]
-                      when "Y" then xml.DEDUCTIBLE 20; # 20%
+                      when "Y" then xml.DEDUCTIBLE 40; # 40%
+                      when "N" then xml.DEDUCTIBLE 10; # 10%
+                    end
+                  elsif item && item[:deductible20]
+                    # TODO: Delete deductible20 after 2024/03/01
+                    # https://github.com/zdavatz/oddb2xml/issues/81
+                    case item[:deductible20]
+                      when "Y" then xml.DEDUCTIBLE 40; # 20%
                       when "N" then xml.DEDUCTIBLE 10; # 10%
                     end
                   end

data/lib/oddb2xml/downloader.rb

@@ -383,10 +383,10 @@ module Oddb2xml
   end
 
   class FirstbaseDownloader < Downloader
-    BASE_URL = "https://www.firstbase.ch"
+    BASE_URL = "http://pillbox.oddb.org"
     include DownloadMethod
     def initialize(type = :orphan, options = {})
-      @url = BASE_URL + "/sites/default/files/2023-12/firstbase_healthcare_public_data-dump.xlsx"
+      @url = BASE_URL + "/firstbase.xlsx"
     end
 
     def download

data/lib/oddb2xml/extractor.rb

@@ -57,7 +57,8 @@ module Oddb2xml
         item[:name_it] = (name = seq.NameIt) ? name : ""
         item[:swissmedic_number5] = (num5 = seq.SwissmedicNo5) ? num5.rjust(5, "0") : ""
         item[:org_gen_code] = (orgc = seq.OrgGenCode) ? orgc : ""
-        item[:deductible] = (ddbl = seq.FlagSB20) ? ddbl : ""
+        item[:deductible] = (ddbl = seq.FlagSB) ? ddbl : ""
+        item[:deductible20] = (ddbl20 = seq.FlagSB20) ? ddbl20 : ""
         item[:atc_code] = (atcc = seq.AtcCode) ? atcc : ""
         item[:comment_de] = (info = seq.CommentDe) ? info : ""
         item[:comment_fr] = (info = seq.CommentFr) ? info : ""

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.8.8"
+  VERSION = "2.9.0"
 end

data/lib/oddb2xml/xml_definitions.rb

@@ -136,6 +136,7 @@ class PreparationContent
   element :SwissmedicNo5
   element :FlagItLimitation
   element :OrgGenCode
+  element :FlagSB
   element :FlagSB20
   element :CommentDe
   element :CommentFr

data/spec/artikelstamm_spec.rb

@@ -413,7 +413,7 @@ describe Oddb2xml::Builder do
             <DOSAGE_FORMF>Solution injectable</DOSAGE_FORMF>
             <SL_ENTRY>true</SL_ENTRY>
             <IKSCAT>B</IKSCAT>
-            <DEDUCTIBLE>20</DEDUCTIBLE>
+            <DEDUCTIBLE>40</DEDUCTIBLE>
             <PRODNO>5329001</PRODNO>
         </ITEM>),
              "Kolon with Pharmacode for EAN 7680002780013" => %(<ITEM PHARMATYPE="P">

data/spec/data/Preparations.xml

@@ -11,7 +11,7 @@
     <SwissmedicNo5>585</SwissmedicNo5>
     <FlagItLimitation>Y</FlagItLimitation>
     <OrgGenCode />
-    <FlagSB20>N</FlagSB20>
+    <FlagSB>N</FlagSB>
     <CommentDe />
     <CommentFr />
     <CommentIt />
@@ -147,7 +147,7 @@ Lo sconto deve essere fatto usufruire al debitore secondo l’articolo 56 capove
     <SwissmedicNo5>28486</SwissmedicNo5>
     <FlagItLimitation>Y</FlagItLimitation>
     <OrgGenCode />
-    <FlagSB20>N</FlagSB20>
+    <FlagSB>N</FlagSB>
     <CommentDe />
     <CommentFr />
     <CommentIt />
@@ -294,7 +294,7 @@ Lo sconto deve essere fatto usufruire al debitore secondo l’articolo 56 capove
     <AtcCode>V06DF</AtcCode>
     <FlagItLimitation>Y</FlagItLimitation>
     <OrgGenCode />
-    <FlagSB20>N</FlagSB20>
+    <FlagSB>N</FlagSB>
     <CommentDe />
     <CommentFr />
     <CommentIt />
@@ -439,7 +439,7 @@ Lo sconto deve essere fatto usufruire al debitore secondo l’articolo 56 capove
     <SwissmedicNo5>53662</SwissmedicNo5>
     <FlagItLimitation>Y</FlagItLimitation>
     <OrgGenCode>O</OrgGenCode>
-    <FlagSB20>N</FlagSB20>
+    <FlagSB>N</FlagSB>
     <CommentDe />
     <CommentFr />
     <CommentIt />
@@ -547,7 +547,7 @@ Lo sconto deve essere fatto usufruire al debitore secondo l’articolo 56 capove
     <SwissmedicNo5>62069</SwissmedicNo5>
     <FlagItLimitation>Y</FlagItLimitation>
     <OrgGenCode />
-    <FlagSB20>N</FlagSB20>
+    <FlagSB>N</FlagSB>
     <CommentDe />
     <CommentFr />
     <CommentIt />
@@ -661,7 +661,7 @@ Lo sconto deve essere fatto usufruire al debitore secondo l’articolo 56 capove
     <SwissmedicNo5>40333</SwissmedicNo5>
     <FlagItLimitation>Y</FlagItLimitation>
     <OrgGenCode />
-    <FlagSB20>N</FlagSB20>
+    <FlagSB>N</FlagSB>
     <CommentDe />
     <CommentFr />
     <CommentIt />
@@ -786,7 +786,7 @@ Lo sconto deve essere fatto usufruire al debitore secondo l’articolo 56 capove
     <SwissmedicNo5>40662</SwissmedicNo5>
     <FlagItLimitation>Y</FlagItLimitation>
     <OrgGenCode />
-    <FlagSB20>N</FlagSB20>
+    <FlagSB>N</FlagSB>
     <CommentDe />
     <CommentFr />
     <CommentIt />
@@ -964,7 +964,7 @@ Lo sconto deve essere fatto usufruire al debitore secondo l’articolo 56 capove
     <SwissmedicNo5>53290</SwissmedicNo5>
     <FlagItLimitation>Y</FlagItLimitation>
     <OrgGenCode />
-    <FlagSB20>Y</FlagSB20> <!-- Manually patched on 2017.12.17 by Niklaus, to hava one Y in examples -->
+    <FlagSB>Y</FlagSB> <!-- Manually patched on 2017.12.17 by Niklaus, to hava one Y in examples -->
     <CommentDe />
     <CommentFr />
     <CommentIt />
@@ -1078,7 +1078,7 @@ Lo sconto deve essere fatto usufruire al debitore secondo l’articolo 56 capove
     <SwissmedicNo5>65856</SwissmedicNo5>
     <FlagItLimitation>Y</FlagItLimitation>
     <OrgGenCode />
-    <FlagSB20>N</FlagSB20>
+    <FlagSB>N</FlagSB>
     <CommentDe />
     <CommentFr />
     <CommentIt />
@@ -1192,7 +1192,7 @@ Lo sconto deve essere fatto usufruire al debitore secondo l’articolo 56 capove
     <SwissmedicNo5>40502</SwissmedicNo5>
     <FlagItLimitation>Y</FlagItLimitation>
     <OrgGenCode />
-    <FlagSB20>N</FlagSB20>
+    <FlagSB>N</FlagSB>
     <CommentDe />
     <CommentFr />
     <CommentIt />
@@ -1387,7 +1387,7 @@ Lo sconto deve essere fatto usufruire al debitore secondo l’articolo 56 capove
     <SwissmedicNo5>62132</SwissmedicNo5>
     <FlagItLimitation>Y</FlagItLimitation>
     <OrgGenCode />
-    <FlagSB20>N</FlagSB20>
+    <FlagSB>N</FlagSB>
     <CommentDe />
     <CommentFr />
     <CommentIt />
@@ -1588,7 +1588,7 @@ Il medico curante si impegna a registrare costantemente i necessari dati nell'ap
     <SwissmedicNo5>16105</SwissmedicNo5>
     <FlagItLimitation>Y</FlagItLimitation>
     <OrgGenCode />
-    <FlagSB20>N</FlagSB20>
+    <FlagSB>N</FlagSB>
     <CommentDe />
     <CommentFr />
     <CommentIt />
@@ -1761,7 +1761,7 @@ Il medico curante si impegna a registrare costantemente i necessari dati nell'ap
     <SwissmedicNo5>35366</SwissmedicNo5>
     <FlagItLimitation>Y</FlagItLimitation>
     <OrgGenCode />
-    <FlagSB20>N</FlagSB20>
+    <FlagSB>N</FlagSB>
     <CommentDe />
     <CommentFr />
     <CommentIt />
@@ -1939,7 +1939,7 @@ Il medico curante si impegna a registrare costantemente i necessari dati nell'ap
     <SwissmedicNo5>55558</SwissmedicNo5>
     <FlagItLimitation>Y</FlagItLimitation>
     <OrgGenCode>O</OrgGenCode>
-    <FlagSB20>N</FlagSB20>
+    <FlagSB>N</FlagSB>
     <CommentDe />
     <CommentFr />
     <CommentIt />
@@ -2070,7 +2070,7 @@ delle infezioni da Enterococcus faecium Vancomicina-resistente incluse le batter
     <SwissmedicNo5>55559</SwissmedicNo5>
     <FlagItLimitation>Y</FlagItLimitation>
     <OrgGenCode>O</OrgGenCode>
-    <FlagSB20>N</FlagSB20>
+    <FlagSB>N</FlagSB>
     <CommentDe />
     <CommentFr />
     <CommentIt />
@@ -2201,7 +2201,7 @@ delle infezioni da Enterococcus faecium Vancomicina-resistente incluse le batter
     <SwissmedicNo5>56352</SwissmedicNo5>
     <FlagItLimitation>Y</FlagItLimitation>
     <OrgGenCode />
-    <FlagSB20>N</FlagSB20>
+    <FlagSB>N</FlagSB>
     <CommentDe />
     <CommentFr />
     <CommentIt />
@@ -2326,7 +2326,7 @@ delle infezioni da Enterococcus faecium Vancomicina-resistente incluse le batter
     <SwissmedicNo5>54534</SwissmedicNo5>
     <FlagItLimitation>Y</FlagItLimitation>
     <OrgGenCode />
-    <FlagSB20>N</FlagSB20>
+    <FlagSB>N</FlagSB>
     <CommentDe />
     <CommentFr />
     <CommentIt />
@@ -2597,7 +2597,7 @@ delle infezioni da Enterococcus faecium Vancomicina-resistente incluse le batter
     <SwissmedicNo5>58734</SwissmedicNo5>
     <FlagItLimitation>Y</FlagItLimitation>
     <OrgGenCode />
-    <FlagSB20>N</FlagSB20>
+    <FlagSB>N</FlagSB>
     <CommentDe />
     <CommentFr />
     <CommentIt />
@@ -2722,7 +2722,7 @@ delle infezioni da Enterococcus faecium Vancomicina-resistente incluse le batter
     <SwissmedicNo5>55561</SwissmedicNo5>
     <FlagItLimitation>Y</FlagItLimitation>
     <OrgGenCode />
-    <FlagSB20>N</FlagSB20>
+    <FlagSB>N</FlagSB>
     <CommentDe />
     <CommentFr />
     <CommentIt />
@@ -2847,7 +2847,7 @@ delle infezioni da Enterococcus faecium Vancomicina-resistente incluse le batter
     <SwissmedicNo5>57724</SwissmedicNo5>
     <FlagItLimitation>Y</FlagItLimitation>
     <OrgGenCode />
-    <FlagSB20>N</FlagSB20>
+    <FlagSB>N</FlagSB>
     <CommentDe />
     <CommentFr />
     <CommentIt />
@@ -2959,7 +2959,7 @@ delle infezioni da Enterococcus faecium Vancomicina-resistente incluse le batter
     <SwissmedicNo5>65160</SwissmedicNo5>
     <FlagItLimitation>Y</FlagItLimitation>
     <OrgGenCode />
-    <FlagSB20>N</FlagSB20>
+    <FlagSB>N</FlagSB>
     <CommentDe />
     <CommentFr />
     <CommentIt />
@@ -3098,7 +3098,7 @@ Il medico curante è tenuto a raccogliere costantemente i dati necessari nell’
     <SwissmedicNo5>615</SwissmedicNo5>
     <FlagItLimitation>Y</FlagItLimitation>
     <OrgGenCode />
-    <FlagSB20>N</FlagSB20>
+    <FlagSB>N</FlagSB>
     <CommentDe />
     <CommentFr />
     <CommentIt />
@@ -3236,7 +3236,7 @@ Se il vaccino viene ottentuto al prezzo di serie summenzionato, il medico non pu
     <SwissmedicNo5>44447</SwissmedicNo5>
     <FlagItLimitation>Y</FlagItLimitation>
     <OrgGenCode />
-    <FlagSB20>N</FlagSB20>
+    <FlagSB>N</FlagSB>
     <CommentDe />
     <CommentFr />
     <CommentIt />

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.8.8
+  version: 2.9.0
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-15 00:00:00.000000000 Z
+date: 2024-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -550,7 +550,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.5
+rubygems_version: 3.5.4
 signing_key: 
 specification_version: 4
 summary: oddb2xml creates xml files.