Merge branch 'develop' into issue/9837/paginated-list-usequery

ohcnetwork · Feb 2, 2025 · 52e2e2d · 52e2e2d
2 parents 66c3284 + 313f0b5
commit 52e2e2d
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/ossar-analysis.yml b/.github/workflows/ossar-analysis.yml
@@ -30,7 +30,7 @@ jobs:
 
       # Run open source static analysis tools
       - name: Run OSSAR
-        uses: github/ossar-action@fae13e456b9973657a670eef6bccc3a4c2b5153d
+        uses: github/ossar-action@v1
         id: ossar
 
         # Upload results to the Security tab

diff --git a/public/images/wave_long.png b/public/images/wave_long.png
diff --git a/public/images/wave_long_2.png b/public/images/wave_long_2.png
diff --git a/public/locale/en.json b/public/locale/en.json
@@ -827,7 +827,7 @@
   "encounter_date_field_label__HI": "Date & Time of Consultation",
   "encounter_date_field_label__OP": "Date & Time of Out-patient visit",
   "encounter_date_field_label__R": "Date & Time of Consultation",
-  "encounter_diet_preference__diary_free": "Diary free",
+  "encounter_diet_preference__dairy_free": "Diary free",
   "encounter_diet_preference__gluten_free": "Gluten free",
   "encounter_diet_preference__halal": "Halal",
   "encounter_diet_preference__kosher": "Kosher",

diff --git a/public/locale/ml.json b/public/locale/ml.json
@@ -815,7 +815,7 @@
   "encounter_date_field_label__HI": "കൂടിയാലോചനയുടെ തീയതിയും സമയവും",
   "encounter_date_field_label__OP": "ഔട്ട്-പേഷ്യൻ്റ് സന്ദർശന തീയതിയും സമയവും",
   "encounter_date_field_label__R": "കൂടിയാലോചനയുടെ തീയതിയും സമയവും",
-  "encounter_diet_preference__diary_free": "ഡയറി സൗജന്യം",
+  "encounter_diet_preference__dairy_free": "ഡയറി സൗജന്യം",
   "encounter_diet_preference__gluten_free": "ഗ്ലൂറ്റൻ ഫ്രീ",
   "encounter_diet_preference__halal": "ഹലാൽ",
   "encounter_diet_preference__kosher": "കോഷർ",

diff --git a/src/types/emr/encounter.ts b/src/types/emr/encounter.ts
@@ -26,7 +26,7 @@ export const ENCOUNTER_CLASS = [
 
 export const ENCOUNTER_DIET_PREFERENCE = [
   "vegetarian",
-  "diary_free",
+  "dairy_free",
   "nut_free",
   "gluten_free",
   "vegan",