tricc-oo 1.6.16__py3-none-any.whl → 1.6.18__py3-none-any.whl

tests/test_cql.py

@@ -26,6 +26,15 @@ class TestCql(unittest.TestCase):
         )
         self.assertEqual(str(dg_operation), str(dg_expected))
 
+    def test_diagnosis_list(self):
+        if_cql = 'DiagnosisList("final.TRIAGE_YELLOW", "triage_RED")'
+        dg_operation = transform_cql_to_operation(if_cql)
+        dg_expected = TriccOperation(
+            operator=TriccOperator.DIAGNOSIS_LIST,
+            reference=[TriccReference(value="final.TRIAGE_YELLOW"), TriccReference(value="triage_RED")],
+        )
+        self.assertEqual(str(dg_operation), str(dg_expected))
+
     def test_implied_concat(self):
         if_cql = "'A' & \"B\" & 'C'"
         cc_operation = transform_cql_to_operation(if_cql)

tricc_oo/converters/cql_to_operation.py

@@ -37,6 +37,7 @@ FUNCTION_MAP = {
     "HasQualifier": TriccOperator.HAS_QUALIFIER,
     "DateTimeToDecimal": TriccOperator.DATETIME_TO_DECIMAL,
     "Count": TriccOperator.COUNT,
+    "DiagnosisList": TriccOperator.DIAGNOSIS_LIST,
 }
 # TODO
 # Min

tricc_oo/models/base.py

@@ -377,6 +377,7 @@ class TriccOperator(StrEnum):
     PARENTHESIS = "parenthesis"
     CONCATENATE = "concatenate"
     DATETIME_TO_DECIMAL = "datetime_to_decimal"
