rename interface method and start on correct parsing of operation res…

…ponse
openmrs · Mar 19, 2024 · ffec8b6 · ffec8b6
1 parent f0bf239
commit ffec8b6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/api/src/main/java/org/openmrs/module/clientregistry/api/CRPatientService.java b/api/src/main/java/org/openmrs/module/clientregistry/api/CRPatientService.java
@@ -1,14 +1,13 @@
 package org.openmrs.module.clientregistry.api;
 
-import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
 import org.hl7.fhir.r4.model.Patient;
 import org.openmrs.module.fhir2.api.search.param.PatientSearchParams;
 
 import java.util.List;
 
 public interface CRPatientService {
 
-	List<Patient> getCRPatient(String sourceIdentifier, String sourceIdentifierSystem, List<String> extraTargetSystems);
+	List<Patient> getCRPatients(String sourceIdentifier, String sourceIdentifierSystem, List<String> extraTargetSystems);
 
 	List<Patient> searchCRForPatients(PatientSearchParams patientSearchParams);
 }
diff --git a/api/src/main/java/org/openmrs/module/clientregistry/api/impl/FhirCRPatientServiceImpl.java b/api/src/main/java/org/openmrs/module/clientregistry/api/impl/FhirCRPatientServiceImpl.java
@@ -4,6 +4,7 @@
 import ca.uhn.fhir.rest.gclient.IQuery;
 import org.hl7.fhir.instance.model.api.IBaseBundle;
 import org.hl7.fhir.r4.model.Bundle;
+import org.hl7.fhir.r4.model.Parameters;
 import org.hl7.fhir.r4.model.Patient;
 import org.openmrs.module.clientregistry.ClientRegistryConfig;
 import org.openmrs.module.clientregistry.api.CRPatientService;
@@ -30,7 +31,16 @@ public class FhirCRPatientServiceImpl implements CRPatientService {
 	 * that match the given source identifier/system and target systems.
 	 */
 	@Override
-	public List<Patient> getCRPatient(String sourceIdentifier, String sourceIdentifierSystem, List<String> targetSystems) {
+	public List<Patient> getCRPatients(String sourceIdentifier, String sourceIdentifierSystem, List<String> targetSystems) {
+
+
+		Parameters betterCrRequest = fhirClient
+				.operation()
+				.onInstance(String.format("%s|%s", sourceIdentifierSystem, sourceIdentifier))
+				.named(FhirCRConstants.IHE_PIX_OPERATION)
+				.withNoParameters(Parameters.class)
+				.execute();
+
 		// construct and send request to external client registry
 		IQuery<IBaseBundle> crRequest = fhirClient
 		        .search()
@@ -39,7 +49,7 @@ public List<Patient> getCRPatient(String sourceIdentifier, String sourceIdentifi
 		        .where(
 		            FhirCRConstants.SOURCE_IDENTIFIER_PARAM.exactly().systemAndIdentifier(sourceIdentifierSystem,
 		                sourceIdentifier));
-		
+
 		if (!targetSystems.isEmpty()) {
 			crRequest.and(FhirCRConstants.TARGET_SYSTEM_PARAM.matches().values(targetSystems));
 		}

diff --git a/...in/java/org/openmrs/module/clientregistry/providers/r4/FhirCRPatientResourceProvider.java b/...in/java/org/openmrs/module/clientregistry/providers/r4/FhirCRPatientResourceProvider.java
@@ -47,7 +47,7 @@ public Class<? extends IBaseResource> getResourceType() {
 	/**
 	 * FHIR endpoint to get Patient references from external client registry Example request: GET
 	 * [fhirbase
-	 * ]/Patient/$ihe-pix?sourceIdentifier=1234{|sourceSystem}[&targetSystem=system1,system2]
+	 * ]/Patient/$ihe-pix?sourceIdentifier={sourceSystem|}1234[&targetSystem=system1,system2]
 	 * 
 	 * @param sourceIdentifierParam patient identifier token. If source system is included in token,
 	 *            we will use it to override the module defined source system.
@@ -81,7 +81,7 @@ public List<Patient> getCRPatientById(
 					"the sourceIdentifier request param");
 		}
 
-		List<Patient> patients = clientRegistryManager.getPatientService().getCRPatient(
+		List<Patient> patients = clientRegistryManager.getPatientService().getCRPatients(
 				sourceIdentifierParam.getValue(), sourceIdentifierSystem, targetSystems
 		);