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

src/xt_pages/dialysis/batch_print/batch_print_order_seventyfive.vue

@@ -815,6 +815,7 @@
                   <td width="50">UFR<br/>ml/h</td>
                   <td width="50">UF<br/>ml</td>
                   <td width="65">剩余肝素<br/>ml</td>
+                  <td width="65" v-if="record.prescription.mode_id == 2">置换液量<br/>L</td>
                   <td width="200">病情变化</td>
                 </tr>
                 <tr v-for="(monitor_record, j) in record.monitor_records" :key="j" >
@@ -877,6 +878,9 @@
                     {{ monitor_record.heparin_one?monitor_record.heparin_one:"/" }}
 
                   </td>
+                  <td width="65" v-if="record.prescription.mode_id == 2">
+                    {{monitor_record.displacement_quantity ? monitor_record.displacement_quantity : '/'}}
+                  </td>
                   <td width="200">
                     <template
                       v-if="

src/xt_pages/dialysis/batch_print/batch_print_order_seventynine.vue

@@ -26,7 +26,7 @@
               <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;width: 100%;">
                 <tbody>
                   <tr>
-                    <td width="80" style="line-height:30px;">治疗日期: 
+                    <td width="80" style="line-height:30px;">治疗日期:
                       {{ getTime(record.schedule_date, "{y}年{m}月{d}日") }}
                     </td>
                   </tr>
@@ -50,7 +50,7 @@
                             record.dialysis_order.device_number.number.length >
                               0
                               ? record.dialysis_order.device_number.number
-                              : record.device_number.number 
+                              : record.device_number.number
                           }}
                         </div>
                       </div>
@@ -98,7 +98,7 @@
                           {{ anticoagulantName(record.prescription) }} &nbsp;&nbsp;
                           {{record.prescription.anticoagulant_zongliang ? record.prescription.anticoagulant_zongliang : "0"}}
                         </span>U&nbsp;&nbsp;
-                        
+
                         <label-box :isChecked="record.prescription.anticoagulant==2 ? true :false" showValue="普通肝素:"></label-box>&nbsp;&nbsp;
                         <div style="display: inline-block;">
                           首剂：
@@ -149,16 +149,16 @@
                   </td>
                   <td style="width: 30%;line-height: 30px;">
                     透析(滤)器:
-                    
+
                     {{ record.prescription.dialysis_dialyszers ? record.prescription.dialysis_dialyszers : "" }}
 
                     {{ record.prescription.dialysis_strainer ? record.prescription.dialysis_strainer : "" }}
                   </td>
                   <td style="">
                     透析液:钾:
-                    <span style="">2.0</span>mmol/L&nbsp; 
+                    <span style="">2.0</span>mmol/L&nbsp;
                     钙:
-                    <span style="">1.5</span>mmol/L&nbsp; 
+                    <span style="">1.5</span>mmol/L&nbsp;
                     碳酸氢盐:
                     <span >32</span>mmol/L&nbsp;
                     钠:
@@ -205,8 +205,8 @@
                   </tr>
                   <tr>
                     <td rowspan="2">时间</td>
-                    <td colspan="4">透析参数</td>
-                    <td colspan="5">生命体征</td>
+                    <td colspan="5">透析参数</td>
+                    <td colspan="2">生命体征</td>
                     <td colspan="2">治疗中病情变化</td>
                   </tr>
                   <tr>
@@ -215,7 +215,7 @@
                     <td>静脉压<br/>mmHg</td>
                     <td>血流量<br/>ml/min</td>
                     <td>脱水量<br/>ml</td>
-                    <td>超滤率<br/>ml/h</td>
+                    <!-- <td>超滤率<br/>ml/h</td> -->
                     <td>HR<br/>bpm</td>
                     <!-- <td>R<br/>bpm</td> -->
                     <td>BP<br/>mmHg</td>
@@ -232,7 +232,7 @@
                     <td>{{ monitor.venous_pressure ? monitor.venous_pressure : "/" }}</td>
                     <td>{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "/" }}</td>
                     <td>{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "/"}}</td>
-                    <td>{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : "/" }}</td>
+                    <!-- <td>{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : "/" }}</td> -->
                     <td>{{ monitor.pulse_frequency ? monitor.pulse_frequency : "/" }}</td>
                     <!-- <td>{{ monitor.breathing_rate ? monitor.breathing_rate : "/" }}</td> -->
                     <td>{{
@@ -279,7 +279,7 @@
                           record.lastafterweight.weight_after
                           ).toFixed(1)
                           : '未称重'
-                          }}kg 
+                          }}kg
                       </td>
                     </tr>
 
@@ -476,7 +476,7 @@
         },
         lastAfterWeight: '',
         displaceLiquiPartOptions: [],
