Merge pull request #86 from BahmniIndiaDistro/BAH-2433-fix

BAH-2433 | Fix. display custom message for chief complaint data

Author: kavitha-sundararajan

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

@@ -32,6 +32,9 @@ public enum Config {
     IMAGE("Image"),
     PATIENT_VIDEO("Patient Video"),
     CONCEPT_DETAILS_CONCEPT_CLASS("Concept Details"),
+    CHIEF_COMPLAINT_CODED("Chief Complaint Coded"),
+    SIGN_SYMPTOM_DURATION("Sign/symptom duration"),
+    CHIEF_COMPLAINT_DURATION("Chief Complaint Duration"),
 
     //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/FHIRResourceMapper.java

@@ -24,6 +24,7 @@
 import org.hl7.fhir.r4.model.Enumerations;
 import org.hl7.fhir.r4.model.Annotation;
 import org.hl7.fhir.r4.model.MarkdownType;
+import org.hl7.fhir.r4.model.StringType;
 
 import org.openmrs.DrugOrder;
 import org.openmrs.EncounterProvider;
@@ -230,12 +231,10 @@ public Condition mapToCondition(OpenMrsCondition openMrsCondition, Patient patie
     public Observation mapToObs(Obs obs) {
         Concept concept = initializeEntityAndUnproxy(obs.getConcept());
         obs.setConcept(concept);
+        Observation observation = observationTranslator.toFhirResource(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[0].getValueCoded().getDisplayString() + " " + "since" + " " + groupMembersArray[2].getValueNumeric() + " " + groupMembersArray[1].getValueCoded().getDisplayString());
+            observation.setValue(new StringType(getCustomDisplayStringForChiefComplaint(obs.getGroupMembers())));
         }
-        Observation observation = observationTranslator.toFhirResource(obs);
         observation.addNote(new Annotation(new MarkdownType(obs.getComment())));
         return observation;
     }
@@ -298,4 +297,17 @@ public static <T> T initializeEntityAndUnproxy(T entity) {
         }
         return entity;
     }
+
+    public String getCustomDisplayStringForChiefComplaint(Set<Obs> groupMembers) {
+        String chiefComplaintCoded = null, signOrSymptomDuration = null, chiefComplaintDuration = null;
+        for (Obs childObs : groupMembers) {
+            if(childObs.getConcept().getName().getName().equals(Config.CHIEF_COMPLAINT_CODED.getValue()))
+                chiefComplaintCoded = childObs.getValueCoded().getDisplayString();
+            if(childObs.getConcept().getName().getName().equals(Config.SIGN_SYMPTOM_DURATION.getValue()))
+                signOrSymptomDuration = childObs.getValueNumeric().toString();
+            if(childObs.getConcept().getName().getName().equals(Config.CHIEF_COMPLAINT_DURATION.getValue()))
+                chiefComplaintDuration = childObs.getValueCoded().getDisplayString();
+        }
+        return (chiefComplaintCoded + " " + "since" + " " + signOrSymptomDuration + " " + chiefComplaintDuration);
+    }
 }