新分支

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

@@ -786,6 +786,7 @@
                  list[i].dialysis_dialyszers_arr = []
                  list[i].dialyzer_perfusion_apparatus_arr = []
                  list[i].dialysis_irrigation_arr = []
+                 list[i].dialysis_strainer_arr =[]
                  if(list[i].dialysis_solution.dialysis_dialyszers!=""){
                    list[i].dialysis_dialyszers_arr = list[i].dialysis_solution.dialysis_dialyszers.split(",")
                  }
@@ -795,6 +796,9 @@
                  if(list[i].dialysis_solution.dialysis_irrigation!=""){
                    list[i].dialysis_irrigation_arr = list[i].dialysis_solution.dialysis_irrigation.split(",")
                  }
+                 if(list[i].dialysis_solution.dialysis_strainer!=""){
+                    list[i].dialysis_strainer_arr = list[i].dialysis_solution.dialysis_strainer.split(",")
+                 }
 
                 
                  if(list[i].dialysis_solution.anticoagulant == 1){
@@ -873,6 +877,8 @@
             var dialysisDialyszersArr = []
             var dialyzerPerfusionApparaArr = []
             var dialysisIrrigationArr = []
+
+            var dialysisStrainerArr = []
             for(let i=0;i<list.length;i++){
              for(let j=0;j<list[i].dialysis_dialyszers_arr.length;j++){
                dialysisDialyszersArr.push(list[i].dialysis_dialyszers_arr[j])  
@@ -883,10 +889,14 @@
              for(let y=0;y<list[i].dialysis_irrigation_arr.length;y++){
               dialysisIrrigationArr.push(list[i].dialysis_irrigation_arr[y])
              }
+             for(let p=0;p<list[i].dialysis_strainer_arr.length;p++){
+              dialysisStrainerArr.push(list[i].dialysis_strainer_arr[p])
+             }
             }
            let obj = {}
            let objOne = {}
            let objTwo = {}
+           let objThree = {}
            for(let i = 0 ; i < dialysisDialyszersArr.length; i++){
             if(obj[dialysisDialyszersArr[i]]){
                obj[dialysisDialyszersArr[i]] +=1
@@ -929,15 +939,33 @@
              }   
            }
 
-           for (let i in objTwo) {
+           for (let i in objThree) {
               let a = {};
-              a[i] = objTwo[i];
-              a.name = "灌流器"
-              a.count = objTwo[i]
+              a[i] = objThree[i];
+              a.name = "滤过器"
+              a.count = objThree[i]
               a.specification_name = i
               Arr.push(a);
             }
 
+            for(let i=0;i<dialysisStrainerArr.length;i++){
+            if(objThree[dialysisStrainerArr[i]]){
+              objThree[dialysisStrainerArr[i]] +=1
+             }else{
+              objThree[dialysisStrainerArr[i]] = 1
+             }   
+           }
+
+           for (let i in objThree) {
+              let a = {};
+              a[i] = objThree[i];
+              a.name = "滤过器"
+              a.count = objThree[i]
+              a.specification_name = i
+              Arr.push(a);
+            }
+
+
             if(Arr.length >0){
               for(let i=0;i<Arr.length;i++){
                  this.tableList.push(Arr[i])

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

@@ -141,6 +141,7 @@
                  list[i].dialysis_dialyszers_arr = []
                  list[i].dialyzer_perfusion_apparatus_arr = []
                  list[i].dialysis_irrigation_arr = []
+                 list[i].dialysis_strainer_arr =[]
                  if(list[i].dialysis_solution.dialysis_dialyszers!=""){
                    list[i].dialysis_dialyszers_arr = list[i].dialysis_solution.dialysis_dialyszers.split(",")
                  }
@@ -150,6 +151,9 @@
                  if(list[i].dialysis_solution.dialysis_irrigation!=""){
                    list[i].dialysis_irrigation_arr = list[i].dialysis_solution.dialysis_irrigation.split(",")
                  }
+                 if(list[i].dialysis_solution.dialysis_strainer!=""){
+                    list[i].dialysis_strainer_arr = list[i].dialysis_solution.dialysis_strainer.split(",")
+                 }
 
                  if(list[i].dialysis_solution.anticoagulant == 1){
                     anticoagulantList.push(list[i].dialysis_solution)
@@ -227,6 +231,7 @@
             var dialysisDialyszersArr = []
             var dialyzerPerfusionApparaArr = []
             var dialysisIrrigationArr = []
+            var dialysisStrainerArr = []
             for(let i=0;i<list.length;i++){
              for(let j=0;j<list[i].dialysis_dialyszers_arr.length;j++){
               
@@ -238,6 +243,9 @@
              for(let y=0;y<list[i].dialysis_irrigation_arr.length;y++){
               dialysisIrrigationArr.push(list[i].dialysis_irrigation_arr[y])
              }
+             for(let p=0;p<list[i].dialysis_strainer_arr.length;p++){
+              dialysisStrainerArr.push(list[i].dialysis_strainer_arr[p])
+             }
             }
             console.log("透析器",dialysisDialyszersArr)
             console.log("透析器/灌流器",dialyzerPerfusionApparaArr)
@@ -246,6 +254,7 @@
            let obj = {}
            let objOne = {}
            let objTwo = {}
+           let objThree = {}
            for(let i = 0 ; i < dialysisDialyszersArr.length; i++){
             if(obj[dialysisDialyszersArr[i]]){
                obj[dialysisDialyszersArr[i]] +=1
@@ -297,6 +306,33 @@
               Arr.push(a);
             }
             console.log("newa",Arr)
+
+
+            for (let i in objThree) {
+              let a = {};
+              a[i] = objThree[i];
+              a.name = "滤过器"
+              a.count = objThree[i]
+              a.specification_name = i
+              Arr.push(a);
+            }
+
+            for(let i=0;i<dialysisStrainerArr.length;i++){
+            if(objThree[dialysisStrainerArr[i]]){
+              objThree[dialysisStrainerArr[i]] +=1
+             }else{
+              objThree[dialysisStrainerArr[i]] = 1
+             }   
+           }
+
+           for (let i in objThree) {
+              let a = {};
+              a[i] = objThree[i];
+              a.name = "滤过器"
+              a.count = objThree[i]
+              a.specification_name = i
+              Arr.push(a);
+            }
            
          
             if(Arr.length >0){