@james_jayaraj/test-npm 1.3.1 → 1.3.3

package/fesm2020/james_jayaraj-test-npm.mjs

@@ -3715,6 +3715,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?.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;
@@ -6398,7 +6401,9 @@ class RxComponent {
         }
         return this.commonServices.favouriteMedicineList.some((favMed) => favMed.productId.toString() === this.commonServices.selectedFormulation.productId.toString() &&
             (!this.commonServices.IsNullOrEmpty(favMed.pbsCode) ? favMed.pbsCode : "") === (!this.commonServices.IsNullOrEmpty(this.commonServices.selectedFormulation?.pbsCode) ? this.commonServices.selectedFormulation.pbsCode : "") &&
-            favMed.productName === this.commonServices.selectedFormulation.productName);
+            favMed.productName === this.commonServices.selectedFormulation.productName && favMed.quantity?.toString() === this.commonServices.quantityVal?.toString() && favMed.repeats?.toString() === this.commonServices.repeatsVal?.toString() &&
+            favMed.dose?.toString() === this.commonServices.doseSearchValue?.toString() && favMed.frequency?.toString() === this.commonServices.freqSearchValue?.toString() && favMed.food?.toString() === this.commonServices.foodSearchValue?.toString() &&
+            favMed.instruction?.toString() === this.commonServices.InstructionSearchValue?.toString() && favMed.route?.toString() === this.commonServices.routeSearchValue?.toString());
     }
     isPbsTypeMatch(itemPbsType, pbsTypeFilter) {
         if (!pbsTypeFilter?.trim())