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

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

@@ -807,6 +807,7 @@
             var anticoagulantList = []
             
             if(arrDateOne > arrDateTwo){
+              console.log("简单阿凡达2332322332")
               if(list!=null && list.length>0){
                   for(let i=0;i<list.length;i++){
                     list[i].dialysis_dialyszers_arr = []
@@ -871,7 +872,7 @@
             }
 
             if(arrDateOne <= arrDateTwo){
-            
+               console.log("简哈哈哈发232我")
 
               if(list!=null && list.length>0){
                 for(let i=0;i<list.length;i++){
@@ -935,8 +936,16 @@
                   }
               }
             }
+            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)
           
-            console.log("anticoagulantList",anticoagulantList)
+         
            this.tableList = []
            if(anticoagulantList!=null && anticoagulantList.length > 0){
                 let dataInfoOne = {}
@@ -967,6 +976,7 @@
               this.tableList.push(hisarr[i])
             }
             console.log("hisarr",hisarr)
+
            }
             var dialysisDialyszersArr = []
             var dialyzerPerfusionApparaArr = []
@@ -987,6 +997,7 @@
               dialysisStrainerArr.push(list[i].dialysis_strainer_arr[p])
              }
             }
+          console.log("dialysisDialyszersArrooo2oo2o2o2o2",dialysisDialyszersArr)
            let obj = {}
            let objOne = {}
            let objTwo = {}
@@ -1071,7 +1082,7 @@
               Arr.push(a);
             }
 
-
+            console.log("Arrowowwwwwwwwwww",Arr)
             if(Arr.length >0){
               for(let i=0;i<Arr.length;i++){
                  this.tableList.push(Arr[i])

src/xt_pages/role/admin.vue

@@ -225,12 +225,12 @@
           @click="toAutoDrug">自动生成</el-button> -->
 
 
-          <!-- <el-button
+         <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toAutoDiagnose">自动脚本</el-button> -->
+          @click="toAutoDiagnose">自动脚本</el-button> 
      </div>
 
 

src/xt_pages/user/components/PatientSidebar.vue

@@ -408,7 +408,10 @@ export default {
           if(this.org_id ==10191){
              var patients = response.data.data.patients
              for(let i=0;i<patients.length;i++){
-               this.patientsList.push(patients[i])
+               if(patients[i].lapseto ==1){
+                this.patientsList.push(patients[i])
+               }
+             
              }
           }else{
             this.patientsList = response.data.data.patients