Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

This is a Draft PR raise to rectify a small inconsistency in the openVisitsTab action #86

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
+15 −7
Draft

This is a Draft PR raise to rectify a small inconsistency in the openVisitsTab action #86

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f315d5c
Draft PR changes
UNCANNY69 Mar 17, 2025
1a69c53
Merge remote-tracking branch 'origin/main'
UNCANNY69 Mar 17, 2025
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
Next Next commit
Draft PR changes
  • Loading branch information
@UNCANNY69
UNCANNY69 committed Mar 17, 2025
commit f315d5c283d80ed7913d82b6ad2c4dc9742d424b
18 changes: 12 additions & 6 deletions src/test/java/org/openmrs/performance/http/DoctorHttpService.java
View file
Original file line number Diff line number Diff line change
@@ -42,12 +42,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);
}
4 changes: 3 additions & 1 deletion src/test/java/org/openmrs/performance/registries/DoctorRegistry.java
View file
Original file line number Diff line number Diff line change
@@ -132,7 +132,9 @@ public ChainBuilder openAttachmentsTab(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 addDrugOrder(String patientUuid, String visitUuid, String currentUserUuid) {