diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/notification/ColonyAlertsNotification.java b/onprc_ehr/src/org/labkey/onprc_ehr/notification/ColonyAlertsNotification.java index 712b8a462..d17eafc0d 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/notification/ColonyAlertsNotification.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/notification/ColonyAlertsNotification.java @@ -15,6 +15,7 @@ */ package org.labkey.onprc_ehr.notification; +import com.google.gwt.user.cellview.client.AbstractCellTable; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.Nullable; import org.labkey.api.data.Aggregate; @@ -909,7 +910,7 @@ protected void pedigreeIssues(final Container c, User u, final StringBuilder msg protected void incompleteBirthRecords(final Container c, User u, final StringBuilder msg) { SimpleFilter filter = new SimpleFilter(new SimpleFilter.OrClause( - //new CompareType.CompareClause(FieldKey.fromString("species"), CompareType.ISBLANK, null), + new CompareType.CompareClause(FieldKey.fromString("Id/demographics/gender"), CompareType.EQUAL, "p"), new CompareType.CompareClause(FieldKey.fromString("Id/demographics/gender"), CompareType.ISBLANK, null), new CompareType.CompareClause(FieldKey.fromString("Id/demographics/species"), CompareType.ISBLANK, null), new CompareType.CompareClause(FieldKey.fromString("Id/demographics/geographic_origin"), CompareType.ISBLANK, null) @@ -952,7 +953,16 @@ protected void incompleteBirthRecords(final Container c, User u, final StringBui msg.append("" + (rs.getString("date") == null ? "Unknown" : rs.getDate("date")) + ""); msg.append("" + (rs.getString("remark") == null ? " " : rs.getString("remark")) + ""); - msg.append("" + (rs.getString(FieldKey.fromString("Id/demographics/gender/meaning")) == null ? "MISSING" : rs.getString(FieldKey.fromString("Id/demographics/gender/meaning"))) + ""); + //Added: 6-30-2026 R. Blasa + if (rs.getString(FieldKey.fromString("Id/demographics/gender/meaning")) == "Pending") + { + msg.append("" + rs.getString(FieldKey.fromString("Id/demographics/gender/meaning")) + ""); + } + else + { + msg.append("" + (rs.getString(FieldKey.fromString("Id/demographics/gender/meaning")) == null ? "MISSING" : rs.getString(FieldKey.fromString("Id/demographics/gender/meaning"))) + ""); + } + msg.append("" + (rs.getString(FieldKey.fromString("Id/demographics/species")) == null ? "MISSING" : rs.getString(FieldKey.fromString("Id/demographics/species"))) + ""); msg.append("" + (rs.getString(FieldKey.fromString("Id/demographics/geographic_origin")) == null ? "MISSING" : rs.getString(FieldKey.fromString("Id/demographics/geographic_origin"))) + ""); msg.append("");