diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/exporters/DefaultColumns.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/exporters/DefaultColumns.java index 0569cdb9..ce2b24c5 100644 --- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/exporters/DefaultColumns.java +++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/exporters/DefaultColumns.java @@ -31,6 +31,7 @@ public enum DefaultColumns implements Column { RECORD_ACCESS_GROUPS, RXCUI, PUBCHEM, + SMSID, MPNS, GRIN, INGREDIENT_TYPE, diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/exporters/DefaultSubstanceSpreadsheetExporterFactory.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/exporters/DefaultSubstanceSpreadsheetExporterFactory.java index 4a4b76b5..af0b4dfd 100644 --- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/exporters/DefaultSubstanceSpreadsheetExporterFactory.java +++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/exporters/DefaultSubstanceSpreadsheetExporterFactory.java @@ -132,7 +132,7 @@ public Map> createColumnRecipes(Parameters Map> defaultRecipeMap= new LinkedHashMap<>(); - // UUID, APPROVAL_ID, PT, RN, EC, NCIT, RXCUI PUBCHEM EPA_CompTox CATALOG_OF_LIFE ITIS NCBI PLANTS POWO GRIN MPNS INN_ID DAILYMED MF INCHIKEY SMILES INGREDIENT_TYPE + // UUID, APPROVAL_ID, PT, RN, EC, NCIT, RXCUI PUBCHEM SMSID EPA_CompTox CATALOG_OF_LIFE ITIS NCBI PLANTS POWO GRIN MPNS INN_ID DAILYMED MF INCHIKEY SMILES INGREDIENT_TYPE defaultRecipeMap.put(DefaultColumns.UUID, SingleColumnValueRecipe.create(DefaultColumns.UUID, (s, cell) -> cell.write(s.getOrGenerateUUID()))); defaultRecipeMap.put(DefaultColumns.APPROVAL_ID, SingleColumnValueRecipe.create(DefaultColumns.APPROVAL_ID, (s, cell) -> cell.writeString(s.getApprovalID()))); @@ -157,6 +157,10 @@ public Map> createColumnRecipes(Parameters defaultRecipeMap.put(DefaultColumns.RXCUI, new CodeSystemRecipe(DefaultColumns.RXCUI, "RXCUI")); defaultRecipeMap.put(DefaultColumns.PUBCHEM, new CodeSystemRecipe(DefaultColumns.PUBCHEM, "PUBCHEM")); + // In controlled vocab, the display is SMSID, but the value is SMS_ID, want report column header to be SMSID + defaultRecipeMap.put(DefaultColumns.SMSID, new CodeSystemRecipe(DefaultColumns.SMSID, "SMS_ID").replaceColumnName(DefaultColumns.SMSID + .name(),"SMSID")); + defaultRecipeMap.put(DefaultColumns.EPA_CompTox, new CodeSystemRecipe(DefaultColumns.EPA_CompTox, "EPA CompTox")); defaultRecipeMap.put(DefaultColumns.CATALOGUE_OF_LIFE, ParentSourceMaterialRecipeWrapper.wrap(new CodeSystemRecipe(DefaultColumns.CATALOGUE_OF_LIFE, "CATALOGUE OF LIFE"),params.getScrubber()));