OpenMRS

Timestamp:

07/16/08 12:29:31 (6 months ago)

Author:

bwolfe

Message:

Merging trunk to the 1.3.x branch (sideporting) to get bug fixes into an RC5 release [4745]:[4946]

Files:

• openmrs/branches/1.3.x/src/web/org/openmrs/web/controller/RegimenPortletController.java (modified) (1 diff)

openmrs/branches/1.3.x/src/web/org/openmrs/web/controller/RegimenPortletController.java

@@ -55 +55 @@
-                                }
-                                for (DrugOrder order : ((List<DrugOrder>) model.get("patientDrugOrders"))) {
+                                        String setIdToUse = null;
+                                        if (order.getDrug() != null){
-                                        Concept orderConcept = order.getDrug().getConcept();
-String setIdToUse = null;
-for (Map.Entry<String, Collection<Concept>> e : drugConceptsBySetId.entrySet(
-if (e.getValue().contains(orderConcept)) {
-setIdToUse = e.getKey()
-break;
+       for (Map.Entry<String, Collection<Concept>> e : drugConceptsBySetId.entrySet()) {
+               if (e.getValue().contains(orderConcept
+               setIdToUse = e.getKey();
+       break
+}
-                                                }
-                                        }