Merge pull request #244 from ngiger/issue-238

(#238): Fix Selbstbehalt
zdavatz · Feb 8, 2024 · 961851b · 961851b
2 parents a897b13 + 0b6f738
commit 961851b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/custom/lookandfeelbase.rb b/src/custom/lookandfeelbase.rb
@@ -383,9 +383,9 @@ def google_analytics_token
         :deactivate_patinfo       =>  'Patinfo deaktivieren (dd.mm.YYYY)',
         :deductible                =>  'Selbstbehalt',
         :deductible_display       =>  'Selbstbehalt anzeigen',
-        :deductible_g              =>  '10%',
+        :deductible_g              =>  '20%',
         :deductible_legal_url      =>  'https://www.bag.admin.ch/bag/de/home/suche.html#Selbstbehalt',
-        :deductible_o              =>  '20%',
+        :deductible_o              =>  '40%',
         :deductible_title0        =>  'Für dieses Produkt bezahlen Sie ',
         :deductible_title1        =>  ' <a href="https://www.bag.admin.ch/bag/de/home/suche.html#Selbstbehalt">Selbstbehalt</a>.<br>Achten Sie auf Ihre Krankenkassen-Abrechnung!',
         :deductible_unknown        =>  'k.A.',
@@ -1910,9 +1910,9 @@ def google_analytics_token
         :deactivate_fachinfo      =>  'Désactiver l\'information professionnelle (dd.mm.YYYY)',
         :deactivate_patinfo       =>  'Désactiver l\'information liée au patient (dd.mm.YYYY)',
         :deductible                =>  'Quote-part',
-        :deductible_g              =>  '10%',
+        :deductible_g              =>  '20%',
         :deductible_legal_url      =>  'https://www.bag.admin.ch/bag/fr/home/suche.html#Participation%20aux%20co%C3%BBts',
-        :deductible_o              =>  '20%',
+        :deductible_o              =>  '40%',
         :deductible_title0        =>  'Le <a href="https://www.bag.admin.ch/bag/fr/home/suche.html#Participation%20aux%20co%C3%BBts">quote-part</a> pour ce produit est ',
         :deductible_title1        =>  '.<br>Faites attention à votre facture de la caisse maladie!',
         :deductible_unknown        =>  'N.O.',

diff --git a/src/plugin/bsv_xml.rb b/src/plugin/bsv_xml.rb
@@ -537,7 +537,7 @@ def tag_end name
             @reg_data.store(:generic_type, (gtype || :unknown))
           end
           @pac_data.store :sl_generic_type, gtype
-        when 'FlagSB20'
+        when /FlagSB/
           @pac_data.store :deductible, @text == 'Y' ? :deductible_o : :deductible_g
         when 'FlagNarcosis'
           @data.store :narcotic, @text == 'Y'

diff --git a/test/data/xml/nasonex_2024.xml b/test/data/xml/nasonex_2024.xml
@@ -11,7 +11,7 @@
     <SwissmedicNo5>54189</SwissmedicNo5>
     <FlagItLimitation>Y</FlagItLimitation>
     <OrgGenCode>O</OrgGenCode>
-    <FlagSB20>N</FlagSB20>
+    <FlagSB>N</FlagSB>
     <FlagGGSL>N</FlagGGSL>
     <CommentDe />
     <CommentFr />