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

src/pages/main/PatientBox.vue

       this.zone_id = schedual.device_number.zone.id
       this.patient_id = schedual.patient_id
       this.mode_id = schedual.mode_id
-      if (this.$store.getters.user.template_info.org_id == 9671 || this.$store.getters.user.template_info.org_id == 9675 || this.$store.getters.user.template_info.org_id == 10340 || this.$store.getters.user.template_info.org_id == 9829  || this.$store.getters.user.template_info.org_id == 10490 || this.$store.getters.user.template_info.org_id == 10318) {
+      if (this.$store.getters.user.template_info.org_id == 9671 || this.$store.getters.user.template_info.org_id == 9675 || this.$store.getters.user.template_info.org_id == 10340 || this.$store.getters.user.template_info.org_id == 9829  || this.$store.getters.user.template_info.org_id == 10490 || this.$store.getters.user.template_info.org_id == 10318 || this.$store.getters.user.template_info.org_id == 10721) {
         console.log('下机时间', schedual.dialysis_order.end_time)
         if (schedual && schedual.dialysis_order != null) {
           this.start_time_str = this.getTimeTwo(schedual.dialysis_order.end_time)
         schedule_date: schedual.schedule_date
       }
       console.log('params23232323', params)
-      if (this.$store.getters.user.template_info.org_id == 9671 || this.$store.getters.user.template_info.org_id == 9675 || this.$store.getters.user.template_info.org_id == 10340 || this.$store.getters.user.template_info.org_id == 9829 || this.$store.getters.user.template_info.org_id == 10490 || this.$store.getters.user.template_info.org_id == 10101 || this.$store.getters.user.template_info.org_id == 10318) {
+      if (this.$store.getters.user.template_info.org_id == 9671 || this.$store.getters.user.template_info.org_id == 9675 || this.$store.getters.user.template_info.org_id == 10340 || this.$store.getters.user.template_info.org_id == 9829 || this.$store.getters.user.template_info.org_id == 10490 || this.$store.getters.user.template_info.org_id == 10101 || this.$store.getters.user.template_info.org_id == 10318  || this.$store.getters.user.template_info.org_id == 10721) {
         getDialysisRecordOrde(params).then((response) => {
           if (response.data.state == 1) {
             var order = response.data.data.order

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

       }
       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
           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
+             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
+                }
+             }
+            }
+        }
+
+
           if (response.data.data.patient.length <= 0) {
             this.isStop = true
           } else {
             if (patient[i].mode_id == 44) {
               patient[i].mode_id = '导管溶栓'
             }
+          }
             this.datalist = []
-            this.datalist = patient
+            this.datalist = patient.sort((a, b) => a.sort - b.sort)
             this.tableData = []
-            this.tableData = patient
+            this.tableData = patient.sort((a, b) => a.sort - b.sort)
             this.$nextTick(() => {
               this.$refs.tab.doLayout()
             })
-          }
         } else {
           this.loading = false
         }

src/pages/main/newActionBar/dialysisPrescription.vue

           <span v-if="last_record!=undefined && $store.getters.user.template_info.org_id !=10599  && $store.getters.user.template_info.org_id !=10702">上次透后体重：{{last_record.weight_after?last_record.weight_after: "--"}}Kg</span></br>
           <span v-if="last_record!=undefined && $store.getters.user.template_info.org_id ==10702">上次透后体重：{{(last_record.weight_after-last_record.additional_weight).toFixed(2)?(last_record.weight_after-last_record.additional_weight).toFixed(2): "--"}}Kg</span></br>
 
-
+          <span v-if="$store.getters.user.template_info.org_id == 10721">
+            <span v-if="predialysis!=null && last_record!=null">
+                体重增长：
+                {{predialysis&&last_record&&((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2)?((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2):"" }} kg
+              </span>
+          </span><br/>
+             
           <span v-if="$store.getters.user.template_info.org_id == 10551 || $store.getters.user.template_info.org_id == 10612 || $store.getters.user.template_info.org_id == 10622 &&predialysis!=undefined&&predialysis.weight_before>0 &&dialysisPrescription!=undefined && dialysisPrescription.target_ultrafiltration>0">目标脱水量百分比:{{ (((dialysisPrescription.target_ultrafiltration)/predialysis.dry_weight)*100).toFixed(2)  }}%</span>
           <span v-if="$store.getters.user.template_info.org_id == 10249 || $store.getters.user.template_info.org_id == 10622   &&predialysis!=undefined&&predialysis.weight_before>0 &&dialysisPrescription!=undefined && dialysisPrescription.target_ultrafiltration>0">目标脱水量百分比:{{ (((dialysisPrescription.target_ultrafiltration/1000)/predialysis.dry_weight)*100).toFixed(2)  }}%</span>
-          <span v-if="$store.getters.user.template_info.org_id == 10449 &&predialysis!=undefined&&predialysis.weight_before>0 &&dialysisPrescription!=undefined">4小时超滤量上限（5%）:{{ (predialysis.dry_weight*0.05).toFixed(2)  }}kg</span>
+          <span v-if="($store.getters.user.template_info.org_id == 10449 || $store.getters.user.template_info.org_id == 10721) &&predialysis!=undefined&&predialysis.weight_before>0 &&dialysisPrescription!=undefined">4小时超滤量上限（5%）:{{ (predialysis.dry_weight*0.05).toFixed(2)  }}kg</span>
           <span v-if="$store.getters.user.template_info.org_id ==10599 &&predialysis!=undefined">心率:{{predialysis.pulse_frequency  }}次/分</span>&nbsp;
           <span v-if="$store.getters.user.template_info.org_id ==10599 &&predialysis!=undefined">体温:{{predialysis.temperature  }}℃</span>&nbsp;
-          <span v-if="($store.getters.user.template_info.org_id ==10599 || $store.getters.user.template_info.org_id ==10440) &&predialysis!=undefined">血压:{{predialysis.systolic_blood_pressure  }}/{{ predialysis.diastolic_blood_pressure  }}mmHg</span>
+          <span v-if="($store.getters.user.template_info.org_id ==10599 || $store.getters.user.template_info.org_id ==10440 ||  $store.getters.user.template_info.org_id ==10721 || $store.getters.user.template_info.org_id ==0) &&predialysis!=undefined">血压:{{predialysis.systolic_blood_pressure  }}/{{ predialysis.diastolic_blood_pressure  }}mmHg</span>
         </van-cell>
         <van-field
           v-model="dialysisPrescription.target_ultrafiltration"
     this.dialysisDialyszers = dialyzer
     this.dialysisIrrigation = irrigation
     this.dialysisStrainerList = dialysisStrainer
+    console.log("透析器列表-----------------------",this.dialysisDialyszers)
+    console.log("灌流器列表-----------------------",this.dialysisIrrigation)
+    console.log("滤过器列表=-----------==---------",this.dialysisStrainerList)
     }
     this.bodyFluidOptions = this.$store.getters.body_fluid;
     var special_medicine = [
 
   },
   methods: {
+  
     radioChange(val) {},
 
     formatter(val) {