Skip to content

Commit 6302b01

Browse files
Kavitha|fix allergy color and non-coded dosage rule issue (#1013)
1 parent b6a01d4 commit 6302b01

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

micro-frontends/src/styles/common.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,5 @@
4747
text-transform: capitalize;
4848
}
4949
.red-text{
50-
color: #DA1E28;
50+
color: red;
5151
}

ui/app/clinical/consultation/controllers/addTreatmentController.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,8 @@ angular.module('bahmni.clinical')
359359
$scope.calculateDose = function (treatment) {
360360
if (treatment.dosingRule != null || treatment.dosingRule != undefined) {
361361
var visitUuid = treatmentConfig.orderSet.calculateDoseOnlyOnCurrentVisitValues ? $scope.activeVisit.uuid : undefined;
362-
var calculatedDose = orderSetService.getCalculatedDose($scope.patient.uuid, treatment.drug.name, treatment.uniformDosingType.dose, "mg", '', treatment.dosingRule, visitUuid);
362+
var drugName = treatment.drug ? treatment.drug.name : treatment.drugNonCoded;
363+
var calculatedDose = orderSetService.getCalculatedDose($scope.patient.uuid, drugName, treatment.uniformDosingType.dose, "mg", '', treatment.dosingRule, visitUuid);
363364
calculatedDose.then(function (calculatedDosage) {
364365
treatment.uniformDosingType.dose = calculatedDosage.dose;
365366
treatment.calculateQuantityAndUnit();

0 commit comments

Comments
 (0)