Merge pull request #2089 from njorocs/moh717_250122

Moh717 250122
palladiumkenya · Jan 28, 2025 · 9ade87a · 9ade87a
2 parents 64461dc + dd1bc1f
commit 9ade87a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/api/src/main/java/org/openmrs/module/kenyaemr/metadata/CommonMetadata.java b/api/src/main/java/org/openmrs/module/kenyaemr/metadata/CommonMetadata.java
@@ -170,6 +170,7 @@ public static final class _Form {
 		public static final String GASTROENTEROLOGY_CLINICAL_FORM = "6b4fa553-f2b3-47d0-a4c5-fc11f38b0b24";
 		public static final String DENTAL_CLINICAL_FORM = "a3c01460-c346-4f3d-a627-5c7de9494ba0";
 		public static final String INFECTIOUS_DISEASE_CLINICAL_FORM = "8f2fbcca-126f-439b-95b5-bcbc62647328";
+		public static final String RENAL_CLINICAL_FORM = "6d0be8bd-5320-45a0-9463-60c9ee2b1338";
 	}
 
 	public static final class _OrderType {

diff --git a/...c/main/java/org/openmrs/module/kenyaemr/reporting/builder/common/MOH717ReportBuilder.java b/...c/main/java/org/openmrs/module/kenyaemr/reporting/builder/common/MOH717ReportBuilder.java
@@ -64,7 +64,8 @@ public class MOH717ReportBuilder extends AbstractReportBuilder {
             CommonMetadata._Form.GASTROENTEROLOGY_CLINICAL_FORM,
             CommonMetadata._Form.CARDIOLOGY_CLINICAL_FORM,
             CommonMetadata._Form.DENTAL_CLINICAL_FORM,
-            CommonMetadata._Form.FERTILITY_CLINICAL_FORM
+            CommonMetadata._Form.FERTILITY_CLINICAL_FORM,
+            CommonMetadata._Form.UROLOGY_CLINICAL_FORM
     ));
     static final String dentalFillingList = String.join(",", new ArrayList<>(Arrays.asList(
             EmrConstants.TEMP_FILLING_PER_TOOTH, EmrConstants.COMPOSITE_FILLING, EmrConstants.AMALGAM_FILLING, EmrConstants.GlASS_LONOMER_FILLING
@@ -205,8 +206,8 @@ private DataSetDefinition moh717DatasetDefinition() {
         dsd.addColumn( "Nutrition Clinic (Re_Att)", "", ReportUtils.map(moh717IndicatorLibrary.specialClinic(CommonMetadata._Form.NUTRITION, RE_ATT), indParams), "");
         dsd.addColumn( "Oncology Clinic (New)", "", ReportUtils.map(moh717IndicatorLibrary.specialClinic(CommonMetadata._Form.ONCOLOGY_FORM, NEW_VISIT), indParams), "");
         dsd.addColumn( "Oncology Clinic (Re_Att)", "", ReportUtils.map(moh717IndicatorLibrary.specialClinic(CommonMetadata._Form.ONCOLOGY_FORM, RE_ATT), indParams), "");
-        dsd.addColumn( "Renal Clinic (New)", "", ReportUtils.map(moh717IndicatorLibrary.specialClinic(CommonMetadata._Form.UROLOGY_CLINICAL_FORM,NEW_VISIT), indParams), "");
-        dsd.addColumn( "Renal Clinic (Re_Att)", "", ReportUtils.map(moh717IndicatorLibrary.specialClinic(CommonMetadata._Form.UROLOGY_CLINICAL_FORM, RE_ATT), indParams), "");
+        dsd.addColumn( "Renal Clinic (New)", "", ReportUtils.map(moh717IndicatorLibrary.specialClinic(CommonMetadata._Form.RENAL_CLINICAL_FORM,NEW_VISIT), indParams), "");
+        dsd.addColumn( "Renal Clinic (Re_Att)", "", ReportUtils.map(moh717IndicatorLibrary.specialClinic(CommonMetadata._Form.RENAL_CLINICAL_FORM, RE_ATT), indParams), "");
         dsd.addColumn( "All other special Clinics (New)", "", ReportUtils.map(moh717IndicatorLibrary.otherSpecialClinics(EmrUtils.formatListWithQuotes(otherSpecialClinics),NEW_VISIT), indParams), "");
         dsd.addColumn( "All other special Clinics (Re_Att)", "", ReportUtils.map(moh717IndicatorLibrary.otherSpecialClinics(EmrUtils.formatListWithQuotes(otherSpecialClinics),RE_ATT), indParams), "");