@james_jayaraj/test-npm 1.3.1 → 1.3.3

package/fesm2015/james_jayaraj-test-npm.mjs

@@ -3720,6 +3720,7 @@ class RxComponent {
         try {
             this.commonServices.selectedFormulation = med;
             this.commonServices.clearMedicalPrescriptionDataOnchangeofMedicine(med);
+            this.changedetect.detectChanges();
             if (!this.commonServices.isMedicineRestrict) {
                 this.commonServices.isS8WarningNext = true;
                 this.restrictions = med.Restrictions && med.Restrictions.length != 0 ? med.Restrictions[0] : null;
@@ -6370,12 +6371,14 @@ class RxComponent {
             else {
                 this.favMedicineLoader = false;
                 var selecteddata = null;
+                this.commonServices.favouriteEncryptedId = rxList.encryptedId;
                 if (!this.commonServices.IsNullOrEmpty(rxList === null || rxList === void 0 ? void 0 : rxList.productId)) {
                     selecteddata = this.commonServices.selectedMedicineList.filter((x) => x.productId == Number(rxList.productId));
                     // selecteddata = this.commonServices.selectedMedicineList.splice(index, 1);
                 }
                 this.commonServices.selectedFormulation = selecteddata[0];
                 this.commonServices.clearMedicalPrescriptionDataOnchangeofMedicine(selecteddata[0]);
+                this.assignCombinations(rxList);
                 this.changedetect.detectChanges();
                 this.commonServices.isFetching = false;
                 this.isRtpmNext = true;
@@ -6397,10 +6400,12 @@ class RxComponent {
             return false;
         }
         return this.commonServices.favouriteMedicineList.some((favMed) => {
-            var _a;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
             return favMed.productId.toString() === this.commonServices.selectedFormulation.productId.toString() &&
                 (!this.commonServices.IsNullOrEmpty(favMed.pbsCode) ? favMed.pbsCode : "") === (!this.commonServices.IsNullOrEmpty((_a = this.commonServices.selectedFormulation) === null || _a === void 0 ? void 0 : _a.pbsCode) ? this.commonServices.selectedFormulation.pbsCode : "") &&
-                favMed.productName === this.commonServices.selectedFormulation.productName;
+                favMed.productName === this.commonServices.selectedFormulation.productName && ((_b = favMed.quantity) === null || _b === void 0 ? void 0 : _b.toString()) === ((_c = this.commonServices.quantityVal) === null || _c === void 0 ? void 0 : _c.toString()) && ((_d = favMed.repeats) === null || _d === void 0 ? void 0 : _d.toString()) === ((_e = this.commonServices.repeatsVal) === null || _e === void 0 ? void 0 : _e.toString()) &&
+                ((_f = favMed.dose) === null || _f === void 0 ? void 0 : _f.toString()) === ((_g = this.commonServices.doseSearchValue) === null || _g === void 0 ? void 0 : _g.toString()) && ((_h = favMed.frequency) === null || _h === void 0 ? void 0 : _h.toString()) === ((_j = this.commonServices.freqSearchValue) === null || _j === void 0 ? void 0 : _j.toString()) && ((_k = favMed.food) === null || _k === void 0 ? void 0 : _k.toString()) === ((_l = this.commonServices.foodSearchValue) === null || _l === void 0 ? void 0 : _l.toString()) &&
+                ((_m = favMed.instruction) === null || _m === void 0 ? void 0 : _m.toString()) === ((_o = this.commonServices.InstructionSearchValue) === null || _o === void 0 ? void 0 : _o.toString()) && ((_p = favMed.route) === null || _p === void 0 ? void 0 : _p.toString()) === ((_q = this.commonServices.routeSearchValue) === null || _q === void 0 ? void 0 : _q.toString());
         });
     }
     isPbsTypeMatch(itemPbsType, pbsTypeFilter) {