Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/Dialysisanalysis/new_otherIndicators/components/anticoagulant.vue

@@ -322,6 +322,7 @@ import html2canvas from "html2canvas"
           page:this.currentPage,
           limit:this.limit,
         }
+        console.log('抗凝剂params',params);
         Getdetail(params).then(response =>{
           if(response.data.state ==1){
             const list = response.data.data.prescriptions
@@ -352,7 +353,9 @@ import html2canvas from "html2canvas"
       },
       // 详情查询
       deil_click(){
+        this.currentPage =1
         this.getGetdetail(this.dialyze_value)
+       
       },
       //导出excel
       exportExcel(){

src/xt_pages/Dialysisanalysis/new_otherIndicators/components/complete.vue

@@ -223,11 +223,11 @@ import html2canvas from "html2canvas"
         limit:50,
         total:0,
         tableData:[],
-        // status_options:[],
+        status_options:[],
         nurseList:[],
         operators:[],
         docList:[],
-        status_options:[{value:1,label:'达到透析处方时间'},{value:2,label:'超出处方时间'},{value:3,label:'未到达处方时间'}],
+        // status_options:[{value:1,label:'达到透析处方时间'},{value:2,label:'超出处方时间'},{value:3,label:'未到达处方时间'}],
         date_options:[{value:1,label:'最近七天'},{value:2,label:'本周'},{value:3,label:'上周'},{value:4,label:'本月'},
                       {value:5,label:'上月'},{value:6,label:'本年'},{value:7,label:'上一年'}
         ],
@@ -272,14 +272,14 @@ import html2canvas from "html2canvas"
               yAxis.push(key)
             }
             const status = []
-            // for(let i in yAxis){
-            //   const obj ={
-            //     value:(i*1)+1,
-            //     label:yAxis[i]
-            //   }
-            //   status.push(obj)
-            // }
-            // this.status_options = status
+            for(let i in yAxis){
+              const obj ={
+                value:(i*1)+1,
+                label:yAxis[i]
+              }
+              status.push(obj)
+            }
+            this.status_options = status
             console.log('this.status_options',this.status_options);
             const option = {
                 title:{
@@ -340,13 +340,14 @@ import html2canvas from "html2canvas"
             myChart.setOption(option);
             myChart.on('click',params =>{
               this.complete_dialog = true
-              console.log('bbbb',params);
+              console.log('bbbb完成率',params);
               var status_id =''
               for(let i in this.status_options){
                 if(params.data.name == this.status_options[i].label){
                   status_id = this.status_options[i].value
                 }
               }
+              this.status_value = status_id
               this.getdetail(status_id)
             })
           }
@@ -359,6 +360,7 @@ import html2canvas from "html2canvas"
       },
       // 详情查询
       detil_click(){
+        this.currentPage = 1
         this.getdetail(this.status_value)
       },
        // 下载
@@ -446,7 +448,7 @@ import html2canvas from "html2canvas"
             this.tableData = table
             this.total = response.data.data.total
           }
-          console.log('55555',response);
+          console.log('55555',params);
         })
       },
       // 选择日期

src/xt_pages/Dialysisanalysis/new_otherIndicators/components/dialyzer.vue

@@ -282,7 +282,7 @@ import html2canvas from "html2canvas"
             const options = []
             for(let i in xAxis){
               const arr ={
-                id:i+1,
+                id:(i*1)+1,
                 name:xAxis[i]
               }
               options.push(arr)
@@ -375,6 +375,7 @@ import html2canvas from "html2canvas"
       },
       // 详情查询
       deil_click(){
+        this.currentPage =1
         this.Getdialyzerdetail(this.getdialyze(this.dialyze_value))
       },
        // 下载 
