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

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "2999.999.13750"
+  "version": "2999.999.13754"
 }

src/pages/main/dialog/subMenu/LongAdviceSubMenu.vue

@@ -444,8 +444,8 @@ export default {
             }
           }else if (this.$store.getters.user.org.id == 10735) {
                if (sch.schedule_type == 1) {
-                 this.advice_start_time = year + '-' + month + '-' + day + ' ' + '06:30'
-                 this.start_time = year + '-' + month + '-' + day + ' ' + '06:30'
+                 this.advice_start_time = year + '-' + month + '-' + day + ' ' + '06:00'
+                 this.start_time = year + '-' + month + '-' + day + ' ' + '06:00'
                } else if (sch.schedule_type == 2) {
                  this.advice_start_time = year + '-' + month + '-' + day + ' ' + '11:00'
                  this.start_time = year + '-' + month + '-' + day + ' ' + '11:00'

src/pages/main/newActionBar/assessmentBefore.vue

@@ -860,7 +860,10 @@ created () {
     }
 
     if(this.$store.getters.user.template_info.org_id == 10597){
-      this.formValue.additional_weight = this.last_record.additional_weight
+      if(this.predialysis.id == undefined || this.predialysis.id == 0){
+        this.formValue.additional_weight = this.last_record.additional_weight
+      }
+     
     }
    
   } else {

src/pages/main/template/DialysisPrintOrderSix.vue

@@ -764,6 +764,7 @@
                       <td width="50" v-if="org_id != 10121 && org_id != 9675 && org_id != 0 && org_id!=10490 && org_id!=10679 && org_id!=10644 && org_id!=10567 && org_id!=10724" >电导度<br />(ms/cm)</td>
                       <td width="50" v-if="org_id ==10567 || org_id== 0 || org_id == 10724">钠浓度</br> (mmol/L)</td>
                       <td width="50" v-if="org_id == 10490">置换液速度<br />(ml/h)</td>
+                      <td width="50" v-if="org_id ==10735">超滤率<br/>(ml/h)</td>
                       <td width="50" v-if="org_id !=3877 && org_id!=10449&& org_id!=10683">超滤量<br/>
                         <span v-if="org_id!=10471"> (ml)</span>
                         <span v-if="org_id==10471">L</span>
@@ -794,7 +795,7 @@
                       <td width="50" v-if="org_id == 3877 || org_id == 10449">滤前压<br/>(mmHg)</td>
                       <td width="50" v-if="org_id == 9538|| org_id == 9675 || org_id ==10629 || org_id == 10567 || org_id ==10724">KT/V</td>
                       <td width="50" v-if="org_id == 9919">在线尿素监测</td>
-                      <td width="50" v-if="org_id != 9919 && org_id!=9538 && org_id!=9675 && org_id!=10617 && org_id!=10629&&org_id!=10644&& org_id!=10679&& org_id!=10683 && org_id!=9829 && org_id!=10567 && org_id!=10724">KT/V</td>
+                      <td width="50" v-if="org_id != 9919 && org_id!=9538 && org_id!=9675 && org_id!=10617 && org_id!=10629&&org_id!=10644&& org_id!=10679&& org_id!=10683 && org_id!=9829 && org_id!=10567 && org_id!=10724 && org_id!=10735">KT/V</td>
 
                       <td width="50" v-if="org_id == 9538|| org_id == 9675 || org_id == 9919">血容量<br />(L)</td>
                       <td width="50" v-if="org_id ==10490">碳酸氢钠用量<br />(ml)</td>
@@ -822,6 +823,7 @@
                       <td width="50" v-if="org_id == 10567 || org_id ==10724"> {{ monitor.sodium_concentration }}</td>
                       <td v-if="org_id == 10490 ">{{monitor.replacement_speed? monitor.replacement_speed: ""}}</td>
                       <td v-if="org_id == 9538">{{monitor.sodium_concentration? monitor.sodium_concentration: ""}}</td>
+                      <td v-if="org_id == 10735">{{ monitor.ultrafiltration_rate?monitor.ultrafiltration_rate:"" }}</td>
                       <td v-if="org_id!=10683">
                         <span v-if="org_id == 10440 || org_id ==10644 || org_id ==10679 "> {{monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
                          <span v-if="org_id != 10440 && org_id!=10644 && org_id!=10679">