diff --git a/bahmni-emr-api/src/main/java/org/openmrs/module/bahmniemrapi/laborder/contract/LabOrderResults.java b/bahmni-emr-api/src/main/java/org/openmrs/module/bahmniemrapi/laborder/contract/LabOrderResults.java index 8f029fb640..828b99ccae 100644 --- a/bahmni-emr-api/src/main/java/org/openmrs/module/bahmniemrapi/laborder/contract/LabOrderResults.java +++ b/bahmni-emr-api/src/main/java/org/openmrs/module/bahmniemrapi/laborder/contract/LabOrderResults.java @@ -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) { diff --git a/bahmni-emr-api/src/main/java/org/openmrs/module/bahmniemrapi/laborder/contract/TabularLabOrderResults.java b/bahmni-emr-api/src/main/java/org/openmrs/module/bahmniemrapi/laborder/contract/TabularLabOrderResults.java index 2d89b5e0ec..3dd72e608e 100644 --- a/bahmni-emr-api/src/main/java/org/openmrs/module/bahmniemrapi/laborder/contract/TabularLabOrderResults.java +++ b/bahmni-emr-api/src/main/java/org/openmrs/module/bahmniemrapi/laborder/contract/TabularLabOrderResults.java @@ -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() { @@ -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;