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

Author: kavitha-sundararajan

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

@@ -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 && Config.CONCEPT_DETAILS_CONCEPT_CLASS.getValue().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

@@ -233,7 +233,7 @@ public Observation mapToObs(Obs obs) {
         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());
+            obs.setValueText(groupMembersArray[0].getValueCoded().getDisplayString() + " " + "since" + " " + groupMembersArray[2].getValueNumeric() + " " + groupMembersArray[1].getValueCoded().getDisplayString());
         }
         Observation observation = observationTranslator.toFhirResource(obs);
         observation.addNote(new Annotation(new MarkdownType(obs.getComment())));