@@ -646,6 +647,7 @@ import html2canvas from "html2canvas"
       },
       getdialyze(val){
         const option = this.dialyze_options
+        console.log('透析器option',option);    
         for(let i in option){
           if(val == option[i].id){
             return option[i].name

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -657,7 +657,7 @@
                   <div style="">透析器:
                    <span>{{main_collection.prescription.dialysis_dialyszers }}&nbsp;&nbsp; {{main_collection.prescription.dialysis_irrigation}}&nbsp;&nbsp; {{main_collection.prescription.dialysis_strainer}}</span>
                   </div>
-                 
+
                 </div>
 
 
@@ -2109,7 +2109,7 @@ export default {
               if ( this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                 if (prescription.pre_time == 0) {
                   if (this.schedule.schedule_type == 1) {
-                    if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
+                    if (this.org_id == 10028 || this.org_id == 10571  || this.org_id == 10633) {
                       preTime = this.record_date + ' ' + '6:30'
                     } else if(this.org_id == 10206 || this.org_id == 10598){
                       preTime = this.record_date + ' ' + '6:00'
@@ -2130,13 +2130,14 @@ export default {
                     preTime = this.record_date + ' ' + '17:00'
                   }
                   // preTime = nowTime
+                  if(this.org_id == 10510  || this.org_id == 0){
+                    preTime = nowTime
+                  }
+
                 } else {
                   preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                 }
 
-                if(this.$store.getters.xt_user.org.id == 10510){
-                  preTime = nowTime
-                }
 
               } else {
 
@@ -2145,7 +2146,7 @@ export default {
                   if(nowTime.split(" ")[0] != this.record_date){
                     // preTime = this.record_date
                     if(this.schedule.schedule_type == 1){
-                      if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
+                      if(this.org_id == 10206   || this.org_id == 10598) {
                         preTime = this.record_date+ ' ' + '6:00'
                       }else {
                         preTime = this.record_date + ' ' + '7:00'
@@ -2164,7 +2165,7 @@ export default {
                     }
 
 
-                    if(this.$store.getters.xt_user.org.id == 10510){
+                    if(this.org_id == 10510  || this.org_id == 0){
                       preTime = nowTime
                     }
 
@@ -2317,7 +2318,7 @@ export default {
                 var preTime = nowTime
                 if (this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375 ) {
                   if (this.schedule.schedule_type == 1) {
-                    if (this.org_id == 10028 ||  this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
+                    if (this.org_id == 10028 ||  this.org_id == 10571 || this.org_id == 10633) {
                       preTime = this.record_date + ' ' + '6:30'
                     } else if(this.org_id == 10206  || this.org_id == 10598) {
                       preTime = this.record_date+ ' ' + '6:00'
@@ -2338,7 +2339,7 @@ export default {
                     preTime = this.record_date + ' ' + '17:00'
                   }
 
-                  if(this.$store.getters.xt_user.org.id == 10510){
+                  if(this.org_id == 10510  || this.org_id == 0){
                     preTime = nowTime
                   }
                 }
@@ -2709,7 +2710,7 @@ export default {
                     if ( this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                       if (prescription.pre_time == 0) {
                         if (this.schedule.schedule_type == 1) {
-                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
+                          if (this.org_id == 10028 || this.org_id == 10571  || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
                           } else if(this.org_id == 10206 || this.org_id == 10598){
                             preTime = this.record_date + ' ' + '6:00'
@@ -2730,18 +2731,18 @@ export default {
                         } else if (this.schedule.schedule_type == 3) {
                           preTime = this.record_date + ' ' + '17:00'
                         }
+                        if(this.org_id == 10510 || this.org_id == 0 ){
+                          preTime = nowTime
+                        }
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                       }
 
-                      if(this.$store.getters.xt_user.org.id == 10510){
-                        preTime = nowTime
-                      }
                     } else {
                       if (prescription.pre_time == 0) {
                         if(nowTime.split(" ")[0] != this.record_date){
                           if(this.schedule.schedule_type == 1){
-                            if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
+                            if(this.org_id == 10206  || this.org_id == 10598) {
                               preTime = this.record_date+ ' ' + '6:00'
                             }else {
                               preTime = this.record_date + ' ' + '7:00'
@@ -2759,6 +2760,9 @@ export default {
                             preTime = this.record_date + ' ' + '17:00'
                           }
                         }
+                        if(this.org_id == 10510  || this.org_id == 0){
+                          preTime = nowTime
+                        }
                         // preTime = nowTime
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
@@ -2907,7 +2911,7 @@ export default {
                       // var preTime = ''
                       if ( this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                         if (this.schedule.schedule_type == 1) {
-                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
+                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
                           } else if(this.org_id == 10206 || this.org_id == 10598){
                             preTime = this.record_date + ' ' + '6:00'
@@ -2917,7 +2921,7 @@ export default {
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
-                          if(this.org_id == 10206  || this.org_id == 0){
+                          if(this.org_id == 10206 ){
                             preTime =this.record_date + ' ' + '10:30'
                           }else if(this.org_id == 10598){
                             preTime = this.record_date + ' ' + '09:00'
@@ -2929,7 +2933,7 @@ export default {
                           preTime = this.record_date + ' ' + '17:00'
                         }
 
-                        if(this.$store.getters.xt_user.org.id == 10510){
+                        if(this.org_id == 10510  || this.org_id == 0){
                           preTime = nowTime
                         }
                       }
@@ -3395,6 +3399,9 @@ export default {
                           preTime = this.record_date + ' ' + '17:00'
                         }
                       }
+                      if(this.org_id == 10510  || this.org_id == 0){
+                        preTime = nowTime
+                      }
                     } else {
                       preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                     }
@@ -3981,6 +3988,9 @@ export default {
                         preTime = this.record_date + ' ' + '17:00'
                       }
                     }
+                    if(this.org_id == 10510  || this.org_id == 0){
+                      preTime = nowTime
+                    }
                   } else {
                     preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                   }
@@ -4646,7 +4656,7 @@ export default {
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
-                          if(this.org_id == 10206  || this.org_id == 0){
+                          if(this.org_id == 10206  ){
                             preTime = this.record_date + ' ' + '10:30'
 
                           }else if(this.org_id == 10598){
@@ -4658,20 +4668,21 @@ export default {
                         } else if (this.schedule.schedule_type == 3) {
                           preTime = this.record_date + ' ' + '17:00'
                         }
+                        if(this.org_id == 10510  || this.org_id == 0){
+                          preTime = nowTime
+                        }
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                       }
 
-                      if(this.$store.getters.xt_user.org.id == 10510){
-                        preTime = nowTime
-                      }
+
                     } else {
                       console.log("0---00000000000")
                       if (prescription.pre_time == 0) {
                         // preTime = nowTime
                         if(nowTime.split(" ")[0] != this.record_date){
                           if(this.schedule.schedule_type == 1){
-                            if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
+                            if(this.org_id == 10206  || this.org_id == 10598) {
                               preTime = this.record_date+ ' ' + '6:00'
                             }else {
                               preTime = this.record_date + ' ' + '7:00'
@@ -4689,6 +4700,10 @@ export default {
                             preTime = this.record_date + ' ' + '17:00'
                           }
                         }
+                        if(this.org_id == 10510  || this.org_id == 0){
+                          preTime = nowTime
+                        }
+
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                       }
@@ -4835,7 +4850,7 @@ export default {
                       var preTime = nowTime
                       if (this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375 ) {
                         if (this.schedule.schedule_type == 1) {
-                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
+                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
                           } else if(this.org_id == 10206 || this.org_id == 10598){
                             preTime = this.record_date+ ' ' + '6:00'
@@ -4856,7 +4871,7 @@ export default {
                           preTime = this.record_date + ' ' + '17:00'
                         }
 
-                        if(this.$store.getters.xt_user.org.id == 10510){
+                        if(this.org_id == 10510  || this.org_id == 0){
                           preTime = nowTime
                         }
                       }
@@ -5293,7 +5308,7 @@ export default {
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
-                          if(this.org_id == 10206  || this.org_id == 0){
+                          if(this.org_id == 10206 ){
                             preTime =this.record_date + ' ' + '10:30'
                           }else if(this.org_id == 10598){
                             preTime = this.record_date + ' ' + '09:00'
@@ -5305,13 +5320,14 @@ export default {
                         } else if (this.schedule.schedule_type == 3) {
                           preTime = this.record_date + ' ' + '17:00'
                         }
+                        if(this.org_id == 10510  || this.org_id == 0){
+                          preTime = nowTime
+                        }
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                       }
 
-                      if(this.$store.getters.xt_user.org.id == 10510){
-                        preTime = nowTime
-                      }
+
                     } else {
                       if (prescription.pre_time == 0) {
                         preTime = nowTime
@@ -5335,6 +5351,9 @@ export default {
                             preTime = this.record_date + ' ' + '17:00'
                           }
                         }
+                        if(this.org_id == 10510  || this.org_id == 0){
+                          preTime = nowTime
+                        }
 
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
@@ -5491,7 +5510,7 @@ export default {
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
-                          if(this.org_id == 10206 ||  this.org_id == 0){
+                          if(this.org_id == 10206 ){
                             preTime = this.record_date + ' ' + '10:30'
 
                           }else if(this.org_id == 10598){
@@ -5504,7 +5523,7 @@ export default {
                           preTime = this.record_date + ' ' + '17:00'
                         }
 
-                        if(this.$store.getters.xt_user.org.id == 10510){
+                        if(this.org_id == 10510  || this.org_id == 0){
                           preTime = nowTime
                         }
                       }