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

This reverts commit fa84774.

Author: kavitha-sundararajan

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

@@ -1,6 +1,5 @@
 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;
@@ -15,7 +14,6 @@ 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

@@ -2,8 +2,6 @@
 
 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;
@@ -25,12 +23,10 @@
 public class EncounterDaoImpl implements EncounterDao {
 
     private SessionFactory sessionFactory;
-    private final ObsDao obsDao;
 
     @Autowired
-    public EncounterDaoImpl(SessionFactory sessionFactory, ObsDao obsDao) {
+    public EncounterDaoImpl(SessionFactory sessionFactory) {
         this.sessionFactory = sessionFactory;
-        this.obsDao = obsDao;
     }
 
     private String sqlGetEpisodeEncounterIds = "select\n" +
@@ -165,26 +161,6 @@ 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();