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

build/cdn.json

 {
-  "version": "2999.999.13753"
+  "version": "2999.999.13754"
 }

src/pages/main/beforeDialysis/components/dialysisParameters.vue

                   {{scope.row.name?scope.row.name:""}}
                </template>
             </el-table-column>
+            <el-table-column prop="date" fixed label="床位号" width="80" align="center">
+               <template slot-scope="scope">
+
+                  {{scope.row.number?scope.row.number:""}}
+               </template>
+            </el-table-column>
             <el-table-column prop="name" label="透析模式" width="90" align="center">
                 <template slot-scope="scope">
                     {{scope.row.mode_id}}
       getMobileDialysisParameters(params).then(response => {
         if (response.data.state == 1) {
           var schedule =  response.data.data.schedule
+
+          console.log("schedule=================",schedule)
           this.loading = false
           //  var total = response.data.data.total
           var prescription = response.data.data.prescription
           this.dialysisbefor = dialysbefor
           this.dialysisBefor = dialysbefor
           var patient = response.data.data.patient
+          console.log("patient---------------------",patient)
             
           if(schedule!=null && schedule.length>0){
            
            for(let j=0;j<patient.length;j++){
              patient[j].sort = 0
+             patient[j].number= ""
              for(let i=0;i<schedule.length;i++){
              
                 if(patient[j].patient_id == schedule[i].patient_id){
                     patient[j].sort = schedule[i].device_number.sort
+                    patient[j].number = schedule[i].device_number.number
                 }
              }
             }
             if (patient[i].mode_id == 44) {
               patient[i].mode_id = '导管溶栓'
             }
+          
           }
             this.datalist = []
             this.datalist = patient.sort((a, b) => a.sort - b.sort)
+            
             this.tableData = []
             this.tableData = patient.sort((a, b) => a.sort - b.sort)
+
+            console.log("patinet====================",this.tableData)
             this.$nextTick(() => {
               this.$refs.tab.doLayout()
             })
         }
         getMobileDialysisParameters(params).then(response => {
           if (response.data.state == 1) {
-            //  var schedule =  response.data.data.schedule
+            var schedule =  response.data.data.schedule
             this.loading = false
             //  var total = response.data.data.total
             var prescription = response.data.data.prescription
             }
             //  this.dialysisBefor = dialysbefor
             var patient = response.data.data.patient
+
+            if(schedule!=null && schedule.length>0){
+           
+           for(let j=0;j<patient.length;j++){
+             patient[j].sort = 0
+             patient[j].number= ""
+             for(let i=0;i<schedule.length;i++){
+             
+                if(patient[j].patient_id == schedule[i].patient_id){
+                    patient[j].sort = schedule[i].device_number.sort
+                    patient[j].number = schedule[i].device_number.number
+                }
+             }
+            }
+        }
+          
             if (response.data.data.patient.length <= 0) {
               this.isStop = true
             } else {
               if (patient[i].mode_id == 21) {
                 patient[i].mode_id = 'HD+'
               }
+              if (patient[i].mode_id == 24) {
+              patient[i].mode_id = 'I-HDF'
+            }
+            if (patient[i].mode_id == 25) {
+              patient[i].mode_id = 'HD高通'
+            }
+            if (patient[i].mode_id == 26) {
+              patient[i].mode_id = 'CVVH'
+            }
+            if (patient[i].mode_id == 27) {
+              patient[i].mode_id = 'CVVHD'
+            }
+            if (patient[i].mode_id == 28) {
+              patient[i].mode_id = 'CVVHDF'
+            }
+            if (patient[i].mode_id == 29) {
+              patient[i].mode_id = 'PE'
+            }
+            if (patient[i].mode_id == 30) {
+              patient[i].mode_id = '血浆胆红素吸附+HP'
+            }
+            if (patient[i].mode_id == 31) {
+              patient[i].mode_id = 'HPD'
+            }
+            if (patient[i].mode_id == 32) {
+              patient[i].mode_id = 'HDP'
+            }
+            if (patient[i].mode_id == 33) {
+              patient[i].mode_id = 'HFD'
+            }
+            if (patient[i].mode_id == 34) {
+              patient[i].mode_id = 'HDF100'
+            }
+            if (patient[i].mode_id == 35) {
+              patient[i].mode_id = 'HDF600'
+            }
+            if (patient[i].mode_id == 36) {
+              patient[i].mode_id = 'HDF800'
+            }
+            if (patient[i].mode_id == 37) {
+              patient[i].mode_id = 'HDF1000'
+            }
+            if (patient[i].mode_id == 38) {
+              patient[i].mode_id = 'HDF80'
+            }
+            if (patient[i].mode_id == 39) {
+              patient[i].mode_id = 'HF16'
+            }
+            if (patient[i].mode_id == 40) {
+              patient[i].mode_id = 'HD(无肝素)'
+            }
+            if (patient[i].mode_id == 41) {
+              patient[i].mode_id = 'HDF17H'
+            }
+            if (patient[i].mode_id == 42) {
+              patient[i].mode_id = 'HD.'
+            }
+            if (patient[i].mode_id == 43) {
+              patient[i].mode_id = 'HD(2)'
+            }
+            if (patient[i].mode_id == 44) {
+              patient[i].mode_id = '导管溶栓'
+            }
               this.datalist.push(...patient)
               var arr = this.unique(this.datalist)
 
-              this.tableData = arr
+              this.tableData = arr.sort((a, b) => a.sort - b.sort)
               this.$nextTick(() => {
                 this.$refs.tab.doLayout()
               })