From 4cfbb742ca90a0f65f8e7b366ea9be7ddb234a2b Mon Sep 17 00:00:00 2001 From: Angshuman Sarkar Date: Thu, 18 Jul 2024 20:57:12 +0530 Subject: [PATCH] BAH-4029 | minor improvement - adding a gaurd clause to check if concept is numeric --- .../laborder/mapper/LabOrderResultMapper.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/bahmni-emr-api/src/main/java/org/openmrs/module/bahmniemrapi/laborder/mapper/LabOrderResultMapper.java b/bahmni-emr-api/src/main/java/org/openmrs/module/bahmniemrapi/laborder/mapper/LabOrderResultMapper.java index 8f3dd5cfb..44526a9f3 100644 --- a/bahmni-emr-api/src/main/java/org/openmrs/module/bahmniemrapi/laborder/mapper/LabOrderResultMapper.java +++ b/bahmni-emr-api/src/main/java/org/openmrs/module/bahmniemrapi/laborder/mapper/LabOrderResultMapper.java @@ -101,15 +101,16 @@ private Obs newResultObs(Order testOrder, Date obsDate, Concept concept, LabOrde * by openmrs by the {@link org.openmrs.validator.ObsValidator} during save */ private void checkResultRangesForAbsolutes(Obs obs, String accessionUuid) { - if (obs.getConcept().isNumeric()) { - if (obs.getValueNumeric() != null) { - ConceptNumeric cn = (ConceptNumeric) obs.getConcept(); - if (cn.getHiAbsolute() != null && cn.getHiAbsolute() < obs.getValueNumeric()) { - log.error(String.format("Test results for [%s] is beyond the absolute high range, in Accession [%s]", cn.getName(), accessionUuid)); - } - if (cn.getLowAbsolute() != null && cn.getLowAbsolute() > obs.getValueNumeric()) { - log.error(String.format("Test results for [%s] is beyond the absolute low range, in Accession [%s]", cn.getName(), accessionUuid)); - } + if (!obs.getConcept().isNumeric()) { + return; + } + if (obs.getValueNumeric() != null) { + ConceptNumeric cn = (ConceptNumeric) obs.getConcept(); + if (cn.getHiAbsolute() != null && cn.getHiAbsolute() < obs.getValueNumeric()) { + log.error(String.format("Test results for [%s] is beyond the absolute high range, in Accession [%s]", cn.getName(), accessionUuid)); + } + if (cn.getLowAbsolute() != null && cn.getLowAbsolute() > obs.getValueNumeric()) { + log.error(String.format("Test results for [%s] is beyond the absolute low range, in Accession [%s]", cn.getName(), accessionUuid)); } } }