scanning more tables for updates

wandechris · wandechris · commit d573e61de17b · 2020-11-11T12:01:46.000+01:00
diff --git a/api/pom.xml b/api/pom.xml
@@ -4,7 +4,7 @@
     <parent>
 		<groupId>org.openmrs.module</groupId>
 		<artifactId>nigeriaemr</artifactId>
-		<version>1.6.0-SNAPSHOT</version>
+		<version>1.6.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>nigeriaemr-api</artifactId>
diff --git a/api/src/main/java/org/openmrs/module/nigeriaemr/api/dao/NigeriaEncounterDAO.java b/api/src/main/java/org/openmrs/module/nigeriaemr/api/dao/NigeriaEncounterDAO.java
@@ -18,4 +18,6 @@ public interface NigeriaEncounterDAO extends EncounterDAO {
 	
 	List<Encounter> getEncountersByEncounterTypeIds(Patient patient, Date fromDate, Date toDate,
 	        List<Integer> encounterTypeIds, boolean asc, int size) throws DAOException;
+	
+	List<Encounter> getEncountersByEncounterIds(List<Integer> encounterIds) throws DAOException;
 }
diff --git a/api/src/main/java/org/openmrs/module/nigeriaemr/api/dao/NigeriaObsDAO.java b/api/src/main/java/org/openmrs/module/nigeriaemr/api/dao/NigeriaObsDAO.java
@@ -34,4 +34,9 @@ Obs getHighestObsByConcept(Person person, Concept concept, Date from, Date to, b
 	List<Obs> getObsByConcept(List<Concept> concept, List<Integer> obsList) throws DAOException;
 	
 	List<Concept> getConcepts(List<Integer> conceptIds, boolean includeVoided) throws DAOException;
+	
+	List<Integer> getPatientsByObsDate(Date from, Date to, List<String> patientIds, boolean includeVoided)
+	        throws DAOException;
+	
+	List<Integer> getPatientEncounterIdsByDate(Integer id, Date fromDate, Date toDate) throws DAOException;
 }
diff --git a/api/src/main/java/org/openmrs/module/nigeriaemr/api/dao/NigeriaPatientDAO.java b/api/src/main/java/org/openmrs/module/nigeriaemr/api/dao/NigeriaPatientDAO.java
@@ -23,7 +23,7 @@ List<Integer> getPatientsFromStringIds(List<String> patientIds, Date fromDate, D
 	
 	List<Integer> getPatientIdsByEncounterDate(Date fromDate, Date toDate, boolean includeVoided) throws DAOException;
 	
-	List<Integer> getPatientIdsByIdentifiers(List<String> identifiers, Date fromDate, Date toDate) throws DAOException;
+	List<String> getPatientIdsByIdentifiers(List<String> identifiers, Date fromDate, Date toDate) throws DAOException;
 	
 	List<Patient> getPatientsByEncounterDate(int startIndex, int endIndex, Date lastEncounterDate, boolean includeVoided)
 	        throws DAOException;
diff --git a/api/src/main/java/org/openmrs/module/nigeriaemr/api/dao/impl/NigeriaEncounterDAOImpl.java b/api/src/main/java/org/openmrs/module/nigeriaemr/api/dao/impl/NigeriaEncounterDAOImpl.java
@@ -120,4 +120,10 @@ public List<Encounter> getEncountersByEncounterTypeIds(Patient patient, Date fro
 		return criteria.list();
 	}
 	
+	@Override
+	public List<Encounter> getEncountersByEncounterIds(List<Integer> encounterIds) throws DAOException {
+		Criteria criteria = getSession().createCriteria(Encounter.class);
+		criteria.add(Restrictions.in("encounterId", encounterIds));
+		return criteria.list();
+	}
 }
