update the app

Author: mounika

src/app.py

@@ -47,9 +47,16 @@ def get_patient_demographics(patient_id, credentials):
         birth_date = patient['birthDate']
         age = calculate_age(birth_date)
         sex = patient['gender']
-        race = next((extension['valueCodeableConcept']['text']
-                     for extension in patient.get('extension', [])
-                     if extension['url'] == 'http://hl7.org/fhir/StructureDefinition/us-core-race'), 'Not Found')
+        race = 'Not Found'
+        
+        # Extract race from extensions
+        for extension in patient.get('extension', []):
+            if extension['url'] == 'http://hl7.org/fhir/us/core/StructureDefinition/us-core-race':
+                for ext in extension.get('extension', []):
+                    if ext['url'] == 'ombCategory':
+                        race = ext['valueCoding']['display']
+                        break
+
         return {'age': age, 'sex': sex, 'race': race}
     else:
         return {'age': 'Not Found', 'sex': 'Not Found', 'race': 'Not Found'}

src/templates/index.html

@@ -81,7 +81,7 @@ <h1>ASCVD Risk Calculator</h1>
             <form method="post" action="/calculate_risk" class="form-container">
                 {% if demographics %}
                     <div class="form-group">
-                        <label>Age:</label>
+                        <label>Age (20-79):</label>
                         <input type="text" name="age" value="{{ demographics.age if demographics.age != 'Not Found' else '' }}" placeholder="{{ 'Not Found' if demographics.age == 'Not Found' else '' }}" required>
                     </div>
                     <div class="form-group">
@@ -97,7 +97,21 @@ <h1>ASCVD Risk Calculator</h1>
                 {% if observations %}
                     {% for obs_name, obs_value in observations.items() %}
                         <div class="form-group">
-                            <label>{{ obs_name }}:</label>
+                            <label>
+                                {% if obs_name == 'Systolic Blood Pressure' %}
+                                    Systolic Blood Pressure (90-200 mm Hg):
+                                {% elif obs_name == 'Diastolic Blood Pressure' %}
+                                    Diastolic Blood Pressure (60-130 mm Hg):
+                                {% elif obs_name == 'Total Cholesterol' %}
+                                    Total Cholesterol (130 - 320 mg/dL):
+                                {% elif obs_name == 'HDL Cholesterol' %}
+                                    HDL Cholesterol (20 - 100 mg/dL):
+                                {% elif obs_name == 'LDL Cholesterol' %}
+                                    LDL Cholesterol (30-300 mg/dL):
+                                {% else %}
+                                    {{ obs_name }}:
+                                {% endif %}
+                            </label>
                             <input type="text" name="{{ obs_name | replace(' ', '_') | lower }}" value="{{ obs_value if obs_value != 'Not Found' else '' }}" placeholder="{{ 'Not Found' if obs_value == 'Not Found' else '' }}" required>
                         </div>
                     {% endfor %}