BAH-2258: Modifying obs query to fetch units as well

Author: swatigogia2020

api/src/main/java/org/bahmni/module/hip/api/dao/EncounterDao.java

@@ -1,5 +1,6 @@
 package org.bahmni.module.hip.api.dao;
 
+import org.bahmni.module.hip.model.PatientObs;
 import org.openmrs.Encounter;
 import org.openmrs.Obs;
 import org.openmrs.Order;
@@ -14,6 +15,7 @@ public interface EncounterDao {
     List<Order> GetOrdersForVisit(Visit visit);
     List<Encounter> GetEncountersForVisit(Visit visit, String encounterType);
     List<Obs> GetAllObsForVisit(Visit visit, String encounterType, String conceptName);
+    List<PatientObs> GetAllObservationsForVisit(Visit visit, String encounterType, String conceptName);
     List<Integer> GetEncounterIdsForProgramForPrescriptions(String patientUUID, String program, String programEnrollmentID, Date fromDate, Date toDate) ;
     List<Integer> GetEncounterIdsForProgramForDiagnosticReport(String patientUUID, String program, String programEnrollmentID, Date fromDate, Date toDate);
 }

api/src/main/java/org/bahmni/module/hip/api/dao/ObsDao.java

@@ -0,0 +1,10 @@
+package org.bahmni.module.hip.api.dao;
+
+import org.openmrs.Obs;
+
+import java.util.List;
+
+public interface ObsDao {
+    List<String> getObsUnits(Obs obs);
+
+}

api/src/main/java/org/bahmni/module/hip/api/dao/impl/EncounterDaoImpl.java

@@ -2,6 +2,8 @@
 
 import org.bahmni.module.hip.Config;
 import org.bahmni.module.hip.api.dao.EncounterDao;
+import org.bahmni.module.hip.api.dao.ObsDao;
+import org.bahmni.module.hip.model.PatientObs;
 import org.hibernate.Query;
 import org.hibernate.SessionFactory;
 import org.openmrs.Encounter;
@@ -23,10 +25,12 @@
 public class EncounterDaoImpl implements EncounterDao {
 
     private SessionFactory sessionFactory;
+    private final ObsDao obsDao;
 
     @Autowired
-    public EncounterDaoImpl(SessionFactory sessionFactory) {
+    public EncounterDaoImpl(SessionFactory sessionFactory, ObsDao obsDao) {
         this.sessionFactory = sessionFactory;
+        this.obsDao = obsDao;
     }
 
     private String sqlGetEpisodeEncounterIds = "select\n" +
@@ -161,6 +165,26 @@ public List<Obs> GetAllObsForVisit(Visit visit, String encounterType, String con
         return observations;
     }
 
+    @Override
+    public List<PatientObs> GetAllObservationsForVisit(Visit visit, String encounterType, String conceptName) {
+        List<Obs> observations = new ArrayList<>();
+        List<Encounter> encounters = GetEncountersForVisit(visit,encounterType);
+        for (Encounter encounter : encounters) {
+            if(conceptName == null)
+                observations.addAll(encounter.getAllObs());
+            observations.addAll(encounter.getAllObs().stream()
+                    .filter(o -> Objects.equals(o.getConcept().getName().getName(), conceptName))
+                    .collect(Collectors.toList()));
+        }
+
+        List<PatientObs> patientObs = new ArrayList<>();
+        for(Obs obs: observations){
+            PatientObs patientObs1 = new PatientObs(obsDao.getObsUnits(obs).toString(), obs);
+            patientObs.add(patientObs1);
+        }
+        return patientObs;
+    }
+
     @Override
     public List<Order> GetOrdersForVisit(Visit visit) {
         List<Integer> episodeEncounters = GetEpisodeEncounterIds();

api/src/main/java/org/bahmni/module/hip/api/dao/impl/ObsDaoImpl.java

@@ -0,0 +1,24 @@
+package org.bahmni.module.hip.api.dao.impl;
+
+import org.bahmni.module.hip.api.dao.ObsDao;
+import org.hibernate.Query;
+import org.hibernate.SessionFactory;
+import org.openmrs.Obs;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+@Repository
+public class ObsDaoImpl implements ObsDao {
+
+    private SessionFactory sessionFactory;
+
+    private String sqlGetObsUnits= "select units from concept_numeric as cn join obs on cn.concept_id=obs.concept_id where obs_id = :obsId ; ";
+
+    @Override
+    public List<String> getObsUnits(Obs obs){
+        Query query = this.sessionFactory.getCurrentSession().createSQLQuery(sqlGetObsUnits);
+        query.setParameter("obsId", obs.getObsId());
+
+        return query.list();
+    }
+}

api/src/main/java/org/bahmni/module/hip/model/PatientObs.java

@@ -0,0 +1,31 @@
+package org.bahmni.module.hip.model;
+
+import org.openmrs.Obs;
+
+public class PatientObs {
+    protected String units;
+    protected Obs obs;
+
+    public PatientObs(String units, Obs obs){
+        this.units = units;
+        this.obs = obs;
+    }
+
+    public void setUnits(String units){
+        this.units = units;
+    }
+
+    public String getUnits(){
+        return this.units;
+    }
+
+    public void setObs(Obs obs){
+        this.obs = obs;
+    }
+
+    public Obs getObs() {
+        return obs;
+    }
+
+
+}