diff --git a/api/src/main/java/org/openmrs/module/nigeriaemr/api/dao/impl/NigeriaObsDAOImpl.java b/api/src/main/java/org/openmrs/module/nigeriaemr/api/dao/impl/NigeriaObsDAOImpl.java
@@ -16,6 +16,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class NigeriaObsDAOImpl extends HibernateObsDAO implements NigeriaObsDAO {
 	
@@ -235,4 +236,104 @@ public List<Concept> getConcepts(List<Integer> conceptIds, boolean includeVoided
 		criteria.add(Restrictions.in("conceptId", conceptIds));
 		return criteria.list();
 	}
+	
+	@Override
+	public List<Integer> getPatientsByObsDate(Date from, Date to, List<String> patientIds, boolean includeVoided)
+	        throws DAOException {
+		
+		String query = getQueryString(from, to, patientIds, includeVoided, "patient", "patient_id", false) + " UNION ALL "
+		        + getQueryString(from, to, patientIds, includeVoided, "person", "person_id", false) + "  UNION ALL "
+		        + getQueryString(from, to, patientIds, includeVoided, "person_address", "person_id", false) + "  UNION ALL "
+		        + getQueryString(from, to, patientIds, includeVoided, "patient_identifier", "patient_id", false)
+		        + "  UNION ALL "
+		        + getQueryString(from, to, patientIds, includeVoided, "patient_program", "patient_id", false)
+		        + "  UNION ALL "
+		        + getQueryString(from, to, patientIds, includeVoided, "person_attribute", "person_id", false)
+		        + "  UNION ALL " + getQueryString(from, to, patientIds, includeVoided, "person_name", "person_id", false)
+		        + "  UNION ALL " + getQueryString(from, to, patientIds, includeVoided, "obs", "person_id", true)
+		        + "  UNION ALL " + getQueryString(from, to, patientIds, includeVoided, "encounter", "patient_id", false)
+		        + "  UNION ALL " + getQueryString(from, to, patientIds, includeVoided, "visit", "patient_id", false);
+		
+		SQLQuery sql = getSession().createSQLQuery(query);
+		if (from != null)
+			sql.setDate("from", from);
+		if (to != null)
+			sql.setDate("to", to);
+		if (patientIds != null && patientIds.size() > 0)
+			sql.setParameterList("patientIds", patientIds);
+		
+		List<Integer> ret = sql.list();
+		
+		return ret.stream().distinct().collect(Collectors.toList());
+	}
+	
+	private String getQueryString(Date from, Date to, List<String> patientIds, boolean includeVoided, String tableName,
+	        String fieldName, boolean noDateChanged) {
+		StringBuilder query = new StringBuilder();
+		if (noDateChanged) {
+			query.append("  SELECT ").append(tableName).append(".").append(fieldName).append(" AS patient_id FROM ")
+			        .append(tableName).append(" WHERE TRUE");
+			if (from != null)
+				query.append(" AND ").append(tableName).append(".date_created >= :from ");
+			if (to != null)
+				query.append(" AND ").append(tableName).append(".date_created <= :to ");
+		} else {
+			query.append("  SELECT ").append(tableName).append(".").append(fieldName).append(" AS patient_id FROM ")
+			        .append(tableName).append(" WHERE TRUE");
+			if (from != null)
+				query.append(" AND (").append(tableName).append(".date_created >= :from OR ").append(tableName)
+				        .append(".date_created >= :from) ");
+			if (to != null)
+				query.append(" AND (").append(tableName).append(".date_changed <= :to OR ").append(tableName)
+				        .append(".date_changed <= :to) ");
+		}
+		if (!includeVoided)
+			query.append(" AND ").append(tableName).append(".voided = FALSE ");
+		if (patientIds != null && patientIds.size() > 0)
+			query.append(" AND ").append(tableName).append(".").append(fieldName).append(" IN (:patientIds)  ");
+		return query.toString();
+	}
+	
+	@Override
+	public List<Integer> getPatientEncounterIdsByDate(Integer id, Date fromDate, Date toDate) throws DAOException {
+		String query = "SELECT encounter_id FROM obs WHERE voided = false ";
+		if (id != null)
+			query += " AND person_id = :person_id";
+		if (fromDate != null)
+			query += " AND date_created >= :fromDate";
+		if (toDate != null)
+			query += " AND date_created <= :toDate";
+		
+		query += " UNION ALL ";
+		
+		query += "SELECT encounter_id FROM encounter WHERE voided = false ";
+		if (id != null)
+			query += " AND patient_id = :person_id";
+		if (fromDate != null)
+			query += " AND (date_created >= :fromDate or date_changed >= :fromDate)";
+		if (toDate != null)
+			query += " AND (date_created <= :toDate or date_changed >= :toDate)";
+		
+		query += " UNION ALL ";
+		
+		query += "SELECT encounter.encounter_id from encounter, visit WHERE visit.visit_id = encounter.visit_id  AND visit.voided = FALSE AND encounter.voided = FALSE ";
+		if (id != null)
+			query += " AND encounter.patient_id = :person_id";
+		if (fromDate != null)
+			query += " AND (visit.date_created >= :fromDate OR visit.date_changed >= :fromDate)";
+		if (toDate != null)
+			query += " AND (visit.date_created <= :toDate OR visit.date_changed >= :toDate)";
+		
+		SQLQuery sql = getSession().createSQLQuery(query);
+		if (fromDate != null)
+			sql.setDate("fromDate", fromDate);
+		if (toDate != null)
+			sql.setDate("toDate", toDate);
+		if (id != null)
+			sql.setInteger("person_id", id);
+		
+		List<Integer> ret = sql.list();
+		
+		return ret.stream().distinct().collect(Collectors.toList());
+	}
 }
