From 2fd000303446b78d765149caa57b926e1a4df1f6 Mon Sep 17 00:00:00 2001
From: adipaul1981 <adipaul1981@yahoo.ca>
Date: Mon, 13 Jun 2022 13:49:53 -0400
Subject: [PATCH] fix missing probant only in family report (#61)

---
 src/reports/family-clinical-data/configInclude.ts      | 8 ++++----
 src/reports/family-clinical-data/generateFamilySqon.ts | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/reports/family-clinical-data/configInclude.ts b/src/reports/family-clinical-data/configInclude.ts
index 8f012f0..0640210 100644
--- a/src/reports/family-clinical-data/configInclude.ts
+++ b/src/reports/family-clinical-data/configInclude.ts
@@ -6,7 +6,7 @@ const participants: SheetConfig = {
     columns: [
         { field: 'participant_id' },
         { field: 'external_id' },
-        { field: 'family.family_id', header: 'Family ID' },
+        { field: 'families_id', header: 'Family ID' },
         { field: 'family_type' },
         { field: 'family.father_id', header: 'Father ID' },
         { field: 'family.mother_id', header: 'Mother ID' },
@@ -43,7 +43,7 @@ const phenotypes: SheetConfig = {
     columns: [
         { field: 'participant_id' },
         { field: 'external_id' },
-        { field: 'family.family_id', header: 'Family ID' },
+        { field: 'families_id', header: 'Family ID' },
         {
             field: 'phenotype.hpo_phenotype_observed',
             additionalFields: ['phenotype.hpo_phenotype_not_observed'],
@@ -85,7 +85,7 @@ const diagnoses: SheetConfig = {
     columns: [
         { field: 'participant_id' },
         { field: 'external_id' },
-        { field: 'family.family_id', header: 'Family ID' },
+        { field: 'families_id', header: 'Family ID' },
         {
             field: 'fhir_id',
             header: 'Diagnosis Type',
@@ -101,7 +101,7 @@ const diagnoses: SheetConfig = {
         },
         { field: 'diagnoses.source_text_tumor_location' },
     ],
-    sort: [{ 'family.family_id': 'asc' }, { participant_id: 'asc' }],
+    sort: [{ 'families_id': 'asc' }, { participant_id: 'asc' }],
 };
 
 export const queryConfigs: QueryConfig = {
diff --git a/src/reports/family-clinical-data/generateFamilySqon.ts b/src/reports/family-clinical-data/generateFamilySqon.ts
index 6c4d25c..d38ab2c 100644
--- a/src/reports/family-clinical-data/generateFamilySqon.ts
+++ b/src/reports/family-clinical-data/generateFamilySqon.ts
@@ -36,7 +36,7 @@ export default async (
     const participantIds =
         (sqon.content || []).filter(e => (e.content?.field || '') === 'participant_id')[0]?.content.value || [];
 
-    const field = program.toLowerCase() === ProjectType.include ? 'family.family_id' : 'family_id';
+    const field = program.toLowerCase() === ProjectType.include ? 'families_id' : 'family_id';
     const esRequest = {
         query,
         aggs: {