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

Jump to bottom

BAH-3606 | Add. panelName property in Orders in tabularResult #254

Merged
merged 1 commit into from
Feb 29, 2024
Merged

BAH-3606 | Add. panelName property in Orders in tabularResult #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...-api/src/main/java/org/openmrs/module/bahmniemrapi/laborder/contract/LabOrderResults.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ private TabularLabOrderResults tabulate() {
dateMap.put(orderDate, new TabularLabOrderResults.DateLabel(dateLabelIndexCounter++, orderDate.toString("dd-MMM-yyyy")));
}
if(orderMap.get(result.getTestName()) == null) {
orderMap.put(result.getTestName(), new TabularLabOrderResults.TestOrderLabel(testOrderLabelCounter++, result.getTestName(), result.getMinNormal(), result.getMaxNormal(), result.getTestUnitOfMeasurement()));
orderMap.put(result.getTestName(), new TabularLabOrderResults.TestOrderLabel(testOrderLabelCounter++, result.getTestName(), result.getMinNormal(), result.getMaxNormal(), result.getTestUnitOfMeasurement(), result.getPanelName()));
}

if(result.getResult() != null || result.getReferredOut() || result.getUploadedFileName() != null) {
Expand Down
14 changes: 12 additions & 2 deletions ...c/main/java/org/openmrs/module/bahmniemrapi/laborder/contract/TabularLabOrderResults.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,21 @@ public static class TestOrderLabel {
private Double minNormal;
private Double maxNormal;
private String testUnitOfMeasurement;
private String panelName;

@JsonCreator
public TestOrderLabel(@JsonProperty("index")Integer index,
@JsonProperty("testName")String testName,
@JsonProperty("minNormal")Double minNormal,
@JsonProperty("maxNormal")Double maxNormal,
@JsonProperty("testUnitOfMeasurement")String testUnitOfMeasurement) {
@JsonProperty("testUnitOfMeasurement")String testUnitOfMeasurement,
@JsonProperty("panelName")String panelName) {
this.index = index;
this.testName = testName;
this.minNormal = minNormal;
this.maxNormal = maxNormal;
this.testUnitOfMeasurement = testUnitOfMeasurement;
this.panelName = panelName;
}

public Integer getIndex() {
Expand Down Expand Up @@ -108,8 +111,15 @@ public String getTestUnitOfMeasurement() {
public void setTestUnitOfMeasurement(String testUnitOfMeasurement) {
this.testUnitOfMeasurement = testUnitOfMeasurement;
}
}

public String getPanelName() {
return panelName;
}

public void setPanelName(String panelName) {
this.panelName = panelName;
}
}

public static class CoordinateValue {
private Date accessionDateTime;
Expand Down
Loading