BAH-2433 | refactor. updated the concept class name as a config

Author: kavitha-sundararajan

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

@@ -31,6 +31,7 @@ public enum Config {
     LAB_ORDER( "Lab Order"),
     IMAGE("Image"),
     PATIENT_VIDEO("Patient Video"),
+    CONCEPT_DETAILS_CONCEPT_CLASS("Concept Details"),
 
     //Physical_Examination_Ignoring_Form_List
     Forms_To_Ignore_In_Physical_Examination("Discharge Summary, Death Note, Delivery Note, Opioid Substitution Therapy - Intake, Opportunistic Infection, " +

omod/src/main/java/org/bahmni/module/hip/web/model/FhirOPConsult.java

@@ -17,7 +17,6 @@
 import org.hl7.fhir.r4.model.ServiceRequest;
 
 import org.openmrs.EncounterProvider;
-
 import java.util.List;
 import java.util.Date;
 import java.util.Objects;

omod/src/main/java/org/bahmni/module/hip/web/service/ConsultationService.java

@@ -1,5 +1,6 @@
 package org.bahmni.module.hip.web.service;
 
+import org.bahmni.module.hip.Config;
 import org.bahmni.module.hip.api.dao.ConsultationDao;
 import org.bahmni.module.hip.api.dao.OPConsultDao;
 import org.bahmni.module.hip.web.model.OpenMrsCondition;
@@ -29,7 +30,6 @@ public class ConsultationService {
     private final ConsultationDao consultationDao;
     private final OPConsultDao opConsultDao;
     private final DiagnosticReportService diagnosticReportService;
-    public static final String CONCEPT_DETAILS_CONCEPT_CLASS = "Concept Details";
 
     public static Set<String> conceptNames = new HashSet<>(Arrays.asList("Image","Tuberculosis, Treatment Plan","Tuberculosis, Next Followup Visit","Tuberculosis, Plan for next visit","Tuberculosis, Patient Category","Current Followup Visit After",
             "Tuberculosis, Plan for next visit","Malaria, Parents Name","Malaria, Death Date", "Childhood Illness, Vitamin A Capsules Provided","Childhood Illness, Albendazole Given","Childhood Illness, Referred out",
@@ -166,7 +166,7 @@ private Map<Encounter, List<Order>> getEncounterListMapForOrders(List<Order> ord
     }
 
     private void getGroupMembersOfObs(Obs physicalExamination, List<Obs> groupMembers) {
-        if (physicalExamination.getGroupMembers().size() > 0 && !CONCEPT_DETAILS_CONCEPT_CLASS.equals(physicalExamination.getConcept().getConceptClass().getName())) {
+        if (physicalExamination.getGroupMembers().size() > 0 && Config.CONCEPT_DETAILS_CONCEPT_CLASS.getValue().equals(physicalExamination.getConcept().getConceptClass().getName())) {
             for (Obs groupMember : physicalExamination.getGroupMembers()) {
                 if (conceptNames.contains(groupMember.getConcept().getDisplayString())) continue;
                 getGroupMembersOfObs(groupMember, groupMembers);

omod/src/main/java/org/bahmni/module/hip/web/service/FHIRResourceMapper.java

@@ -59,7 +59,6 @@ public class FHIRResourceMapper {
     private final EncounterTranslatorImpl encounterTranslator;
     private final ObservationTranslatorImpl observationTranslator;
     public static Set<String> conceptNames = new HashSet<>(Arrays.asList("Follow up Date", "Additional Advice on Discharge", "Discharge Summary, Plan for follow up"));
-    public static final String CONCEPT_DETAILS_CONCEPT_CLASS = "Concept Details";
 
     @Autowired
     public FHIRResourceMapper(PatientTranslator patientTranslator, PractitionerTranslatorProviderImpl practitionerTranslatorProvider, MedicationRequestTranslator medicationRequestTranslator, MedicationTranslator medicationTranslator, EncounterTranslatorImpl encounterTranslator, ObservationTranslatorImpl observationTranslator) {
@@ -230,7 +229,7 @@ public Condition mapToCondition(OpenMrsCondition openMrsCondition, Patient patie
     public Observation mapToObs(Obs obs) {
         Concept concept = initializeEntityAndUnproxy(obs.getConcept());
         obs.setConcept(concept);
-        if (obs.getGroupMembers().size() > 0 && CONCEPT_DETAILS_CONCEPT_CLASS.equals(obs.getConcept().getConceptClass().getName()) && obs.getFormFieldNamespace() != null) {
+        if (obs.getGroupMembers().size() > 0 && Config.CONCEPT_DETAILS_CONCEPT_CLASS.getValue().equals(obs.getConcept().getConceptClass().getName()) && obs.getFormFieldNamespace() != null) {
             Obs[] groupMembersArray = new Obs[obs.getGroupMembers().size()];
             groupMembersArray = obs.getGroupMembers().toArray(groupMembersArray);
             obs.setValueText(groupMembersArray[2].getValueCoded().getDisplayString() + " " + "since" + " " + groupMembersArray[0].getValueNumeric() + " " + groupMembersArray[1].getValueCoded().getDisplayString());