Merge branch 'new_pad_branch' of http://git.shengws.com/zhangbj/xt_pad into new_pad_branch

src/pages/main/dialog/MonitDialog.vue

@@ -553,37 +553,21 @@ export default {
         this.today_last_monitor_record = resp.monitor
 
         // this.form.operate_time = Date.parse(new Date())
-        this.form.operate_time = resp.monitor.operate_time
-          ? (resp.monitor.operate_time + 3600) * 1000
-          : Date.parse(new Date())
+        this.form.operate_time = resp.monitor.operate_time  ? (resp.monitor.operate_time + 3600) * 1000 : Date.parse(new Date())
         this.form.pulse_frequency = '' // this.last_monitor_record.pulse_frequency;
-        this.form.breathing_rated = resp.monitor.breathing_rate
-          ? resp.monitor.breathing_rate
-          : ''
+        this.form.breathing_rated = resp.monitor.breathing_rate ? resp.monitor.breathing_rate : ''
         this.form.systolic_bp = '' // this.last_monitor_record.systolic_blood_pressure;
         this.form.diastolic_bp = '' // this.last_monitor_record.diastolic_blood_pressure;
-        this.form.blood_flow_volume = resp.monitor.blood_flow_volume
-          ? resp.monitor.blood_flow_volume
-          : ''
+        this.form.blood_flow_volume = resp.monitor.blood_flow_volume ? resp.monitor.blood_flow_volume : ''
         this.form.venous_pressure = '' // this.last_monitor_record.venous_pressure;
         this.form.arterial_pressure = '' // this.last_monitor_record.arterial_pressure;
         this.form.transmembrane_pressure = '' // this.last_monitor_record.transmembrane_pressure;
-        this.form.ultrafiltration_rate = resp.monitor.ultrafiltration_rate
-          ? resp.monitor.ultrafiltration_rate
-          : ''
+        this.form.ultrafiltration_rate = resp.monitor.ultrafiltration_rate ? resp.monitor.ultrafiltration_rate : ''
         this.form.ultrafiltration_volume = resp.monitor.ultrafiltration_volume ? resp.monitor.ultrafiltration_volume : ''
-        this.form.sodium_concentration = resp.monitor.sodium_concentration
-          ? resp.monitor.sodium_concentration
-          : ''
-        this.form.dialysate_temperature = resp.monitor.dialysate_temperature
-          ? resp.monitor.dialysate_temperature
-          : ''
-        this.form.temperature = resp.monitor.temperature
-          ? resp.monitor.temperature
-          : ''
-        this.form.replacement_rate = resp.monitor.replacement_rate
-          ? resp.monitor.replacement_rate
-          : ''
+        this.form.sodium_concentration = resp.monitor.sodium_concentration ? resp.monitor.sodium_concentration : ''
+        this.form.dialysate_temperature = resp.monitor.dialysate_temperature  ? resp.monitor.dialysate_temperature : ''
+        this.form.temperature = resp.monitor.temperature ? resp.monitor.temperature : ''
+        this.form.replacement_rate = resp.monitor.replacement_rate ? resp.monitor.replacement_rate : ''
         this.form.displacement_quantity = '' // this.last_monitor_record.displacement_quantity;
         this.form.conductivity = ''
         this.form.displacement_flow_quantity = ''

src/pages/main/template/DialysisPrintOrderSix.vue

@@ -194,6 +194,45 @@
                     <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==5">
                       HF
                     </div>
+                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==6">
+                      SCUF
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==7">
+                      IUF
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==8">
+                      HFHD
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==9">
+                      HFHD+HP
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==10">
+                      PHF
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==11">
+                      HFR
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==12">
+                      HDF+HP
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==13">
+                      CRRT
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==14">
+                      腹水回输
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==15">
+                      HD前置换
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==16">
+                      HD后置换
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==17">
+                      HDF前置换
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id==18">
+                      HDF后置换
+                    </div>
                   </div>
 
                   <div class="inline_block" style="margin-left:10px;flex:1;">
@@ -350,7 +389,7 @@
               <td style="padding: 0; position: relative;" colspan="2">
                 <table class="inside_table">
                   <tbody>
-                    <tr><td :colspan="(prescription.mode_id==2 || prescription.mode_id==5) ? 12 :11" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">治疗纪录</td></tr>
+                    <tr><td :colspan="(prescription.mode_id==2 || prescription.mode_id==5 || prescription.mode_id== 12) ? 12 :11" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">治疗纪录</td></tr>
                     <tr>
                       <td width="60">时间</td>
                       <td width="60">血压<br/>(mmHg)</td>
@@ -362,7 +401,7 @@
                       <td width="60">透析液温度(°C)</td>
                       <td width="50">电导度<br/>(ms/cm)</td>
                       <td width="50">超滤量<br/>(ml)</td>
-                      <td v-if="prescription.mode_id==2 || prescription.mode_id==5" width="50">置换量<br/>(ml)</td>
+                      <td v-if="prescription.mode_id==2 || prescription.mode_id==5 || prescription.mode_id== 12" width="50">置换量<br/>(ml)</td>
                       <td width="200">病情变化及处理</td>
 
                       <!-- <td width="100">时间</td>
@@ -389,7 +428,7 @@
                       <td>{{monitor.dialysate_temperature?monitor.dialysate_temperature:''}}</td>
                       <td>{{monitor.sodium_concentration?monitor.sodium_concentration:''}}</td>
                       <td>{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:0}}</td>
-                      <td v-if="prescription.mode_id==2 || prescription.mode_id==5" width="50">{{monitor.displacement_quantity?monitor.displacement_quantity:0}}</td>
+                      <td v-if="prescription.mode_id==2 || prescription.mode_id==5 || prescription.mode_id== 12" width="50">{{monitor.displacement_quantity?monitor.displacement_quantity:0}}</td>
                       <td style="line-height:16px;padding:0px;">
                         <div style="min-height:40px;line-height:40px; overflow:hidden;">
                           <span style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">
@@ -411,7 +450,7 @@
                       <td> </td>
                       <td> </td>
                       <td> </td>
-                      <td v-if="prescription.mode_id==2 || prescription.mode_id==5" width="50"></td>
+                      <td v-if="prescription.mode_id==2 || prescription.mode_id==5 || prescription.mode_id== 12" width="50"></td>
                       <td style="line-height:16px;padding:0px;"><div style="height:40px;line-height:20px; overflow:hidden;"><span style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;"> </span> </div></td>
                     </tr>
                   </tbody>