Fix merge conflicts.
This commit is contained in:
parent
78b7f091ec
commit
549993886d
|
@ -55,14 +55,6 @@ public class LastNElasticsearchSvcMultipleObservationsIT {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@After
|
|
||||||
public void after() throws IOException {
|
|
||||||
elasticsearchSvc.deleteAllDocumentsForTest(ElasticsearchSvcImpl.OBSERVATION_INDEX);
|
|
||||||
elasticsearchSvc.deleteAllDocumentsForTest(ElasticsearchSvcImpl.OBSERVATION_CODE_INDEX);
|
|
||||||
elasticsearchSvc.refreshIndex(ElasticsearchSvcImpl.OBSERVATION_INDEX);
|
|
||||||
elasticsearchSvc.refreshIndex(ElasticsearchSvcImpl.OBSERVATION_CODE_INDEX);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testLastNAllPatientsQuery() {
|
public void testLastNAllPatientsQuery() {
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue