Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ public Object invoke(MethodInvocation methodInvocation) throws Throwable {
String labFormName = administrationService.getGlobalProperty(LabIntegrationConfig.GP_LABORATORY_FORM_NAME,
LAB_FORM_NAME);
CareSetting careSetting = orderService.getCareSetting(2);
ObsSelector obsSelector = new ObsSelector();
if (args[0] instanceof Encounter) {
Encounter encounter = (Encounter) args[0];
log.debug("captured encounter " + encounter.getUuid());
Expand All @@ -72,12 +71,11 @@ public Object invoke(MethodInvocation methodInvocation) throws Throwable {
if (destinationObs.get().getValueText().equals(OPENELIS_DESTINATION)) {
Set<Concept> testConcepts = new HashSet<>();
encounter.getObs().forEach(obs -> {
if (obsSelector.isValidTestType(obs)) {
if (obs.getValueCoded() != null) {
if (obs.getValueCoded().getConceptClass().getName().equals(TEST_CLASS)) {
testConcepts.add(obs.getValueCoded());
}
}

});
Set<Order> orders = testConcepts.stream().map(testConcept -> {
TestOrder order = new TestOrder();
Expand Down