Skip to content

Commit

Permalink
make searching work well
Browse files Browse the repository at this point in the history
  • Loading branch information
@mherman22
mherman22 committed Aug 16, 2024
1 parent c12c445 commit c768eda
Showing 1 changed file with 61 additions and 49 deletions.
110 changes: 61 additions & 49 deletions src/main/java/org/openelisglobal/common/rest/provider/PatientSearchRestController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@
import ca.uhn.fhir.rest.client.api.IGenericClient;
import ca.uhn.fhir.rest.gclient.IOperationUntypedWithInputAndPartialOutput;
import ca.uhn.fhir.rest.gclient.StringClientParam;
import ca.uhn.fhir.rest.param.StringParam;
import ca.uhn.fhir.rest.param.TokenParam;
import java.lang.reflect.InvocationTargetException;
import java.math.BigDecimal;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.UUID;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
Expand Down Expand Up @@ -39,6 +37,8 @@
import org.openelisglobal.sample.valueholder.Sample;
import org.openelisglobal.samplehuman.service.SampleHumanService;
import org.openelisglobal.search.service.SearchResultsService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
Expand Down Expand Up @@ -68,6 +68,8 @@ public class PatientSearchRestController extends BaseRestController {
@Autowired
SearchResultsService searchResultsService;

private static final Logger log = LoggerFactory.getLogger(PatientSearchRestController.class);

@GetMapping(value = "patient-search-results", produces = MediaType.APPLICATION_JSON_VALUE)
@ResponseBody
public PatientSearchResultsForm getPatientResults(HttpServletRequest request,
Expand All @@ -82,10 +84,10 @@ public PatientSearchResultsForm getPatientResults(HttpServletRequest request,
PatientSearchResultsForm form = new PatientSearchResultsForm();

String requestedPage = request.getParameter("page");
Patient patient = getPatientForLabNumber(labNumber);
if (GenericValidator.isBlankOrNull(requestedPage)) {
List<PatientSearchResults> results = new ArrayList<>();
if (!GenericValidator.isBlankOrNull(labNumber)) {
Patient patient = getPatientForLabNumber(labNumber);
if (patient == null || GenericValidator.isBlankOrNull(patient.getId())) {
form.setPatientSearchResults(results);
return form;
Expand All @@ -103,48 +105,13 @@ public PatientSearchResultsForm getPatientResults(HttpServletRequest request,
form.setPatientSearchResults(results);
return form;
}
}

if (request.getParameter("crResult").contains("true")) {
if (isClientRegistryConfigInvalid()) {
return null;
}

IGenericClient clientRegistry = fhirUtil.getFhirClient(fhirConfig.getClientRegistryServerUrl(),
fhirConfig.getClientRegistryUserName(), fhirConfig.getClientRegistryPassword());

List<String> targetSystems = new ArrayList<>();
IOperationUntypedWithInputAndPartialOutput<Parameters> identifiersRequest = clientRegistry
.operation().onType("Patient").named("$ihe-pix")
.withSearchParameter(Parameters.class, "sourceIdentifier",
new TokenParam("http://openelis-global.org/pat_uuid",
patient.getFhirUuidAsString()))
.andSearchParameter("targetSystem", new StringParam(String.join(",", targetSystems)));

Parameters crMatchingParams = identifiersRequest.useHttpGet().execute();
List<String> crIdentifiers = crMatchingParams.getParameter().stream()
.filter(param -> Objects.equals(param.getName(), "targetId"))
.map(param -> param.getValue().toString()).collect(Collectors.toList());

if (crIdentifiers.isEmpty()) {
return null;
}

Bundle patientBundle = clientRegistry.search().forResource(org.hl7.fhir.r4.model.Patient.class)
.where(new StringClientParam(org.hl7.fhir.r4.model.Patient.SP_RES_ID).matches()
.values(crIdentifiers))
.returnBundle(Bundle.class).execute();

List<org.hl7.fhir.r4.model.Patient> externalPatients = parseCRPatientSearchResults(patientBundle);

for (org.hl7.fhir.r4.model.Patient externalPatient : externalPatients) {
Patient openElisPatient = transformFhirPatientObjectToOpenElisPatientObject(patient,
externalPatient);
PatientSearchResults searchResult = getSearchResultsForPatient(openElisPatient, null);
searchResult.setDataSourceName(MessageUtil.getMessage("patient.cr.source"));
results.add(searchResult);
}
}
if (request.getParameter("crResult") != null && request.getParameter("crResult").contains("true")) {
List<PatientSearchResults> fhirResults = searchPatientInClientRegistry(nationalID);
results.addAll(fhirResults);
}

paging.setDatabaseResults(request, form, results);
} else {
int requestedPageNumber = Integer.parseInt(requestedPage);
Expand All @@ -153,12 +120,6 @@ public PatientSearchResultsForm getPatientResults(HttpServletRequest request,
return form;
}

private boolean isClientRegistryConfigInvalid() {
return GenericValidator.isBlankOrNull(fhirConfig.getClientRegistryServerUrl())
|| GenericValidator.isBlankOrNull(fhirConfig.getClientRegistryUserName())
|| GenericValidator.isBlankOrNull(fhirConfig.getClientRegistryPassword());
}

private Patient getPatientForLabNumber(String labNumber) {

Sample sample = sampleService.getSampleByAccessionNumber(labNumber);
Expand Down Expand Up @@ -274,4 +235,55 @@ public Patient transformFhirPatientObjectToOpenElisPatientObject(Patient openELI
return openELISPatient;
}

private List<PatientSearchResults> searchPatientInClientRegistry(String nationalID) {
if (isClientRegistryConfigInvalid()) {
return new ArrayList<>();
}

IGenericClient clientRegistry = fhirUtil.getFhirClient(fhirConfig.getClientRegistryServerUrl(),
fhirConfig.getClientRegistryUserName(), fhirConfig.getClientRegistryPassword());

Patient patient = patientService.getPatientByNationalId(nationalID);
log.info("patient identifier: " + patient.getFhirUuidAsString());
log.info("patient firstname: " + patient.getEpiFirstName());
log.info("patient lastname: " + patient.getEpiLastName());
IOperationUntypedWithInputAndPartialOutput<Parameters> identifiersRequest = clientRegistry.operation()
.onType("Patient").named("$ihe-pix").withSearchParameter(Parameters.class, "sourceIdentifier",
new TokenParam("http://openelis-global.org/pat_uuid", patient.getFhirUuidAsString()));

Parameters crMatchingParams = identifiersRequest.useHttpGet().execute();
List<String> crIdentifiers = crMatchingParams.getParameter().stream()
.filter(param -> param.getValue() instanceof Reference).map(param -> param.getValue().toString())
.collect(Collectors.toList());

if (crIdentifiers.isEmpty()) {
return new ArrayList<>();
}

Bundle patientBundle = clientRegistry.search().forResource(org.hl7.fhir.r4.model.Patient.class)
.where(new StringClientParam(org.hl7.fhir.r4.model.Patient.SP_RES_ID).matches().values(crIdentifiers))
.returnBundle(Bundle.class).execute();
log.info("fhir patient bundle: " + patientBundle);

List<org.hl7.fhir.r4.model.Patient> externalPatients = parseCRPatientSearchResults(patientBundle);
log.info("external Patients: " + externalPatients);
List<PatientSearchResults> results = new ArrayList<>();

for (org.hl7.fhir.r4.model.Patient externalPatient : externalPatients) {
Patient openElisPatient = transformFhirPatientObjectToOpenElisPatientObject(patient, externalPatient);
PatientSearchResults searchResult = getSearchResultsForPatient(openElisPatient, null);
searchResult.setDataSourceName(MessageUtil.getMessage("patient.cr.source"));
log.info("searchResult: " + searchResult);
results.add(searchResult);
}

return results;
}

private boolean isClientRegistryConfigInvalid() {
return GenericValidator.isBlankOrNull(fhirConfig.getClientRegistryServerUrl())
|| GenericValidator.isBlankOrNull(fhirConfig.getClientRegistryUserName())
|| GenericValidator.isBlankOrNull(fhirConfig.getClientRegistryPassword());
}

}

0 comments on commit c768eda

Please sign in to comment.