Merge pull request #1879 from gabriel090/KHP3-5495

Add a column on NUPI number on the ANC register enchancements
palladiumkenya · May 6, 2024 · 5568123 · 5568123
2 parents 42732d2 + 835fdea
commit 5568123
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/...in/java/org/openmrs/module/kenyaemr/reporting/builder/mchms/ANCRegisterReportBuilder.java b/...in/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