diff --git a/src/views/CaseReviewView.vue b/src/views/CaseReviewView.vue
index 3e09e40f..1662a9ca 100644
--- a/src/views/CaseReviewView.vue
+++ b/src/views/CaseReviewView.vue
@@ -500,13 +500,27 @@ function fillDetailForm(row: CaseListItem, fullData: unknown) {
   detailForm.icd_codes = getStringList(record, ['icd_codes', 'icdCodes', 'icd_list', 'icdList']).join(', ')
   detailForm.estimated_minutes = getNumber(record, ['estimated_minutes', 'estimatedMinutes']) ?? row.estimatedMinutes ?? undefined
   detailForm.osce_enabled = getBoolean(record, ['osce_enabled', 'osceEnabled'])
-  detailForm.traditional_standard_diagnosis = getString(traditional, ['standard_diagnosis', 'standardDiagnosis'])
-  detailForm.traditional_standard_treatment = getString(traditional, ['standard_treatment', 'standardTreatment'])
-  detailForm.traditional_guideline_reference = getString(traditional, ['guideline_reference', 'guidelineReference'])
-  detailForm.teaching_goal = getString(teaching, ['teaching_goal', 'teachingGoal'])
-  detailForm.discussion_questions = getString(teaching, ['discussion_questions', 'discussionQuestions'])
-  detailForm.teacher_guide = getString(teaching, ['teacher_guide', 'teacherGuide'])
-  detailForm.scoring_focus = getString(teaching, ['scoring_focus', 'scoringFocus'])
+  detailForm.traditional_standard_diagnosis =
+    getString(traditional, ['standard_diagnosis', 'standardDiagnosis']) ||
+    getString(record, ['standard_diagnosis', 'standardDiagnosis'])
+  detailForm.traditional_standard_treatment =
+    getString(traditional, ['standard_treatment', 'standardTreatment']) ||
+    getString(record, ['standard_treatment', 'standardTreatment'])
+  detailForm.traditional_guideline_reference =
+    getString(traditional, ['guideline_reference', 'guidelineReference']) ||
+    getString(record, ['guideline_reference', 'guidelineReference'])
+  detailForm.teaching_goal =
+    getString(teaching, ['teaching_goal', 'teachingGoal']) ||
+    getString(record, ['teaching_goal', 'teachingGoal'])
+  detailForm.discussion_questions =
+    getString(teaching, ['discussion_questions', 'discussionQuestions']) ||
+    getString(record, ['discussion_questions', 'discussionQuestions'])
+  detailForm.teacher_guide =
+    getString(teaching, ['teacher_guide', 'teacherGuide']) ||
+    getString(record, ['teacher_guide', 'teacherGuide'])
+  detailForm.scoring_focus =
+    getString(teaching, ['scoring_focus', 'scoringFocus']) ||
+    getString(record, ['scoring_focus', 'scoringFocus'])
   detailForm.scoring_rules = scoringRules
   detailForm.exam_items = examItems
 }
