@james_jayaraj/test-npm 1.3.0 → 1.3.2

package/fesm2020/james_jayaraj-test-npm.mjs

@@ -5007,7 +5007,8 @@ class RxComponent {
                 amtCodeSystem: !this.commonServices.IsNullOrEmpty(this.commonServices.selectedFormulation?.amtCodeSystem) ? this.commonServices.selectedFormulation.amtCodeSystem : "",
                 amtVersion: !this.commonServices.IsNullOrEmpty(this.commonServices.selectedFormulation?.amtVersion) ? this.commonServices.selectedFormulation.amtVersion : "",
                 quantityWithUnit: this.commonServices.quantityWithUnitFlag && !this.commonServices.IsNullOrEmpty(this.commonServices.selectedFormulation?.maxQtyUnits) ? this.commonServices.selectedFormulation.maxQtyUnits : "",
-                clientId: this.clientId
+                clientId: this.clientId,
+                productPackId: this.commonServices.selectedFormulation?.productPackId ? this.commonServices.selectedFormulation.productPackId : '',
             };
             this.commonServices.removeErrToast();
             this.changedetect.detectChanges();
@@ -5314,7 +5315,8 @@ class RxComponent {
                 amtCodeSystem: !this.commonServices.IsNullOrEmpty(this.commonServices.selectedFormulation?.amtCodeSystem) ? this.commonServices.selectedFormulation.amtCodeSystem : "",
                 amtVersion: !this.commonServices.IsNullOrEmpty(this.commonServices.selectedFormulation?.amtVersion) ? this.commonServices.selectedFormulation.amtVersion : "",
                 quantityWithUnit: this.commonServices.quantityWithUnitFlag && !this.commonServices.IsNullOrEmpty(this.commonServices.selectedFormulation?.maxQtyUnits) ? this.commonServices.selectedFormulation.maxQtyUnits : "",
-                clientId: this.clientId
+                clientId: this.clientId,
+                productPackId: this.commonServices.selectedFormulation?.productPackId ? this.commonServices.selectedFormulation.productPackId : '',
             };
             this.commonServices.prescribeMedLoader = true;
             this.commonServices.removeErrToast();
@@ -5440,9 +5442,10 @@ class RxComponent {
                 request_type: "parameter",
                 productId: rxList.productId,
                 pbsCode: rxList.pbsItemCodeCode,
-                rxId: this.commonServices.rxid
+                rxId: this.commonServices.rxid,
+                productPackId: rxList.productPackId ? rxList.productPackId : '',
             };
-            this.apiService.Get(config.PHYSICIAN.GET_MED_DET_BY_ID + "?productId=" + rxList.productId + "&pbsCode=" + (this.commonServices.isMedicineRestrict ? rxList.pbsItemCodeCode : "") + "&rxId=" + this.commonServices.rxid).subscribe((res) => {
+            this.apiService.Get(config.PHYSICIAN.GET_MED_DET_BY_ID + "?productId=" + rxList.productId + "&pbsCode=" + rxList.pbsItemCodeCode + "&rxId=" + this.commonServices.rxid + "&productPackId=" + (rxList.productPackId ? rxList.productPackId : '')).subscribe((res) => {
                 try {
                     if (this.commonServices.IsNullOrEmpty(res)) {
                         this.PopupScreenLoader = false;
@@ -6174,6 +6177,7 @@ class RxComponent {
             instruction: this.commonServices.InstructionSearchValue,
             route: this.commonServices.routeSearchValue,
             ...(!isAdding && { encryptedId: this.commonServices.favouriteEncryptedId }),
+            productPackId: this.commonServices.selectedFormulation?.productPackId ? this.commonServices.selectedFormulation.productPackId : '',
         };
         this.apiService.Post(body, config.PHYSICIAN.ADD_FAVOURITE_MEDICINE).subscribe((res) => {
             try {
@@ -6307,12 +6311,13 @@ class RxComponent {
                     request_type: "parameter",
                     productId: rxList.productId,
                     pbsCode: rxList.pbsCode,
-                    rxId: 0
+                    rxId: 0,
+                    productPackId: rxList.productPackId ? rxList.productPackId : '',
                 };
                 this.favMedicineLoader = true;
                 this.commonServices.favouriteEncryptedId = rxList.encryptedId;
                 this.changedetect.detectChanges();
-                this.apiService.Get(config.PHYSICIAN.GET_MED_DET_BY_ID + "?productId=" + rxList.productId + "&pbsCode=" + (this.commonServices.isMedicineRestrict ? rxList.pbsCode : "") + "&rxId=" + 0).subscribe((res) => {
+                this.apiService.Get(config.PHYSICIAN.GET_MED_DET_BY_ID + "?productId=" + rxList.productId + "&pbsCode=" + rxList.pbsCode + "&rxId=" + 0 + "&productPackId=" + (rxList.productPackId ? rxList.productPackId : '')).subscribe((res) => {
                     try {
                         if (this.commonServices.IsNullOrEmpty(res)) {
                             this.favMedicineLoader = false;
@@ -6365,12 +6370,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;
@@ -6393,7 +6400,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 === this.commonServices.quantityVal && favMed.repeats === this.commonServices.repeatsVal &&
+            favMed.dose === this.commonServices.doseSearchValue && favMed.frequency === this.commonServices.freqSearchValue && favMed.food === this.commonServices.foodSearchValue &&
+            favMed.instruction === this.commonServices.InstructionSearchValue && favMed.route === this.commonServices.routeSearchValue);
     }
     isPbsTypeMatch(itemPbsType, pbsTypeFilter) {
         if (!pbsTypeFilter?.trim())