BAH-2433 | refactored to display chief complaint as single concept in hiu

Author: kavitha-sundararajan

.github/workflows/build_and_upload.yml

@@ -7,6 +7,7 @@ on:
  push:
     branches:
      - master
+     - BAH-2433
  workflow_dispatch:
 env:
   ORG_NAME: BahmniIndiaDistro

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

@@ -1,5 +1,7 @@
 package org.bahmni.module.hip.web.model;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.bahmni.module.hip.web.service.FHIRResourceMapper;
 import org.bahmni.module.hip.web.service.FHIRUtils;
 import org.hl7.fhir.r4.model.Condition;
@@ -17,6 +19,8 @@
 import org.hl7.fhir.r4.model.ServiceRequest;
 
 import org.openmrs.EncounterProvider;
+import org.openmrs.Obs;
+
 import java.util.List;
 import java.util.Date;
 import java.util.Objects;
@@ -40,6 +44,7 @@ public class FhirOPConsult {
     private final Procedure procedure;
     private final List<DocumentReference> patientDocuments;
     private final List<ServiceRequest> serviceRequest;
+    private static Logger logger = LogManager.getLogger(FhirOPConsult.class);
 
     public FhirOPConsult(List<Condition> chiefComplaints,
                          List<Condition> medicalHistory, Date visitTimeStamp,
@@ -107,8 +112,14 @@ public static FhirOPConsult fromOpenMrsOPConsult(OpenMrsOPConsult openMrsOPConsu
         for(int i=0;i<openMrsOPConsult.getMedicalHistoryConditions().size();i++){
             fhirMedicalHistoryList.add(fhirResourceMapper.mapToCondition(openMrsOPConsult.getMedicalHistoryConditions().get(i), patient));
         }
+        for(Obs obs:openMrsOPConsult.getObservations()){
+            logger.warn("openMrsOPConsult.getObservations() ----- "+obs.getConcept().getName());
+        }
         List<Observation> fhirObservationList = openMrsOPConsult.getObservations().stream().
                     map(fhirResourceMapper::mapToObs).collect(Collectors.toList());
+        for(Observation obs:fhirObservationList) {
+            logger.warn("fhirObservationList ----- " + obs.getValue());
+        }
         Procedure procedure = openMrsOPConsult.getProcedure() != null ?
                 fhirResourceMapper.mapToProcedure(openMrsOPConsult.getProcedure()) : null;
         List<DocumentReference> patientDocuments = openMrsOPConsult.getPatientDocuments().stream().

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

@@ -1,5 +1,7 @@
 package org.bahmni.module.hip.web.service;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 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,6 +31,8 @@ public class ConsultationService {
     private final ConsultationDao consultationDao;
     private final OPConsultDao opConsultDao;
     private final DiagnosticReportService diagnosticReportService;
+    private static Logger logger = LogManager.getLogger(ConsultationService.class);
+    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",
@@ -165,7 +169,8 @@ private Map<Encounter, List<Order>> getEncounterListMapForOrders(List<Order> ord
     }
 
     private void getGroupMembersOfObs(Obs physicalExamination, List<Obs> groupMembers) {
-        if (physicalExamination.getGroupMembers().size() > 0) {
+        logger.warn("getGroupMembersOfObs ----- "+physicalExamination.getConcept().getName()+" ------ class ------ "+physicalExamination.getConcept().getConceptClass().getName());
+        if (physicalExamination.getGroupMembers().size() > 0 && !CONCEPT_DETAILS_CONCEPT_CLASS.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

@@ -1,5 +1,7 @@
 package org.bahmni.module.hip.web.service;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.bahmni.module.hip.Config;
 import org.bahmni.module.hip.web.model.OpenMrsCondition;
 import org.hibernate.Hibernate;
@@ -59,6 +61,8 @@ 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";
+    private static Logger logger = LogManager.getLogger(FHIRResourceMapper.class);
 
     @Autowired
     public FHIRResourceMapper(PatientTranslator patientTranslator, PractitionerTranslatorProviderImpl practitionerTranslatorProvider, MedicationRequestTranslator medicationRequestTranslator, MedicationTranslator medicationTranslator, EncounterTranslatorImpl encounterTranslator, ObservationTranslatorImpl observationTranslator) {
@@ -229,8 +233,15 @@ 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) {
+            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());
+            logger.warn("obs.getConcept().getName() ----- "+obs.getConcept().getName());
+        }
         Observation observation = observationTranslator.toFhirResource(obs);
         observation.addNote(new Annotation(new MarkdownType(obs.getComment())));
+        logger.warn("observation.getValue() ----- "+observation.getValue());
         return observation;
     }