Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/details/consumable/dialysisParameter.vue

@@ -889,6 +889,7 @@
                     if(list[i].dialysis_prescription.dialysis_irrigation!=""){
                       list[i].dialysis_irrigation_arr = list[i].dialysis_prescription.dialysis_irrigation.split(",")
                     }
+                    console.log("list[i].dialysis_prescription.dialysis_strainer",list[i].dialysis_prescription.dialysis_strainer)
                     if(list[i].dialysis_prescription.dialysis_strainer!=""){
                         list[i].dialysis_strainer_arr = list[i].dialysis_prescription.dialysis_strainer.split(",")
                     }
@@ -937,13 +938,13 @@
               }
             }
             console.log("listoope2233232",list)
-            var NewAllList=[]
-            for(let i=0;i<list.length;i++){
-               if(list[i].dialysis_machine_name =="OCI18M"){
-                    NewAllList.push(list[i]) 
-               }
-            }
-            console.log("NewAllList",NewAllList)
+            // var NewAllList=[]
+            // for(let i=0;i<list.length;i++){
+            //    if(list[i].dialysis_machine_name =="OCI150"){
+            //         NewAllList.push(list[i]) 
+            //    }
+            // }
+            // console.log("NewAllList",NewAllList)
           
          
            this.tableList = []
@@ -997,7 +998,7 @@
               dialysisStrainerArr.push(list[i].dialysis_strainer_arr[p])
              }
             }
-          console.log("dialysisDialyszersArrooo2oo2o2o2o2",dialysisDialyszersArr)
+          console.log("dialysisDialyszersArrooo2oo2o2o2o2",dialysisStrainerArr)
            let obj = {}
            let objOne = {}
            let objTwo = {}

src/xt_pages/user/components/PatientSidebar.vue

@@ -71,7 +71,7 @@ export default {
   data() {
     return {
       thedefaultActive: 1,
-      patientsList: null,
+      patientsList: [],
       currentPatient: {},
       selectID: 0,
       keyword: '',
@@ -405,8 +405,9 @@ export default {
     getList() {
       fetchAllList().then(response => {
         if (response.data.state == 1) {
-          if(this.org_id ==10191){
+          if(this.org_id ==10191 || this.org_id == 0){
              var patients = response.data.data.patients
+             console.log("patients",patients)
              for(let i=0;i<patients.length;i++){
                if(patients[i].lapseto ==1){
                 this.patientsList.push(patients[i])