diff --git a/api/src/main/java/org/openmrs/module/nigeriaemr/api/dao/impl/NigeriaPatientDAOImpl.java b/api/src/main/java/org/openmrs/module/nigeriaemr/api/dao/impl/NigeriaPatientDAOImpl.java
@@ -134,8 +134,7 @@ public List<Integer> getPatientIdsByEncounterDate(Date fromDate, Date toDate, bo
 	}
 	
 	@Override
-	public List<Integer> getPatientIdsByIdentifiers(List<String> identifiers, Date fromDate, Date toDate)
-	        throws DAOException {
+	public List<String> getPatientIdsByIdentifiers(List<String> identifiers, Date fromDate, Date toDate) throws DAOException {
 		String query = "SELECT patient_identifier.patient_id FROM patient_identifier ";
 		if (fromDate != null || toDate != null)
 			query += " LEFT JOIN patient ON patient.patient_id = patient_identifier.patient_id";
diff --git a/api/src/main/java/org/openmrs/module/nigeriaemr/api/service/NigeriaEncounterService.java b/api/src/main/java/org/openmrs/module/nigeriaemr/api/service/NigeriaEncounterService.java
@@ -27,4 +27,7 @@ List<Encounter> getEncountersByEncounterTypeIds(Patient patient, Date fromDate,
 	@Authorized(NigeriaemrConfig.MODULE_PRIVILEGE)
 	Encounter getLastEncounterByEncounterTypeIds(Patient patient, Date fromDate, Date toDate, List<Integer> encounterTypeIds)
 	        throws APIException;
+	
+	@Authorized(NigeriaemrConfig.MODULE_PRIVILEGE)
+	List<Encounter> getEncountersByEncounterIds(List<Integer> encounterIds) throws APIException;
 }
diff --git a/api/src/main/java/org/openmrs/module/nigeriaemr/api/service/NigeriaObsService.java b/api/src/main/java/org/openmrs/module/nigeriaemr/api/service/NigeriaObsService.java
@@ -26,32 +26,38 @@ List<Obs> getObsByEncounterTypes(List<Integer> ObsIds, List<Integer> encounterTy
 	        throws APIException;
 	
 	@Authorized(NigeriaemrConfig.MODULE_PRIVILEGE)
-	public Obs getLastObsByConceptId(Person person, Concept concept, Date from, Date to, boolean includeVoided)
-	        throws APIException;
+	Obs getLastObsByConceptId(Person person, Concept concept, Date from, Date to, boolean includeVoided) throws APIException;
 	
 	@Authorized(NigeriaemrConfig.MODULE_PRIVILEGE)
-	public Obs getFirstObsByConceptId(Person person, Concept concept, Date from, Date to, boolean includeVoided)
+	Obs getFirstObsByConceptId(Person person, Concept concept, Date from, Date to, boolean includeVoided)
 	        throws APIException;
 	
 	@Authorized(NigeriaemrConfig.MODULE_PRIVILEGE)
-	public Obs getHighestObsByConcept(Person person, Concept concept, Date from, Date to, boolean includeVoided)
+	Obs getHighestObsByConcept(Person person, Concept concept, Date from, Date to, boolean includeVoided)
 	        throws APIException;
 	
 	@Authorized(NigeriaemrConfig.MODULE_PRIVILEGE)
-	public Obs getObsbyValueCoded(Concept concept, Concept valueCoded, List<Integer> obsList) throws APIException;
+	Obs getObsbyValueCoded(Concept concept, Concept valueCoded, List<Integer> obsList) throws APIException;
+	
+	@Authorized(NigeriaemrConfig.MODULE_PRIVILEGE)
+	Obs getLastObsByConcept(Concept concept, List<Integer> obsList) throws APIException;
 	
 	@Authorized(NigeriaemrConfig.MODULE_PRIVILEGE)
-	public Obs getLastObsByConcept(Concept concept, List<Integer> obsList) throws APIException;
+	List<Obs> getObsByConcept(Concept concept, List<Integer> obsList) throws APIException;
 	
 	@Authorized(NigeriaemrConfig.MODULE_PRIVILEGE)
-	public List<Obs> getObsByConcept(Concept concept, List<Integer> obsList) throws APIException;
+	List<Obs> getObsByConcept(List<Concept> concept, List<Integer> obsList) throws APIException;
 	
 	@Authorized(NigeriaemrConfig.MODULE_PRIVILEGE)
-	public List<Obs> getObsByConcept(List<Concept> concept, List<Integer> obsList) throws APIException;
+	List<Obs> getObsByVisitDate(Date visitDate, List<Integer> obsIds, boolean includeVoided) throws APIException;
 	
 	@Authorized(NigeriaemrConfig.MODULE_PRIVILEGE)
-	public List<Obs> getObsByVisitDate(Date visitDate, List<Integer> obsIds, boolean includeVoided) throws APIException;
+	List<Concept> getConcepts(List<Integer> conceptIds, boolean includeVoided) throws APIException;
+	
+	@Authorized(NigeriaemrConfig.MODULE_PRIVILEGE)
+	List<Integer> getPatientsByObsDate(Date from, Date to, List<String> patientIds, boolean includeVoided)
+	        throws APIException;
 	
 	@Authorized(NigeriaemrConfig.MODULE_PRIVILEGE)
-	public List<Concept> getConcepts(List<Integer> conceptIds, boolean includeVoided) throws APIException;
+	List<Integer> getPatientEncounterIdsByDate(Integer id, Date fromDate, Date toDate) throws APIException;
 }
diff --git a/api/src/main/java/org/openmrs/module/nigeriaemr/api/service/NigeriaPatientService.java b/api/src/main/java/org/openmrs/module/nigeriaemr/api/service/NigeriaPatientService.java
@@ -37,6 +37,6 @@ public interface NigeriaPatientService extends PatientService {
 	String getPatientIdentifier(Patient patient, PatientIdentifierType patientIdentifierType) throws APIException;
 	
 	@Authorized(NigeriaemrConfig.MODULE_PRIVILEGE)
-	List<Integer> getPatientIdsByIdentifiers(List<String> identifiers, Date fromDate, Date toDate) throws APIException;
+	List<String> getPatientIdsByIdentifiers(List<String> identifiers, Date fromDate, Date toDate) throws APIException;
 	
 }
diff --git a/api/src/main/java/org/openmrs/module/nigeriaemr/api/service/impl/NigeriaEncounterServiceImpl.java b/api/src/main/java/org/openmrs/module/nigeriaemr/api/service/impl/NigeriaEncounterServiceImpl.java
@@ -73,4 +73,9 @@ public Encounter getLastEncounterByEncounterTypeIds(Patient patient, Date fromDa
 		}
 		return encounters == null || encounters.size() == 0 ? null : encounters.get(0);
 	}
+	
+	@Override
+	public List<Encounter> getEncountersByEncounterIds(List<Integer> encounterIds) throws APIException {
+		return dao.getEncountersByEncounterIds(encounterIds);
+	}
 }
