Kavitha|fix allergy color and non-coded dosage rule issue (#1013)

Bahmni · Oct 17, 2024 · 6302b01 · 6302b01
1 parent b6a01d4
commit 6302b01
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/micro-frontends/src/styles/common.scss b/micro-frontends/src/styles/common.scss
@@ -47,5 +47,5 @@
  text-transform: capitalize;
 }
 .red-text{
- color: #DA1E28;
+ color: red;
 }
diff --git a/ui/app/clinical/consultation/controllers/addTreatmentController.js b/ui/app/clinical/consultation/controllers/addTreatmentController.js
@@ -359,7 +359,8 @@ angular.module('bahmni.clinical')
  $scope.calculateDose = function (treatment) {
  if (treatment.dosingRule != null || treatment.dosingRule != undefined) {
  var visitUuid = treatmentConfig.orderSet.calculateDoseOnlyOnCurrentVisitValues ? $scope.activeVisit.uuid : undefined;
- var calculatedDose = orderSetService.getCalculatedDose($scope.patient.uuid, treatment.drug.name, treatment.uniformDosingType.dose, "mg", '', treatment.dosingRule, visitUuid);
+ var drugName = treatment.drug ? treatment.drug.name : treatment.drugNonCoded;
+ var calculatedDose = orderSetService.getCalculatedDose($scope.patient.uuid, drugName, treatment.uniformDosingType.dose, "mg", '', treatment.dosingRule, visitUuid);
  calculatedDose.then(function (calculatedDosage) {
  treatment.uniformDosingType.dose = calculatedDosage.dose;
  treatment.calculateQuantityAndUnit();