+    DIAGNOSIS_LIST = "diagnosis_list"
 
 
 RETURNS_BOOLEAN = [
@@ -423,6 +424,8 @@ RETURNS_NUMBER = [
 
 RETURNS_DATE = [TriccOperator.CAST_DATE]
 
+RETURNS_STRING = [TriccOperator.DIAGNOSIS_LIST]
+
 OPERATION_LIST = {
     ">=": TriccOperator.MORE_OR_EQUAL,
     "<=": TriccOperator.LESS_OR_EQUAL,
@@ -480,6 +483,8 @@ class TriccOperation(BaseModel):
             return "number"
         elif self.operator in RETURNS_DATE:
             return "date"
+        elif self.operator in RETURNS_STRING:
+            return "string"
         elif self.operator == TriccOperator.CONCATENATE:
             return "string"
         elif self.operator == TriccOperator.PARENTHESIS:

tricc_oo/strategies/output/xls_form.py

@@ -694,6 +694,7 @@ class XLSFormStrategy(BaseOutPutStrategy):
     # @param left part
     # @param right part
     def generate_xls_form_calculate(self, node, processed_nodes, stashed_nodes, calculates, **kwargs):
+        self.codesystems = kwargs.get("codesystems", {})
         if is_ready_to_process(node, processed_nodes, strict=False) and process_reference(
             node,
             processed_nodes,
@@ -749,6 +750,36 @@ class XLSFormStrategy(BaseOutPutStrategy):
     def tricc_operation_concatenate(self, ref_expressions):
         return f"concat({','.join(map(str, ref_expressions))})"
 
+    def tricc_operation_diagnosis_list(self, ref_expressions):
+        from tricc_oo.converters.datadictionnary import lookup_codesystems_code
+        parts = []
+        for expr in ref_expressions:
+            if isinstance(expr, str):
+                # expr is the variable reference like "final.TRIAGE_YELLOW" or "${var}"
+                if expr.startswith("${") and expr.endswith("}"):
+                    var_path = expr[2:-1]
+                else:
+                    var_path = expr
+                # Handle final. prefix
+                code = var_path[6:] if var_path.startswith("final.") else var_path
+                concept = lookup_codesystems_code(self.codesystems, code)
+                if concept:
+                    display = concept.get("display", code)
+                else:
+                    logger.warning(f"Diagnosis code '{code}' not found in codesystems")
+                    display = code
+                if expr.startswith("${"):
+                    condition = f"{expr} = 1"
+                else:
+                    condition = f"${{{expr}}} = 1"
+                # Always include comma after diagnosis name
+                parts.append(f"if({condition}, '{display},', '')")
+            else:
+                logger.warning(f"Unexpected expression type: {type(expr)}, value: {expr}")
+        if parts:
+            return f"concat({','.join(parts)})"
+        return "''"
+
     def validate(self):
         """Validate the generated XLS form using pyxform."""
         try:

{tricc_oo-1.6.16.dist-info → tricc_oo-1.6.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.6.16
+Version: 1.6.18
 Summary: Python library that converts CDSS L2 in L3
 Project-URL: Homepage, https://github.com/SwissTPH/tricc
 Project-URL: Issues, https://github.com/SwissTPH/tricc/issues

{tricc_oo-1.6.16.dist-info → tricc_oo-1.6.18.dist-info}/RECORD

@@ -1,10 +1,10 @@
 tests/build.py,sha256=Qbxvjkj_Wk2nQ-WjaMGiE1FIe3SRmJMRIgeoMoxqlfQ,6748
-tests/test_cql.py,sha256=dAsLMqVaS6qxnq62fg5KqTFu6UG6pHO6Ab3NZ1c9T3Y,5248
+tests/test_cql.py,sha256=IRfjrmcxMn60XlAQLUur-7OUELs1NioqxRXWcOf8QcQ,5678
 tests/to_ocl.py,sha256=4e-i65K3UM6wHgdVcrZcM9AyL1bahIsXJiZTXhhHgQk,2048
 tricc_oo/__init__.py,sha256=oWCE1ubmC_6iqaWOMgTei4eXVQgV202Ia-tXS1NnW_4,139
 tricc_oo/converters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tricc_oo/converters/codesystem_to_ocl.py,sha256=V_oZNVUVaYHgzJtDiBMSrvIJnBWmDNFBDTTHEkOfpXk,6151
-tricc_oo/converters/cql_to_operation.py,sha256=PUyV_YpUY98Ox0H_F_CN3UUf_I-BhFZVOcWWKTtwecM,14492
+tricc_oo/converters/cql_to_operation.py,sha256=1vNmGkI9OhGNTH6EH5hC1SnVVbIG5ps8dksGhZ0Vgw8,14543
 tricc_oo/converters/datadictionnary.py,sha256=JasqlLKiZzKdidsA1xc2SJ_Af1Xr6A3sKfzDynto8Ho,3686
 tricc_oo/converters/drawio_type_map.py,sha256=Zp8J9iHNSJkIVrmRSM0_d4vA1X8wFPLKb8nCMPUMXKU,9114
 tricc_oo/converters/tricc_to_xls_form.py,sha256=39hwWgYNitGE-AuKtjUwNLz39tEpwc7nd9gT_gw5wjc,3842
@@ -15,7 +15,7 @@ tricc_oo/converters/cql/cqlListener.py,sha256=fA7-8DcS2Q69ckwjdg57-OfFHBxjTZFdoS
 tricc_oo/converters/cql/cqlParser.py,sha256=x3KdrwX9nwENSEJ5Ex7_l5NMnu3kWBO0uLdYu4moTq0,414745
 tricc_oo/converters/cql/cqlVisitor.py,sha256=iHuup2S7OGSVWLEcI4H3oecRqgXztC1sKnew_1P2iGY,33880
 tricc_oo/models/__init__.py,sha256=CgS52LLqdDIaXHvZy08hhu_VaYw80OEdfL_llM9ICBA,108
-tricc_oo/models/base.py,sha256=saMpSiXnvQe_xkQ4PKJbNLqPkzZaiEGwb42HJ1CtwfM,25937
+tricc_oo/models/base.py,sha256=QR4HlseB3_pjd-O7foACQHiyzJdzYTyOYILvQD1VrhU,26098
 tricc_oo/models/calculate.py,sha256=uNP0IDUqPQcJq9Co05H8eX5wbR_DikSxuOHxfVE5Dxg,8018
 tricc_oo/models/lang.py,sha256=ZMRwdoPWe01wEDhOM0uRk-6rt3BkoAAZM8mZ61--s3A,2265
 tricc_oo/models/ocl.py,sha256=MybSeB6fgCOUVJ4aektff0vrrTZsyfwZ2Gt_pPBu_FY,8728
@@ -36,7 +36,7 @@ tricc_oo/strategies/output/fhir_form.py,sha256=hbL921pe1Doun4IQrJuZ_Sq2fCh98G3gr
 tricc_oo/strategies/output/html_form.py,sha256=qSleEZOMV_-Z04y-i-ucyd5rgAYWAyjPwMrw0IHtCRM,8604
 tricc_oo/strategies/output/openmrs_form.py,sha256=ne6TwAyhafR-WDs27QTKKFl85VD5sij_VEJtK6ZjOIE,28996
 tricc_oo/strategies/output/spice.py,sha256=QMeoismVC3PdbvwTK0PtUjWX9jl9780fbQIXn76fMXw,10761
-tricc_oo/strategies/output/xls_form.py,sha256=_pNTND7n-55EjRphJ1hSVtRYa-UkXlmwpam2OKQ8o_w,30860
+tricc_oo/strategies/output/xls_form.py,sha256=93NEv8bZGWZWn28FxE_hwLf0yAGnL7ds6bS3rEDwcGQ,32319
 tricc_oo/strategies/output/xlsform_cdss.py,sha256=X00Lt5MzV8TX14dR4dFI1MqllI5S1e13bKbeysWM9uA,17435
 tricc_oo/strategies/output/xlsform_cht.py,sha256=0wrZ_Ez41D-SciXoBq4Pn4o1bK1ofUxXqbTjDoQuCGE,28597
 tricc_oo/strategies/output/xlsform_cht_hf.py,sha256=xm6SKirV3nMZvM2w54_zJcXAeAgAkq-EEqGEjnOWv6c,988
@@ -44,8 +44,8 @@ tricc_oo/visitors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 tricc_oo/visitors/tricc.py,sha256=ArvDNcuzIQNJpYyT1vB_B9Gxc2m5YAxg9ss_orpMqK0,111780
 tricc_oo/visitors/utils.py,sha256=j83aAq5s5atXi3OC0jc_uJd54a8XrHHmizeeEbWZQJg,421
 tricc_oo/visitors/xform_pd.py,sha256=ryAnI3V9x3eTmJ2LNsUZfvl0_yfCqo6oBgeSu-WPqaE,9613
-tricc_oo-1.6.16.dist-info/licenses/LICENSE,sha256=Pz2eACSxkhsGfW9_iN60pgy-enjnbGTj8df8O3ebnQQ,16726
-tricc_oo-1.6.16.dist-info/METADATA,sha256=9eOqHUBcjhaviC0zU-JT-NYWTY-yc6kq3r8iv6qbGoE,8600
-tricc_oo-1.6.16.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-tricc_oo-1.6.16.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
-tricc_oo-1.6.16.dist-info/RECORD,,
+tricc_oo-1.6.18.dist-info/licenses/LICENSE,sha256=Pz2eACSxkhsGfW9_iN60pgy-enjnbGTj8df8O3ebnQQ,16726
+tricc_oo-1.6.18.dist-info/METADATA,sha256=1nSbfCahrDBUlqaiuuarTmrJY9zgHmYgJKvG7_spR3s,8600
+tricc_oo-1.6.18.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+tricc_oo-1.6.18.dist-info/top_level.txt,sha256=NvbfMNAiy9m4b1unBsqpeOQWh4IgA1Xa33BtKA4abxk,15
+tricc_oo-1.6.18.dist-info/RECORD,,

{tricc_oo-1.6.16.dist-info → tricc_oo-1.6.18.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.10.1)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any