-        
+
       }
     },
     created() {
@@ -566,7 +566,7 @@
               }
 
               var delghTwo = 0
-              
+
               if (
                 this.records[recordIndex].advices &&
                 this.records[recordIndex].advices.length < 13
@@ -575,7 +575,7 @@
               } else {
                 delghTwo = 0
               }
-              
+
               if (delghTwo > 0) {
                 if (
                   typeof this.records[recordIndex].advices === 'undefined' ||
@@ -803,7 +803,7 @@
           return ''
         }
         if (key[id] in this.operatorMaps) {
-          
+
           return this.operatorMaps[key[id]].es_url
         } else {
           return ''

src/xt_pages/dialysis/template/DialysisPrintOrderSeventynine.vue

@@ -25,7 +25,7 @@
                   </div>
                   <div style="flex: 1;">
                     透析机号:
-                    <!-- {{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }} -->
+                    {{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}
                   </div>
                 </div>
               </td>
@@ -151,13 +151,14 @@
             <td colspan="3">
               <div style="display: inline-block;line-height: 30px;">
                 血管通路:
-                <label-box :isChecked="predialysis.blood_access_part_opera_name=='内瘘'?true :false" showValue="内瘘"></label-box>&nbsp;
+                <!-- <label-box :isChecked="predialysis.blood_access_part_opera_name=='内瘘'?true :false" showValue="内瘘"></label-box>&nbsp;
                 <label-box :isChecked="predialysis.blood_access_part_opera_name=='长期静脉导管'?true :false" showValue="长期静脉导管"></label-box>&nbsp;
                 <label-box :isChecked="predialysis.blood_access_part_opera_name=='临时静脉导管'?true :false" showValue="临时(颈、股)静脉导管"></label-box>&nbsp;
                 <label-box :isChecked="predialysis.blood_access_part_opera_name!='内瘘' &&
                             predialysis.blood_access_part_opera_name!='长期静脉导管' &&
                             predialysis.blood_access_part_opera_name!='临时静脉导管'?true :false" showValue="其它">
-                </label-box>
+                </label-box> -->
+                {{ predialysis.blood_access_part_opera_name ? predialysis.blood_access_part_opera_name :'/' }}
               </div>&nbsp;&nbsp;
               <div style="display: inline-block;line-height: 30px;">
                 穿刺者:
@@ -179,7 +180,7 @@
             <tr>
               <td rowspan="2">时间</td>
               <td colspan="5">透析参数</td>
-              <td colspan="3">生命体征</td>
+              <td colspan="2">生命体征</td>
               <td colspan="2">治疗中病情变化</td>
             </tr>
             <tr>
@@ -188,7 +189,7 @@
               <td>静脉压<br/>mmHg</td>
               <td>血流量<br/>ml/min</td>
               <td>脱水量<br/>ml</td>
-              <td>超滤率<br/>ml/h</td>
+              <!-- <td>超滤率<br/>ml/h</td> -->
               <td>HR<br/>bpm</td>
               <!-- <td>R<br/>bpm</td> -->
               <td>BP<br/>mmHg</td>
@@ -206,7 +207,7 @@
               <td>{{ monitor.venous_pressure ? monitor.venous_pressure : "/" }}</td>
               <td>{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "/" }}</td>
               <td>{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "/"}}</td>
-              <td>{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : "/" }}</td>
+              <!-- <td>{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : "/" }}</td> -->
               <td>{{ monitor.pulse_frequency ? monitor.pulse_frequency : "/" }}</td>
               <!-- <td>{{ monitor.breathing_rate ? monitor.breathing_rate : "/" }}</td> -->
               <td>{{
@@ -1116,11 +1117,14 @@ export default {
             }
           }
           console.log(this.advice_groups);
-          var doctorAdevieInfo = response.data.data.advices;
-          var tableAdvice = doctorAdevieInfo;
+          
+          var advices = response.data.data.advices;
+          var doctorAdevieInfo = response.data.data.doctorAdevieInfo
+          var tableAdvice = advices.concat(doctorAdevieInfo);
+          console.log('tableAdvice',tableAdvice);
           console.log('response.data.data', response.data.data)
           if (tableAdvice.length === 0) {
-            console.log('1111111');
+            console.log('1111111',tableAdvice.length);
             var obj = { advice_name: "", start_time: "" };
             var obj1 = { advice_name: "", start_time: "" };
             var obj2 = { advice_name: "", start_time: "" };
@@ -1141,7 +1145,7 @@ export default {
             return this.tableAdvice
           }
           if (tableAdvice.length === 1) {
-            console.log('2222222');
+            console.log('2222222',tableAdvice.length);
             var obj = { advice_name: "", start_time: "" };
             var obj1 = { advice_name: "", start_time: "" };
             var obj2 = { advice_name: "", start_time: "" };
@@ -1177,7 +1181,7 @@ export default {
             // return this.tableAdvice
           }
           if (tableAdvice.length === 3) {
-            console.log('444444');
+            console.log('444444',tableAdvice.length);
             var obj = { advice_name: "", start_time: "" };
             var obj1 = { advice_name: "", start_time: "" };
             var obj2 = { advice_name: "", start_time: "" };
@@ -1192,7 +1196,7 @@ export default {
             // return this.tableAdvice
           }
           if (tableAdvice.length === 4) {
-            console.log('5555555');
+            console.log('5555555',tableAdvice.length);
             var obj = { advice_name: "", start_time: "" };
             var obj1 = { advice_name: "", start_time: "" };
             var obj2 = { advice_name: "", start_time: "" };
@@ -1205,7 +1209,7 @@ export default {
             // return this.tableAdvice
           }
           if (tableAdvice.length === 5) {
-            console.log('6666666');
+            console.log('6666666',tableAdvice.length);
             var obj = { advice_name: "", start_time: "" };
             var obj1 = { advice_name: "", start_time: "" };
             var obj2 = { advice_name: "", start_time: "" };
@@ -1217,12 +1221,17 @@ export default {
             this.tableAdvice = tableAdvice;
             // return this.tableAdvice
           }
+          if (tableAdvice.length === 6) {
+            console.log('6666666',tableAdvice.length);
+            var obj = { advice_name: "", start_time: "" };
+            tableAdvice.push(obj);
+
+            this.tableAdvice = tableAdvice;
+            // return this.tableAdvice
+          }
 
           if (tableAdvice.length >7) {
             console.log('777777',tableAdvice);
-            // var obj = { advice_name: "", start_time: "" };
-
-            // tableAdvice.push(obj);
             this.tableAdvice = tableAdvice;
 
           }

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -308,11 +308,11 @@
                       <div
                         class="under_line"
                         style="width: 100px; text-align: center"
-                        v-if="predialysis&&predialysis.puncture_way == ''"
+                        
                       >
-                         /
+                        {{predialysis.puncture_way ? predialysis.puncture_way : '/'}}
                       </div>
-                      <div
+                      <!-- <div
                         class="under_line"
                         style="width: 100px; text-align: center"
                         v-if="predialysis&&predialysis.puncture_way.indexOf('绳梯') > -1"
@@ -332,7 +332,7 @@
                         v-if="predialysis&&predialysis.puncture_way.indexOf('区域') > -1"
                       >
                         区域
-                      </div>
+                      </div> -->
                     </div>
                     <div
                       class="inline_block"
@@ -343,16 +343,16 @@
                       <div
                         class="under_line"
                         style="width: 100px; text-align: center"
-                        v-if="predialysis&&predialysis.puncture_way == ''"
+                        
                       >
-                         /
+                         {{predialysis.puncture_way ? predialysis.puncture_way : '/'}}
                       </div>
-                      <div
+                      <!-- <div
                         class="under_line"
                         style="width: 100px; text-align: center"
                         v-if="predialysis&&predialysis.puncture_way.indexOf('绳梯') > -1"
                       >
-                        绳梯
+                        {{}}
                       </div>
                       <div
                         class="under_line"
@@ -367,7 +367,7 @@
                         v-if="predialysis&&predialysis.puncture_way.indexOf('区域') > -1"
                       >
                         区域
-                      </div>
+                      </div> -->
                     </div>
                     <div
                       class="inline_block"

src/xt_pages/dialysis/template/DialysisPrintOrderseventyfive.vue

@@ -549,6 +549,7 @@
                 <td width="50">UFR<br/>ml/h</td>
                 <td width="50">UF<br/>ml</td>
                 <td width="65">剩余肝素<br/>ml</td>
+                <td width="65" v-if="prescription.mode == 'HDF'">置换液量<br/>L</td>
                 <td width="200">病情变化</td>
               </tr>
               <tr v-for="(monitor, monindex) in monitors" :key="monindex" style="padding: 5px 0;line-height: 35px;">
@@ -609,6 +610,10 @@
                     <!-- {{ monitor.heparin?monitor.heparin:"" }} -->
                       {{ monitor.heparin_one?monitor.heparin_one:"/" }}
                 </td>
+                <!--  -->
+                <td width="65" v-if="prescription.mode == 'HDF'">
+                  {{monitor.displacement_quantity ? monitor.displacement_quantity : '/'}}
+                </td>
                 <td width="200">
                   <template v-if=" (dialysisOrder && monitor.operate_time == dialysisOrder.start_time)">
                     【开始透析】 <span v-if="org_id ==10598">引血100ml/min</span>