Merge pull request #84 from BahmniIndiaDistro/BAH-2433

BAH-2433 | fix to display chief complaint as single data in hiu

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/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;
@@ -165,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) {
+        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

@@ -230,6 +230,11 @@ 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 && 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());
+        }
         Observation observation = observationTranslator.toFhirResource(obs);
         observation.addNote(new Annotation(new MarkdownType(obs.getComment())));
         return observation;