Merge pull request #66 from echicoine-icf/48-risk-adj-sde-mirror

#48: Fixed issues with list and placement
cqframework · Mar 7, 2024 · 0f6079f · 0f6079f
2 parents 8e9ea7d + 0460577
commit 0f6079f
Showing 1 changed file with 23 additions and 23 deletions.
diff --git a/templates/liquid/Measure.liquid b/templates/liquid/Measure.liquid
@@ -295,29 +295,6 @@
             </tr>
         {% endif %}
 
-        {% if Measure.supplementalData.usage.coding.where(code = 'risk-adjustment-factor').exists() %}
-            <tr>
-                <th scope="row"><b>Risk Adjustment Variable: </b></th>
-                <td style="padding-left: 4px;">
-                    {% for supplementalData in Measure.supplementalData.where(usage.coding.where(code = 'risk-adjustment-factor').exists()) %}
-                        {% if supplementalData.code.exists() %}
-                            {{iif(supplementalData.code.text.exists(), supplementalData.code.text, iif(supplementalData.code.coding.first().display.exists(), supplementalData.code.coding.first().display, supplementalData.code.coding.first().code))}}
-                        {% else %}
-                            {% if supplementalData.description.exists() %}
-                                {{supplementalData.description}}
-                            {% else %}
-                                {% if supplementalData.criteria.description.exists() %}
-                                    {{supplementalData.criteria.description}}
-                                {% else %}
-                                    {{supplementalData.criteria.expression}}
-                                {% endif %}
-                            {% endif %}
-                        {% endif %}
-                    {% endfor %}
-                </td>
-            </tr>
-        {% endif %}
-
         {% if Measure.riskAdjustment.exists() %}
         <tr>
             <th scope="row"><b>Risk Adjustment: </b></th>
@@ -436,6 +413,29 @@
             </tr>
         {% endif %}
 
+        {% if Measure.supplementalData.usage.coding.where(code = 'risk-adjustment-factor').exists() %}
+            <tr>
+                <th scope="row"><b>Risk Adjustment Variable: </b></th>
+                <td style="padding-left: 4px;">
+                    {% for supplementalData in Measure.supplementalData.where(usage.coding.where(code = 'risk-adjustment-factor').exists()) %}
+                        {% if supplementalData.code.exists() %}
+                            {{iif(supplementalData.code.text.exists(), supplementalData.code.text, iif(supplementalData.code.coding.first().display.exists(), supplementalData.code.coding.first().display, supplementalData.code.coding.first().code))}}
+                        {% else %}
+                            {% if supplementalData.description.exists() %}
+                                <p>{{supplementalData.description}}</p>
+                            {% else %}
+                                {% if supplementalData.criteria.description.exists() %}
+                                    <p>{{supplementalData.criteria.description}}</p>
+                                {% else %}
+                                    <p>{{supplementalData.criteria.expression}}</p>
+                                {% endif %}
+                            {% endif %}
+                        {% endif %}
+                    {% endfor %}
+                </td>
+            </tr>
+        {% endif %}
+
         {% for extension in Measure.extension.where(url = 'http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-supplementalDataGuidance') %}
             <tr>
                 <th scope="row">