Fix sale order line to show free text

ozone-his · Sep 3, 2024 · b934123 · b934123
1 parent ea78d5f
commit b934123
Showing 1 changed file with 44 additions and 24 deletions.
diff --git a/...-openmrs/src/main/java/com/ozonehis/eip/odoo/openmrs/mapper/odoo/SaleOrderLineMapper.java b/...-openmrs/src/main/java/com/ozonehis/eip/odoo/openmrs/mapper/odoo/SaleOrderLineMapper.java
@@ -59,34 +59,54 @@ protected String constructDosageInstructionsText(MedicationRequest medicationReq
         StringBuilder dosageInstructions = new StringBuilder();
 
         if (dosage.hasDoseAndRate()) {
-            if (saleOrderLine.getSaleOrderLineProductUomQty() != null) {
-                dosageInstructions.append(saleOrderLine.getSaleOrderLineProductUomQty());
-                dosageInstructions.append(" ");
-                dosageInstructions.append(
-                        dosage.getDoseAndRateFirstRep().getDoseQuantity().getUnit());
-                dosageInstructions.append(" | ");
+            String doseQuantityUnit =
+                    dosage.getDoseAndRateFirstRep().getDoseQuantity().getUnit();
+            String saleOrderQty = saleOrderLine.getSaleOrderLineProductUomQty().toString();
+
+            if (saleOrderQty != null) {
+                dosageInstructions
+                        .append(saleOrderQty)
+                        .append(" ")
+                        .append(doseQuantityUnit)
+                        .append(" | ");
             }
-            dosageInstructions.append(
-                    dosage.getDoseAndRateFirstRep().getDoseQuantity().getValue());
-            dosageInstructions.append(" ");
-            dosageInstructions.append(
-                    dosage.getDoseAndRateFirstRep().getDoseQuantity().getUnit());
-        }
 
-        if (dosage.hasRoute()) {
-            dosageInstructions.append(" - ");
-            dosageInstructions.append(dosage.getRoute().getText());
+            dosageInstructions
+                    .append(dosage.getDoseAndRateFirstRep().getDoseQuantity().getValue())
+                    .append(" ")
+                    .append(doseQuantityUnit);
         }
 
-        if (dosage.hasTiming()) {
-            dosageInstructions.append(" - ");
-            dosageInstructions.append(dosage.getTiming().getCode().getText());
-            dosageInstructions.append(" - ");
-            dosageInstructions.append(dosage.getTiming().getRepeat().getDuration());
-            dosageInstructions.append(" ");
-            dosageInstructions.append(
-                    dosage.getTiming().getRepeat().getDurationUnit().getDisplay());
-        }
+        appendWithConditionalHyphen(
+                dosageInstructions, dosage.hasRoute() ? dosage.getRoute().getText() : null);
+        appendWithConditionalHyphen(
+                dosageInstructions,
+                dosage.hasTiming() && dosage.getTiming().getCode() != null
+                        ? dosage.getTiming().getCode().getText()
+                        : null);
+        appendWithConditionalHyphen(
+                dosageInstructions,
+                dosage.hasTiming()
+                                && dosage.getTiming().getRepeat().getDuration() != null
+                                && dosage.getTiming().getRepeat().getDurationUnit() != null
+                        ? dosage.getTiming().getRepeat().getDuration().toString() + " "
+                                + dosage.getTiming()
+                                        .getRepeat()
+                                        .getDurationUnit()
+                                        .getDisplay()
+                        : null);
+
+        appendWithConditionalHyphen(dosageInstructions, dosage.getText());
+
         return dosageInstructions.toString();
     }
+
+    private void appendWithConditionalHyphen(StringBuilder builder, String text) {
+        if (text != null && !builder.isEmpty() && !builder.toString().endsWith("| ")) {
+            builder.append(" - ");
+        }
+        if (text != null) {
+            builder.append(text);
+        }
+    }
 }