diff --git a/api/src/main/java/org/openmrs/module/nigeriaemr/api/service/impl/NigeriaObsServiceImpl.java b/api/src/main/java/org/openmrs/module/nigeriaemr/api/service/impl/NigeriaObsServiceImpl.java
@@ -144,4 +144,14 @@ public List<Concept> getConcepts(List<Integer> conceptIds, boolean includeVoided
 		return dao.getConcepts(conceptIds, includeVoided);
 	}
 	
+	@Override
+	public List<Integer> getPatientsByObsDate(Date from, Date to, List<String> patientIds, boolean includeVoided)
+	        throws APIException {
+		return dao.getPatientsByObsDate(from, to, patientIds, includeVoided);
+	}
+	
+	@Override
+	public List<Integer> getPatientEncounterIdsByDate(Integer id, Date fromDate, Date toDate) throws APIException {
+		return dao.getPatientEncounterIdsByDate(id, fromDate, toDate);
+	}
 }
diff --git a/api/src/main/java/org/openmrs/module/nigeriaemr/api/service/impl/NigeriaPatientServiceImpl.java b/api/src/main/java/org/openmrs/module/nigeriaemr/api/service/impl/NigeriaPatientServiceImpl.java
@@ -57,8 +57,7 @@ public List<Integer> getPatientIdsByEncounterDate(Date fromDate, Date toDate) th
 	}
 	
 	@Override
