diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/reporting/builder/mchms/ANCRegisterReportBuilder.java b/api/src/main/java/org/openmrs/module/kenyaemr/reporting/builder/mchms/ANCRegisterReportBuilder.java index 19eba85103..2dd6042832 100644 --- a/api/src/main/java/org/openmrs/module/kenyaemr/reporting/builder/mchms/ANCRegisterReportBuilder.java +++ b/api/src/main/java/org/openmrs/module/kenyaemr/reporting/builder/mchms/ANCRegisterReportBuilder.java @@ -93,8 +93,10 @@ protected DataSetDefinition datasetColumns() { DataConverter nameFormatter = new ObjectFormatter("{familyName}, {givenName} {middleName}"); DataDefinition nameDef = new ConvertedPersonDataDefinition("name", new PreferredNameDataDefinition(), nameFormatter); PatientIdentifierType upn = MetadataUtils.existing(PatientIdentifierType.class, HivMetadata._PatientIdentifierType.UNIQUE_PATIENT_NUMBER); + PatientIdentifierType nupi = MetadataUtils.existing(PatientIdentifierType.class, CommonMetadata._PatientIdentifierType.NATIONAL_UNIQUE_PATIENT_IDENTIFIER); DataConverter identifierFormatter = new ObjectFormatter("{identifier}"); DataDefinition identifierDef = new ConvertedPatientDataDefinition("identifier", new PatientIdentifierDataDefinition(upn.getName(), upn), identifierFormatter); + DataDefinition nupiDef = new ConvertedPatientDataDefinition("identifier", new PatientIdentifierDataDefinition(nupi.getName(), nupi), identifierFormatter); ANCVisitNumberDataDefinition ancVisitNumberDataDefinition = new ANCVisitNumberDataDefinition(); ancVisitNumberDataDefinition.addParameter(new Parameter("endDate", "End Date", Date.class)); @@ -232,6 +234,7 @@ protected DataSetDefinition datasetColumns() { dsd.addColumn("Sex", new GenderDataDefinition(), ""); dsd.addColumn("Unique Patient Number", identifierDef, null); + dsd.addColumn("National Unique Patient Identifier", nupiDef, null); dsd.addColumn("Visit Date", new EncounterDatetimeDataDefinition(),"", new DateConverter(ENC_DATE_FORMAT)); // new columns dsd.addColumn("ANC Number", new ANCNumberDataDefinition(),""); diff --git a/omod/src/main/webapp/resources/reports/pmtct/ANC_register_template.xls b/omod/src/main/webapp/resources/reports/pmtct/ANC_register_template.xls index 8e4425e160..2b46708960 100644 Binary files a/omod/src/main/webapp/resources/reports/pmtct/ANC_register_template.xls and b/omod/src/main/webapp/resources/reports/pmtct/ANC_register_template.xls differ