diff --git a/src/views/CasesView.vue b/src/views/CasesView.vue
index e1ce88f7..0cba02a9 100644
--- a/src/views/CasesView.vue
+++ b/src/views/CasesView.vue
@@ -1533,13 +1533,27 @@ function fillCaseFormFromImportedPdf(result: ImportCasePdfResult) {
   caseForm.estimated_minutes = getImportNumber(record, ['estimated_minutes', 'estimatedMinutes']) ?? undefined
   caseForm.osce_enabled = getImportBoolean(record, ['osce_enabled', 'osceEnabled'])
 
-  caseForm.traditional_standard_diagnosis = getImportString(traditional, ['standard_diagnosis', 'standardDiagnosis'])
-  caseForm.traditional_standard_treatment = getImportString(traditional, ['standard_treatment', 'standardTreatment'])
-  caseForm.traditional_guideline_reference = getImportString(traditional, ['guideline_reference', 'guidelineReference'])
-  caseForm.teaching_goal = getImportString(teaching, ['teaching_goal', 'teachingGoal'])
-  caseForm.discussion_questions = getImportString(teaching, ['discussion_questions', 'discussionQuestions'])
-  caseForm.teacher_guide = getImportString(teaching, ['teacher_guide', 'teacherGuide'])
-  caseForm.scoring_focus = getImportString(teaching, ['scoring_focus', 'scoringFocus'])
+  caseForm.traditional_standard_diagnosis =
+    getImportString(traditional, ['standard_diagnosis', 'standardDiagnosis']) ||
+    getImportString(record, ['standard_diagnosis', 'standardDiagnosis'])
+  caseForm.traditional_standard_treatment =
+    getImportString(traditional, ['standard_treatment', 'standardTreatment']) ||
+    getImportString(record, ['standard_treatment', 'standardTreatment'])
+  caseForm.traditional_guideline_reference =
+    getImportString(traditional, ['guideline_reference', 'guidelineReference']) ||
+    getImportString(record, ['guideline_reference', 'guidelineReference'])
+  caseForm.teaching_goal =
+    getImportString(teaching, ['teaching_goal', 'teachingGoal']) ||
+    getImportString(record, ['teaching_goal', 'teachingGoal'])
+  caseForm.discussion_questions =
+    getImportString(teaching, ['discussion_questions', 'discussionQuestions']) ||
+    getImportString(record, ['discussion_questions', 'discussionQuestions'])
+  caseForm.teacher_guide =
+    getImportString(teaching, ['teacher_guide', 'teacherGuide']) ||
+    getImportString(record, ['teacher_guide', 'teacherGuide'])
+  caseForm.scoring_focus =
+    getImportString(teaching, ['scoring_focus', 'scoringFocus']) ||
+    getImportString(record, ['scoring_focus', 'scoringFocus'])
   caseForm.scoring_rules = scoringRules.length
     ? scoringRules
     : [{ dimension: '', score_weight: 1, ai_auto_score: true, scoring_standard: '' }]
@@ -1570,13 +1584,27 @@ function fillDetailForm(row: CaseListItem, fullData: unknown) {
   detailForm.icd_codes = getImportStringList(record, ['icd_codes', 'icdCodes', 'icd_list', 'icdList']).join(', ')
   detailForm.estimated_minutes = getImportNumber(record, ['estimated_minutes', 'estimatedMinutes']) ?? row.estimatedMinutes ?? undefined
   detailForm.osce_enabled = getImportBoolean(record, ['osce_enabled', 'osceEnabled'])
-  detailForm.traditional_standard_diagnosis = getImportString(traditional, ['standard_diagnosis', 'standardDiagnosis'])
-  detailForm.traditional_standard_treatment = getImportString(traditional, ['standard_treatment', 'standardTreatment'])
-  detailForm.traditional_guideline_reference = getImportString(traditional, ['guideline_reference', 'guidelineReference'])
-  detailForm.teaching_goal = getImportString(teaching, ['teaching_goal', 'teachingGoal'])
-  detailForm.discussion_questions = getImportString(teaching, ['discussion_questions', 'discussionQuestions'])
-  detailForm.teacher_guide = getImportString(teaching, ['teacher_guide', 'teacherGuide'])
-  detailForm.scoring_focus = getImportString(teaching, ['scoring_focus', 'scoringFocus'])
+  detailForm.traditional_standard_diagnosis =
+    getImportString(traditional, ['standard_diagnosis', 'standardDiagnosis']) ||
+    getImportString(record, ['standard_diagnosis', 'standardDiagnosis'])
+  detailForm.traditional_standard_treatment =
+    getImportString(traditional, ['standard_treatment', 'standardTreatment']) ||
+    getImportString(record, ['standard_treatment', 'standardTreatment'])
+  detailForm.traditional_guideline_reference =
+    getImportString(traditional, ['guideline_reference', 'guidelineReference']) ||
+    getImportString(record, ['guideline_reference', 'guidelineReference'])
+  detailForm.teaching_goal =
+    getImportString(teaching, ['teaching_goal', 'teachingGoal']) ||
+    getImportString(record, ['teaching_goal', 'teachingGoal'])
+  detailForm.discussion_questions =
+    getImportString(teaching, ['discussion_questions', 'discussionQuestions']) ||
+    getImportString(record, ['discussion_questions', 'discussionQuestions'])
+  detailForm.teacher_guide =
+    getImportString(teaching, ['teacher_guide', 'teacherGuide']) ||
+    getImportString(record, ['teacher_guide', 'teacherGuide'])
+  detailForm.scoring_focus =
+    getImportString(teaching, ['scoring_focus', 'scoringFocus']) ||
+    getImportString(record, ['scoring_focus', 'scoringFocus'])
   detailForm.scoring_rules = scoringRules.length
     ? scoringRules
     : [{ dimension: '', score_weight: 1, ai_auto_score: true, scoring_standard: '' }]