diff --git a/src/test/java/org/openmrs/performance/http/DoctorHttpService.java b/src/test/java/org/openmrs/performance/http/DoctorHttpService.java index ebac22c..b1d1664 100644 --- a/src/test/java/org/openmrs/performance/http/DoctorHttpService.java +++ b/src/test/java/org/openmrs/performance/http/DoctorHttpService.java @@ -56,12 +56,18 @@ public HttpRequestActionBuilder getVisitTypes() { } public HttpRequestActionBuilder getVisitsOfPatient(String patientUuid) { - String customRepresentation = "custom:(uuid,display,voided,indication,startDatetime,stopDatetime," - + "encounters:(uuid,display,encounterDatetime,form:(uuid,name),location:ref,encounterType:ref,encounterProviders:(uuid,display,provider:(uuid,display)))," - + "patient:(uuid,display)," + "visitType:(uuid,name,display)," - + "attributes:(uuid,display,attributeType:(name,datatypeClassname,uuid),value)," - + "location:(uuid,name,display))"; - +// String customRepresentation = "custom:(uuid,display,voided,indication,startDatetime,stopDatetime," +// + "encounters:(uuid,display,encounterDatetime,form:(uuid,name),location:ref,encounterType:ref,encounterProviders:(uuid,display,provider:(uuid,display)))," +// + "patient:(uuid,display)," + "visitType:(uuid,name,display)," +// + "attributes:(uuid,display,attributeType:(name,datatypeClassname,uuid),value)," +// + "location:(uuid,name,display))"; + String customRepresentation = "custom:(uuid,location,encounters:(uuid,diagnoses:(uuid,display,rank,diagnosis,voided)," + + "form:(uuid,display),encounterDatetime,orders:full,obs:(uuid,concept:(uuid,display,conceptClass:(uuid,display))," + + "display,groupMembers:(uuid,concept:(uuid,display),value:(uuid,display),display),value,obsDatetime)," + + "encounterType:(uuid,display,viewPrivilege,editPrivilege),encounterProviders:(uuid,display,encounterRole:(uuid,display)," + + "provider:(uuid,person:(uuid,display)))),visitType:(uuid,name,display),startDatetime,stopDatetime,patient," + + "attributes:(attributeType:ref,display,uuid,value)"; + return http("Get Visits of Patient") .get("/openmrs/ws/rest/v1/visit?patient=" + patientUuid + "&v=" + customRepresentation); } diff --git a/src/test/java/org/openmrs/performance/registries/DoctorRegistry.java b/src/test/java/org/openmrs/performance/registries/DoctorRegistry.java index 0f0ff22..a5f2741 100644 --- a/src/test/java/org/openmrs/performance/registries/DoctorRegistry.java +++ b/src/test/java/org/openmrs/performance/registries/DoctorRegistry.java @@ -145,7 +145,9 @@ public ChainBuilder addAttachment(String patientUuid){ } public ChainBuilder openVisitsTab(String patientUuid) { - return exec(httpService.getVisitsOfPatient(patientUuid)); + return exec(httpService.getVisitsOfPatient(patientUuid)) + .exec(httpService.getActiveOrders(patientUuid)) + .exec(httpService.getLabResults(patientUuid)); } public ChainBuilder openAppointmentsTab(String patientUuid) {