BAH-2152 | Add. configuration for form to ignore physical examination

Author: SanoferSameera

api/src/main/java/org/bahmni/module/hip/Config.java

@@ -30,6 +30,10 @@ public enum Config {
     RADIOLOGY_ORDER( "Radiology Order"),
     LAB_ORDER( "Lab Order"),
 
+    //Physical_Examination_Ignoring_Form_List
+    Forms_To_Ignore_In_Physical_Examination("Discharge Summary, Death Note, Delivery Note, Opioid Substitution Therapy - Intake, Opportunistic Infection, " +
+            "Safe Abortion, ECG Notes, Operative Notes, USG Notes, Procedure Notes,Triage Reference, History and Examination, Visit Diagnoses"),
+
 
     PROP_HFR_ID("bahmniHip.healthFacilityRegistryId"),
     PROP_HFR_NAME( "bahmniHip.healthFacilityName"),

api/src/main/java/org/bahmni/module/hip/api/dao/impl/ConsultationDaoImpl.java

@@ -89,8 +89,7 @@ public List<Obs> getAllObs(String programName, Date fromDate, Date toDate, Patie
 
     @Override
     public List<Obs> getPhysicalExamination(Visit visit) {
-        final String[] formNames = new String[]{"Discharge Summary", "Death Note", "Delivery Note", "Opioid Substitution Therapy - Intake", "Opportunistic Infection",
-                "Safe Abortion", "ECG Notes", "Operative Notes", "USG Notes", "Procedure Notes", "Triage Reference", "History and Examination", "Visit Diagnoses"};
+        final String[] formNames = Config.Forms_To_Ignore_In_Physical_Examination.getValue().split("\\s*,\\s*");
         List<Obs> physicalExaminationObsMap = encounterDao.GetAllObsForVisit(visit,Config.CONSULTATION.getValue(),null)
                 .stream().filter(o -> o.getValueCoded() == null &&  o.getObsGroup() == null
                         && !Arrays.asList(formNames).contains(o.getConcept().getName().getName()) )
@@ -127,8 +126,7 @@ public List<Order> getOrdersForProgram(String programName, Date fromDate, Date t
 
     @Override
     public List<Obs> getPhysicalExaminationForProgram(String programName, Date fromDate, Date toDate, Patient patient) {
-        final String[] formNames = new String[]{"Discharge Summary", "Death Note", "Delivery Note", "Opioid Substitution Therapy - Intake", "Opportunistic Infection",
-                "Safe Abortion", "ECG Notes", "Operative Notes", "USG Notes", "Procedure Notes", "Triage Reference", "History and Examination", "Visit Diagnoses"};
+        final String[] formNames = Config.Forms_To_Ignore_In_Physical_Examination.getValue().split("\\s*,\\s*");
         List<Obs> physicalExaminationObsMap = new ArrayList<>();
         List<Obs> obs = getAllObs(programName, fromDate, toDate, patient);
         for (Obs o : obs) {