-	public List<Integer> getPatientIdsByIdentifiers(List<String> identifiers, Date fromDate, Date toDate)
-	        throws APIException {
+	public List<String> getPatientIdsByIdentifiers(List<String> identifiers, Date fromDate, Date toDate) throws APIException {
 		return dao.getPatientIdsByIdentifiers(identifiers, fromDate, toDate);
 	}
 	
diff --git a/api/src/main/resources/liquibase.xml b/api/src/main/resources/liquibase.xml
@@ -215,5 +215,11 @@
             INSERT INTO patientflags_flag_tag (`flag_id`,`tag_id`) VALUES (@var_name,1);
         </sql>
     </changeSet>
+    
+    <changeSet id="obs_index_2020_10_111057" author="wande">
+        <createIndex  tableName="obs" indexName="index_obs_date_created">
+            <column name="date_created"/>
+        </createIndex>
+    </changeSet>
  
 </databaseChangeLog>
diff --git a/omod/pom.xml b/omod/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.openmrs.module</groupId>
         <artifactId>nigeriaemr</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>nigeriaemr-omod</artifactId>
diff --git a/omod/src/main/java/org/openmrs/module/nigeriaemr/fragment/controller/NdrFragmentController.java b/omod/src/main/java/org/openmrs/module/nigeriaemr/fragment/controller/NdrFragmentController.java
@@ -5,6 +5,7 @@
 import org.openmrs.api.context.Context;
 import org.openmrs.api.context.UserContext;
 import org.openmrs.module.nigeriaemr.Consumer;
+import org.openmrs.module.nigeriaemr.api.service.NigeriaObsService;
 import org.openmrs.module.nigeriaemr.api.service.NigeriaPatientService;
 import org.openmrs.module.nigeriaemr.api.service.NigeriaemrService;
 import org.openmrs.module.nigeriaemr.model.NDRExport;
@@ -30,6 +31,8 @@ public class NdrFragmentController {
 	
 	NigeriaPatientService nigeriaPatientService = Context.getService(NigeriaPatientService.class);
 	
+	NigeriaObsService nigeriaObsService = Context.getService(NigeriaObsService.class);
+	
 	NigeriaemrService nigeriaemrService = Context.getService(NigeriaemrService.class);
 	
 	DBConnection openmrsConn;
@@ -93,17 +96,15 @@ public String generateCustomNDRFile(HttpServletRequest request,
 			if (identifiers != null && !identifiers.isEmpty()) {
 				String[] ary = identifiers.split(",");
 				if (ary.length > 0) {
-					List<Integer> newPatients = new ArrayList<>();
 					List<String> identifierList = Arrays.asList(ary);
-					List<Integer> patientIds = nigeriaPatientService.getPatientsFromStringIds(identifierList, lastDate, currentDate);
-					if(patientIds != null && patientIds.size()>0) newPatients.addAll(patientIds);
-					List<Integer> patientIdsFromIdentifiers = nigeriaPatientService.getPatientIdsByIdentifiers(identifierList, lastDate, currentDate);
-					if(patientIdsFromIdentifiers != null && patientIdsFromIdentifiers.size()>0) newPatients.addAll(patientIdsFromIdentifiers);
-					Set<Integer> set = new HashSet<>(newPatients);
+					List<String> patientIdsFromIdentifiers = nigeriaPatientService.getPatientIdsByIdentifiers(identifierList, lastDate, currentDate);
+					identifierList.addAll(patientIdsFromIdentifiers);
+					List<Integer> patientIds = ndrExtractionService.getPatientIds(lastDate,currentDate,identifierList,true);
+					Set<Integer> set = new HashSet<>(patientIds);
 					patients = new ArrayList<>(set);
 				}
 			} else {
-				List<Integer> patientIds = nigeriaPatientService.getPatientIdsByEncounterDate(lastDate, currentDate);
+				List<Integer> patientIds = ndrExtractionService.getPatientIds(lastDate,currentDate,null,true);
 				if(patientIds != null && patientIds.size()>0) patients.addAll(patientIds);
 			}
 
@@ -124,19 +125,15 @@ public String generateCustomNDRFile(HttpServletRequest request,
 	public String generateNDRFile(HttpServletRequest request) throws Exception {
 		// get date that's bounds to the date the export is kicked off
 		Date currentDate = new Date();
-		
 		DBConnection openmrsConn = Utils.getNmrsConnectionDetails();
-		
 		//check if global variable for logging exists
 		LoggerUtils.checkLoggerGlobalProperty(openmrsConn);
 		LoggerUtils.clearLogFile();
 		LoggerUtils.checkPatientLimitGlobalProperty(openmrsConn);
-		List<Integer> patients;
 		Date lastDate = Utils.getLastNDRDate();
-		patients = nigeriaPatientService.getPatientIdsByEncounterDate(lastDate, currentDate);
+		List<Integer> patients = ndrExtractionService.getPatientIds(lastDate, currentDate, null, true);
 		String DATIMID = Utils.getFacilityDATIMId();
 		return startGenerateFile(request, patients, DATIMID, lastDate, currentDate, true);
-		
 	}
 	
 	private String startGenerateFile(HttpServletRequest request, List<Integer> filteredPatients,
diff --git a/omod/src/main/java/org/openmrs/module/nigeriaemr/ndrfactory/NDRConverter.java b/omod/src/main/java/org/openmrs/module/nigeriaemr/ndrfactory/NDRConverter.java
diff --git a/omod/src/main/java/org/openmrs/module/nigeriaemr/ndrfactory/NDRExtractor.java b/omod/src/main/java/org/openmrs/module/nigeriaemr/ndrfactory/NDRExtractor.java
diff --git a/omod/src/main/java/org/openmrs/module/nigeriaemr/service/NdrExtractionService.java b/omod/src/main/java/org/openmrs/module/nigeriaemr/service/NdrExtractionService.java
diff --git a/pom.xml b/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,6 @@ public interface NigeriaEncounterDAO extends EncounterDAO {`
`18`	`18`
`19`	`19`	`List<Encounter> getEncountersByEncounterTypeIds(Patient patient, Date fromDate, Date toDate,`
`20`	`20`	`List<Integer> encounterTypeIds, boolean asc, int size) throws DAOException;`
	`21`	`+`
	`22`	`+ List<Encounter> getEncountersByEncounterIds(List<Integer> encounterIds) throws DAOException;`
`21`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,4 +34,9 @@ Obs getHighestObsByConcept(Person person, Concept concept, Date from, Date to, b`
`34`	`34`	`List<Obs> getObsByConcept(List<Concept> concept, List<Integer> obsList) throws DAOException;`
`35`	`35`
`36`	`36`	`List<Concept> getConcepts(List<Integer> conceptIds, boolean includeVoided) throws DAOException;`
	`37`	`+`
	`38`	`+ List<Integer> getPatientsByObsDate(Date from, Date to, List<String> patientIds, boolean includeVoided)`
	`39`	`+ throws DAOException;`
	`40`	`+`
	`41`	`+ List<Integer> getPatientEncounterIdsByDate(Integer id, Date fromDate, Date toDate) throws DAOException;`
`37`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,4 +120,10 @@ public List<Encounter> getEncountersByEncounterTypeIds(Patient patient, Date fro`
`120`	`120`	`return criteria.list();`
`121`	`121`	`}`
`122`	`122`
	`123`	`+ @Override`
	`124`	`+ public List<Encounter> getEncountersByEncounterIds(List<Integer> encounterIds) throws DAOException {`
	`125`	`+ Criteria criteria = getSession().createCriteria(Encounter.class);`
	`126`	`+ criteria.add(Restrictions.in("encounterId", encounterIds));`
	`127`	`+ return criteria.list();`
	`128`	`+ }`
`123`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,8 +134,7 @@ public List<Integer> getPatientIdsByEncounterDate(Date fromDate, Date toDate, bo`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`@Override`
`137`		`- public List<Integer> getPatientIdsByIdentifiers(List<String> identifiers, Date fromDate, Date toDate)`
`138`		`- throws DAOException {`
	`137`	`+ public List<String> getPatientIdsByIdentifiers(List<String> identifiers, Date fromDate, Date toDate) throws DAOException {`
`139`	`138`	`String query = "SELECT patient_identifier.patient_id FROM patient_identifier ";`
`140`	`139`	`if (fromDate != null \|\| toDate != null)`
`141`	`140`	`query += " LEFT JOIN patient ON patient.patient_id = patient_identifier.patient_id";`
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,7 @@ List<Encounter> getEncountersByEncounterTypeIds(Patient patient, Date fromDate,`
`27`	`27`	`@Authorized(NigeriaemrConfig.MODULE_PRIVILEGE)`
`28`	`28`	`Encounter getLastEncounterByEncounterTypeIds(Patient patient, Date fromDate, Date toDate, List<Integer> encounterTypeIds)`
`29`	`29`	`throws APIException;`
	`30`	`+`
	`31`	`+ @Authorized(NigeriaemrConfig.MODULE_PRIVILEGE)`
	`32`	`+ List<Encounter> getEncountersByEncounterIds(List<Integer> encounterIds) throws APIException;`
`30`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,6 @@ public interface NigeriaPatientService extends PatientService {`
`37`	`37`	`String getPatientIdentifier(Patient patient, PatientIdentifierType patientIdentifierType) throws APIException;`
`38`	`38`
`39`	`39`	`@Authorized(NigeriaemrConfig.MODULE_PRIVILEGE)`
`40`		`- List<Integer> getPatientIdsByIdentifiers(List<String> identifiers, Date fromDate, Date toDate) throws APIException;`
	`40`	`+ List<String> getPatientIdsByIdentifiers(List<String> identifiers, Date fromDate, Date toDate) throws APIException;`
`41`	`41`
`42`	`42`	`}`