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_eightyfour.vue

@@ -324,7 +324,8 @@
                       </td>
                       <td>{{ advice[0].delivery_way }}</td>
                       <td>{{ getTime(advice[0].execution_time, "{y}-{m}-{d} {h}:{i}") }}</td>
-                      <td style="height:30px;line-height:30px">杨能华/
+                      <td style="height:30px;line-height:30px">
+                        <span v-if="advice[0].start_time>0">杨能华/</span>
                         <span v-if="setAdminUserES(advice[0],'advice_doctor') == ''">
                           {{ getAdminUser(advice[0],'advice_doctor')}}
                         </span>

src/xt_pages/dialysis/batch_print/batch_print_order_eightyone.vue

@@ -319,9 +319,9 @@
                         预透时间:
                         <div class="under_line" style=" width: 50%; text-align: center; white-space: normal; ">
                           {{ record.prescription.dialysis_duration_hour ? record.prescription.dialysis_duration_hour :
-                          "0"}}h
+                            "0" }}h
                           {{ record.prescription.dialysis_duration_minute ? record.prescription.dialysis_duration_minute
-                          : "0"}}min
+                            : "0" }}min
                         </div>
                       </div>
                       <div class="inline_block" style="flex: 1">
@@ -367,10 +367,10 @@
                         上次透后体重:
                         <div class="under_line" style="width: 50px; text-align: center">
                           <span v-if="record.lastafterweight.weight_after > 0"> {{ record.lastafterweight.weight_after ?
-                            record.lastafterweight.weight_after:"未称重"}}</span>
+                            record.lastafterweight.weight_after : "未称重" }}</span>
                           <span v-if="record.lastafterweight.weight_after <= 0">
                             {{ record.assessment_after_dislysis.last_after_weight ?
-                              record.assessment_after_dislysis.last_after_weight:"未称重"}}</span>
+                              record.assessment_after_dislysis.last_after_weight : "未称重" }}</span>
                         </div>
                         kg
                       </div>
@@ -400,7 +400,7 @@
                               record.lastafterweight.weight_after > 0
                               ? parseFloat(record.assessment_before_dislysis.weight_before -
                                 record.assessment_before_dislysis.additional_weight
-                                - record.lastafterweight.weight_after).toFixed(2): "/"
+                                - record.lastafterweight.weight_after).toFixed(2) : "/"
                             }}
                           </span>
 
@@ -410,7 +410,7 @@
                               record.assessment_after_dislysis.last_after_weight > 0
                               ? parseFloat(record.assessment_before_dislysis.weight_before -
                                 record.assessment_before_dislysis.additional_weight
-                                - record.assessment_after_dislysis.last_after_weight).toFixed(2): "/"
+                                - record.assessment_after_dislysis.last_after_weight).toFixed(2) : "/"
                             }}
                           </span>
 
@@ -614,7 +614,8 @@
                           <td>{{ monitor_record.blood_flow_volume ? monitor_record.blood_flow_volume : "" }}</td>
                           <td>{{ monitor_record.replacement_rate ? monitor_record.replacement_rate : '/' }}</td>
                           <td>{{ monitor_record.ultrafiltration_rate ? monitor_record.ultrafiltration_rate : '/' }}</td>
-                          <td>{{ monitor_record.ultrafiltration_volume ? monitor_record.ultrafiltration_volume : "0" }}</td>
+                          <td>{{ monitor_record.ultrafiltration_volume ? monitor_record.ultrafiltration_volume : "0" }}
+                          </td>
                           <td>{{ monitor_record.venous_pressure ? monitor_record.venous_pressure : "/" }}</td>
                           <td>{{ monitor_record.transmembrane_pressure ? monitor_record.transmembrane_pressure : "" }}
                           </td>
@@ -624,7 +625,7 @@
                           <td>{{ monitor_record.pulse_frequency ? monitor_record.pulse_frequency : "" }}</td>
                           <td>{{ monitor_record.breathing_rate ? monitor_record.breathing_rate : "" }}</td>
                           <td>{{ monitor_record.systolic_blood_pressure ? monitor_record.systolic_blood_pressure + "/" :
-                            ""}}
+                            "" }}
                             {{ monitor_record.diastolic_blood_pressure ? monitor_record.diastolic_blood_pressure : "" }}
                           </td>
 
@@ -733,10 +734,10 @@
 
                                 <span v-if="it.parent_id == 0">{{
                                   it.delivery_way
-                                  }}</span>
+                                }}</span>
                                 <span v-if="it.parent_id == 0">{{
                                   it.execution_frequency
-                                  }}</span>
+                                }}</span>
                                 <span v-if="
                                   it.parent_id == 0 &&
                                   it.remark.length > 0
@@ -750,8 +751,8 @@
                                 setAdminUserES(advice, 'advice_doctor') ==
                                 ''
                               ">{{
-                                  getAdminUser(advice, "advice_doctor")
-                                }}</span>
+                                getAdminUser(advice, "advice_doctor")
+                              }}</span>
                               <img class="es-img" :src="setAdminUserES(advice, 'advice_doctor')
                                 " alt="" srcset="" v-else style="height: 30px" />
                             </td>
@@ -767,8 +768,8 @@
                                   'execution_staff'
                                 ) == ''
                               ">{{
-                                  getAdminUser(advice, "execution_staff")
-                                }}</span>
+                                getAdminUser(advice, "execution_staff")
+                              }}</span>
                               <img class="es-img" :src="setAdminUserES(advice, 'execution_staff')
                                 " alt="" srcset="" v-else style="height: 30px" />
                             </td>
@@ -781,26 +782,28 @@
                             </td>
 
                             <td height="35px" colspan="2" class="advice-name" style="padding-left: 7px">
-
+                              <span v-if="advice[0].parent_id>0">---></span>
                               <span>{{ advice[0].advice_name }}</span>
 
                               <span v-if="advice[0].advice_desc">
-                                ({{ advice[0].advice_desc
-                                }}{{ advice[0].drug_spec_unit }} )
+                                ({{ advice[0].advice_desc}}
+                                {{ advice[0].drug_spec_unit }} )
                               </span>
 
-                              <span v-if="advice[0].prescribing_number">&nbsp;{{ advice[0].prescribing_number
-                                }}{{ advice[0].prescribing_number_unit }}</span>
+                              <span v-if="advice[0].prescribing_number">&nbsp;
+                                {{ advice[0].prescribing_number}}
+                                {{ advice[0].prescribing_number_unit }}
+                              </span>
                               <span v-if="advice[0].single_dose != 0">
-                                {{ advice[0].single_dose
-                                }}{{ advice[0].single_dose_unit }}</span>
+                                {{ advice[0].single_dose}}{{ advice[0].single_dose_unit }}
+                              </span>
 
-                              <span v-if="advice[0].parent_id == 0">{{
-                                advice[0].delivery_way
-                              }}</span>
-                              <span v-if="advice[0].parent_id == 0">{{
-                                advice[0].execution_frequency
-                              }}</span>
+                              <span v-if="advice[0].parent_id == 0">
+                                {{advice[0].delivery_way}}
+                              </span>
+                              <span v-if="advice[0].parent_id == 0">
+                                {{advice[0].execution_frequency}}
+                              </span>
                               <span v-if="
                                 advice[0].parent_id == 0 &&
                                 advice[0].remark.length > 0
@@ -814,8 +817,8 @@
                                 setAdminUserES(advice[0], 'advice_doctor') ==
                                 ''
                               ">{{
-                                  getAdminUser(advice[0], "advice_doctor")
-                                }}</span>
+                                getAdminUser(advice[0], "advice_doctor")
+                              }}</span>
                               <img class="es-img" :src="setAdminUserES(advice[0], 'advice_doctor')
                                 " alt="" srcset="" v-else style="height: 30px" />
                             </td>
@@ -831,12 +834,13 @@
                                   'execution_staff'
                                 ) == ''
                               ">{{
-                                  getAdminUser(advice[0], "execution_staff")
-                                }}</span>
+                                getAdminUser(advice[0], "execution_staff")
+                              }}</span>
                               <img class="es-img" :src="setAdminUserES(advice[0], 'execution_staff')
                                 " alt="" srcset="" v-else style="height: 30px" />
                             </td>
                           </tr>
+                          
                           <!-- <template v-if="record.advices.length<3">
                             <tr v-for="item in 3">
                               <td height="35px"></td>
@@ -1176,7 +1180,8 @@
                     <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                       <div class="inline_block" style="flex: 1">
                         上机护士：
-                        <div class="under_line" style="width: 80px; text-align: center" v-if="record.dialysis_order.puncture_nurse>0">
+                        <div class="under_line" style="width: 80px; text-align: center"
+                          v-if="record.dialysis_order.puncture_nurse > 0">
                           <span style="display: inline-block" v-if="setAdminUserES(
                             record.dialysis_order, 'puncture_nurse'
                           ) == ''
@@ -1190,7 +1195,8 @@
                           )
                             " alt="" srcset="" v-else />
                         </div>
-                        <div class="under_line" style="width: 80px; text-align: center" v-if="record.dialysis_order.change_nurse>0">
+                        <div class="under_line" style="width: 80px; text-align: center"
+                          v-if="record.dialysis_order.change_nurse > 0">
                           <span style="display: inline-block" v-if="setAdminUserES(
                             record.dialysis_order, 'change_nurse'
                           ) == ''
@@ -1339,16 +1345,16 @@
                               'finish_nurse'
                             ) == ''
                           ">{{
-                              getAdminUser(
+                            getAdminUser(
+                              record.dialysis_order,
+                              "finish_nurse"
+                            )
+                              ? getAdminUser(
                                 record.dialysis_order,
                                 "finish_nurse"
                               )
-                                ? getAdminUser(
-                                  record.dialysis_order,
-                                  "finish_nurse"
-                                )
-                                : "/"
-                            }}</span>
+                              : "/"
+                          }}</span>
                           <img class="es-img" :src="setAdminUserES(
                             record.dialysis_order,
                             'finish_nurse'
@@ -1684,36 +1690,40 @@ export default {
             }
 
 
-            var childMap = {};
-            for (const index in this.records[recordIndex].advices) {
-              if (this.records[recordIndex].advices[index].parent_id == 0) {
-                continue;
-              }
-              if (
-                !(
-                  this.records[recordIndex].advices[index].parent_id in childMap
-                )
-              ) {
-                childMap[this.records[recordIndex].advices[index].parent_id] =
-                  [];
-              }
-              childMap[this.records[recordIndex].advices[index].parent_id].push(
-                this.records[recordIndex].advices[index]
-              );
-            }
+            // var childMap = {};
+            // for (const index in this.records[recordIndex].advices) {
+            //   if (this.records[recordIndex].advices[index].parent_id == 0) {
+            //     continue;
+            //   }
+            //   if (
+            //     !(
+            //       this.records[recordIndex].advices[index].parent_id in childMap
+            //     )
+            //   ) {
+            //     childMap[this.records[recordIndex].advices[index].parent_id] =
+            //       [];
+            //   }
+            //   console.log('children111',this.records[recordIndex].advices);
+              
+            //   childMap[this.records[recordIndex].advices[index].parent_id].push(
+            //     this.records[recordIndex].advices[index]
+            //   );
+            // }
 
             var advices = [];
             for (const index in this.records[recordIndex].advices) {
-              if (this.records[recordIndex].advices[index].parent_id > 0) {
-                continue;
-              }
+              // if (this.records[recordIndex].advices[index].parent_id > 0) {
+              //   continue;
+              // }
               var item = this.records[recordIndex].advices[index];
-              if (item.id in childMap) {
-                item.children = childMap[item.id];
-              } else {
-                item.children = [];
-              }
+              // if (item.id in childMap) {
+              //   // advices.push(childMap[item.id])
+              //   // item.children = childMap[item.id];
+              // } else {
+              //   item.children = [];
+              // }
               advices.push(item);
+              console.log('3333333',advices)
             }
 
             var leftAdvice = [];

src/xt_pages/dialysis/batch_print/batch_print_order_eightythree.vue

@@ -254,6 +254,8 @@
                         showValue="临时(颈、股)静脉导管"></label-box>&nbsp;
                       <label-box :isChecked="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id).indexOf('人造血管') != -1 ? true : false"
                         showValue="人造血管"></label-box>&nbsp;
+                        <label-box :isChecked="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id).indexOf('股静脉') != -1 ? true : false"
+                        showValue="股静脉"></label-box>&nbsp;
                       其他:
                       <div style="display: inline-block;" 
                         v-if="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id).indexOf('内瘘') == -1 &&

src/xt_pages/dialysis/template/DialysisPrintOrderTwenty.vue

@@ -738,8 +738,6 @@
           </tr>
         </table>
 
-     
-
         <table class="print-table" border="1">
           <tbody>
             <tr>
@@ -963,7 +961,6 @@
           </tbody>
         </table>
 
-
         <table class="table-box" style="margin-top: 10px;">
           <tbody>
             <tr>
@@ -1106,159 +1103,192 @@ export default {
   },
   methods: {
     checkData(){
+      var checkdata=[]
       if(this.receiverTreatmentAccess.way == 0){
-        this.$message.error('住院方式未填')
-      }else if(this.receiverTreatmentAccess.consciousness == 0){
-        this.$message.error('意识未填')
-      }else if(this.predialysis.temperature == 0){
-        this.$message.error('透前体温未填')
-      }else if(this.receiverTreatmentAccess.posture == 0){
-        this.$message.error('体位未填')
-      }else if(this.predialysis.systolic_blood_pressure == 0 || this.predialysis.diastolic_blood_pressure == 0){
-        this.$message.error('透前血压未填完整')
-      }else if(this.predialysis.is_hemorrhage == 0){
-        this.$message.error('出血未填')
-      }else if(this.predialysis.blood_access_part_opera_name == ''){
-        this.$message.error('血管通路未填')
-      }else if(this.predialysis.puncture_way == ''){
-        this.$message.error('穿刺方法未填')
-      }else if(this.predialysis.internal_fistula == ''){
-        this.$message.error('内瘘震颤未填')
-      }else if(this.predialysis.internal_fistula_skin == ''){
-        this.$message.error('内瘘震颤皮肤未填')
-      }else if(this.predialysis.puncture_needle == ''){
-        this.$message.error('针型未填')
-      }else if(this.predialysis.catheter == '' || (this.predialysis.catheter ? this.predialysis.catheter.indexOf('置管') == -1 : false)){
-        this.$message.error('置管未填')
-      }else if(this.predialysis.blood_access_part_id == ''){
-        this.$message.error('血管通路部位未填')
-      }else if(this.predialysis.catheter_bend == 0){
-        this.$message.error('导管打折未填')
-      }else if(this.predialysis.catheter == '' || (this.predialysis.catheter ? this.predialysis.catheter.indexOf('穿刺口') == -1 : false)){
-        this.$message.error('穿刺口未填')
-      }else if(this.predialysis.catheter == '' || (this.predialysis.catheter ? this.predialysis.catheter.indexOf('导管吸壁') == -1 : false)){
-        this.$message.error('导管吸壁未填')
-      }else if(this.afterdialysis.cvc_a == 0){
-        this.$message.error('容量A未填')
-      }else if(this.afterdialysis.cvc_v == 0){
-        this.$message.error('容量V未填')
-      }else if(this.prescription.dialysis_duration_hour == 0 && this.prescription.dialysis_duration_minute == 0){
-        this.$message.error('透析时间未填')
-      }else if(this.prescription.blood_flow_volume == 0){
-        this.$message.error('血流量未填')
-      }else if(this.predialysis.weight_before == 0){
-        this.$message.error('透前体重未填')
-      }else if(this.predialysis.dry_weight == 0){
-        this.$message.error('干体重未填')
-      }else if(this.prescription.target_ultrafiltration == 0){
-        this.$message.error('目标超滤量未填')
-      }else if(this.prescription.anticoagulant == 0){
-        this.$message.error('抗凝剂未填')
-      }else if(this.prescription.dialysate_formulation_name == ""){
-        this.$message.error('透析液配方未填')
-      }else if(this.prescription.mode_id == ""){
-        this.$message.error('透析模式未填')
-      }else if(this.prescription.replacement_total == "" && this.prescription.mode_id == 2){
-        this.$message.error('置换量未填')
-      }else if(this.prescription.dialyzer_perfusion_apparatus == ""){
-        this.$message.error('透析器或灌流器未填')
-      }else if(this.prescription.prescription_doctor == 0 && this.prescription.creater == 0){
-        this.$message.error('医生签名未填')
-      }else if(this.dialysisOrder.puncture_nurse == 0){
-        this.$message.error('上机护士未填')
-      }else if(this.dialysisOrder != null && ((this.dialysisOrder.puncture_nurse == this.check.modifier && this.check.creater == 0) || (this.check.modifier == 0 && this.check.creater == 0))){
-        this.$message.error('核对护士未填')
+        const obj='入院方式'
+        checkdata.push(obj)
+      } if(this.receiverTreatmentAccess.consciousness == 0){
+        const obj0='意识'
+        checkdata.push(obj0)
+      } if(this.predialysis.temperature == 0){
+        const obj1='透前体温'
+        checkdata.push(obj1)
+      } if(this.predialysis.is_hemorrhage == 0){
+        const obj2='出血'
+        checkdata.push(obj2)
+      } if(this.predialysis.is_hemorrhage == 1 && this.predialysis.hemorrhage == "") {
+        const obj3 = '出血选项'
+        checkdata.push(obj3)
+      } if(this.predialysis.blood_access_part_opera_name == ''){
+        const obj4 = '血管通路'
+        checkdata.push(obj4)
+      } if(this.predialysis.puncture_way == ''){
+        const obj5 = '穿刺方法'
+        checkdata.push(obj5)
+      } if(this.predialysis.internal_fistula == ''){
+        const obj6 = '内瘘震颤'
+        checkdata.push(obj6)
+      } if(this.predialysis.internal_fistula_skin == ''){
+        const obj7 = '内瘘皮肤'
+        checkdata.push(obj7)
+      } if(this.predialysis.puncture_needle == ''){
+        const obj8 = '针型'
+        checkdata.push(obj8)
+      } if(this.predialysis.systolic_blood_pressure == 0 || this.predialysis.diastolic_blood_pressure == 0){
+        const obj9 = '透前血压'
+        checkdata.push(obj9)
+      } if(this.predialysis.catheter == '' || (this.predialysis.catheter ? this.predialysis.catheter.indexOf('置管') == -1 : false)){
+        const obj10 = '置管'
+        checkdata.push(obj10)
+      } if(this.predialysis.blood_access_part_id == ''){
+        const obj11 = '血管通路部位'
+        checkdata.push(obj11)
+      } if(this.predialysis.catheter_bend == 0){
+        const obj12 = '导管打折'
+        checkdata.push(obj12)
+      } if(this.predialysis.catheter == '' || (this.predialysis.catheter ? this.predialysis.catheter.indexOf('穿刺口') == -1 : false)){
+        const obj13 = '穿刺口'
+        checkdata.push(obj13)
+      } if(this.predialysis.catheter == '' || (this.predialysis.catheter ? this.predialysis.catheter.indexOf('导管吸壁') == -1 : false)){
+        const obj14 = '导管吸壁'
+        checkdata.push(obj14)
+      } if(this.afterdialysis.cvc_a == 0){
+        const obj15 = '容量A'
+        checkdata.push(obj15)
+      } if(this.afterdialysis.cvc_v == 0){
+        const obj16 = '容量V'
+        checkdata.push(obj16)
+      } if(this.prescription.dialysis_duration_hour == 0 && this.prescription.dialysis_duration_minute == 0){
+        const obj17 = '透析时间'
+        checkdata.push(obj17)
+      } if(this.prescription.blood_flow_volume == 0){
+        const obj18 = '血流量'
+        checkdata.push(obj18)
+      } if(this.predialysis.weight_before == 0){
+        const obj19 = '透前体重'
+        checkdata.push(obj19)
+      } if(this.predialysis.dry_weight == 0){
+        const obj20 = '干体重'
+        checkdata.push(obj20)
+      } if(this.prescription.target_ultrafiltration == 0){
+        const obj21 = '目标超滤量'
+        checkdata.push(obj21)
+      } if(this.prescription.anticoagulant == 0){
+        const obj22 = '抗凝剂'
+        checkdata.push(obj22)
+      } if(this.prescription.dialysate_formulation_name == ""){
+        const obj23 = '透析液配方'
+        checkdata.push(obj23)
+      } if(this.prescription.mode_id == ""){
+        const obj24 = '透析模式'
+        checkdata.push(obj24)
+      } if(this.prescription.replacement_total == "" && this.prescription.mode_id == 2){
+        const obj25 = '置换量'
+        checkdata.push(obj25)
+      } if(this.prescription.dialyzer_perfusion_apparatus == ""){
+        const obj26 = '透析器或灌流器'
+        checkdata.push(obj26)
+      } if(this.prescription.prescription_doctor == 0 && this.prescription.creater == 0){
+        const obj27 = '医生签名'
+        checkdata.push(obj27)
+      } if(this.dialysisOrder.puncture_nurse == 0){
+        const obj28 = '上机护士'
+        checkdata.push(obj28)
+      } if(this.dialysisOrder != null && ((this.dialysisOrder.puncture_nurse == this.check.modifier && this.check.creater == 0) || (this.check.modifier == 0 && this.check.creater == 0))){
+        const obj29 = '核对护士'
+        checkdata.push(obj29)
       }else if(this.dialysisOrder != null && ((this.dialysisOrder.puncture_nurse == this.check.creater && this.check.modifier == 0) || (this.check.modifier == 0 && this.check.creater == 0))){
-        this.$message.error('核对护士未填')
-      }else if(this.afterdialysis.actual_treatment_hour == 0 && this.afterdialysis.actual_treatment_minute == 0){
-        this.$message.error('实际治疗时间未填')
-      }else if(this.afterdialysis.actual_ultrafiltration == 0){
-        this.$message.error('实际超滤量未填')
-      }else if(this.afterdialysis.weight_after == 0){
-        this.$message.error('透后体重未填')
-      }else if(this.afterdialysis.cruor == ""){
-        this.$message.error('透析器堵塞未填')
-      }else if(this.afterdialysis.puncture_point_oozing_blood == 0){
-        this.$message.error('拔针后穿刺点渗血未填')
-      }else if(this.afterdialysis.puncture_point_haematoma == 0){
-        this.$message.error('穿刺处血肿未填')
-      }else if(this.afterdialysis.internal_fistula == ""){
-        this.$message.error('压迫后内瘘震颤未填')
-      }else if(this.afterdialysis.sealing_fluid_dispose == ""){
-        this.$message.error('封管液配置未填')
-      }else if(this.afterdialysis.complication == ""){
-        this.$message.error('并发症未填')
-      }else if(this.summary.dialysis_summary == ""){
-        this.$message.error('透析小结未填')
-      }else if(this.afterdialysis.patient_gose == 0){
-        this.$message.error('患者去向未填')
-      }else if(this.dialysisOrder.start_nurse == 0){
-        this.$message.error('当班责任护士未填')
-      }else if(this.dialysisOrder.finish_nurse == 0){
-        this.$message.error('下机护士和护士签名未填')
-      }else if(this.tableAdvice.length > 0 || this.monitors.length > 0){
-        let num = 0
-        if(this.monitors.length > 0){
-          this.monitors.map(item => {
-            if(item.id > 0 && item.operate_time){
-              this.users.map(it => {
-                if(it.id == item.monitoring_nurse){
-                  if(it.user_type == 2){
-                    num++
-                    this.$message.closeAll()
-                    this.$message.error('存在不是护士保存的监测')
-                  }
-                }
-              })
-            }
-          })
+        const obj29 = '核对护士'
+        checkdata.push(obj29)
+      } if(this.afterdialysis.actual_treatment_hour == 0 && this.afterdialysis.actual_treatment_minute == 0){
+        const obj30 = '实际治疗时间'
+        checkdata.push(obj30)
+      } if(this.afterdialysis.actual_ultrafiltration == 0){
+        const obj31 = '实际超滤量'
+        checkdata.push(obj31)
+      } if(this.afterdialysis.weight_after == 0){
+        const obj32 = '透后体重'
+        checkdata.push(obj32)
+      } if(this.afterdialysis.cruor == ""){
+        const obj33 = '透析器堵塞'
+        checkdata.push(obj33)
+      } if(this.afterdialysis.puncture_point_oozing_blood == 0){
+        const obj34 = '拔针后穿刺点渗血'
+        checkdata.push(obj34)
+      } if(this.afterdialysis.puncture_point_haematoma == 0){
+        const obj35 = '穿刺处血肿'
+        checkdata.push(obj35)
+      } if(this.afterdialysis.internal_fistula == ""){
+        const obj36 = '压迫后内瘘震颤'
+        checkdata.push(obj36)
+      } if(this.afterdialysis.sealing_fluid_dispose == ""){
+        const obj37 = '封管液配置'
+        checkdata.push(obj37)
+      } if(this.afterdialysis.complication == ""){
+        const obj38 = '并发症'
+        checkdata.push(obj38)
+      } if(this.summary.dialysis_summary == ""){
+        const obj39 = '透析小结'
+        checkdata.push(obj39)
+      } if(this.afterdialysis.patient_gose == 0){
+        const obj40 = '患者去向'
+        checkdata.push(obj40)
+      } if(this.dialysisOrder==null || this.dialysisOrder.start_nurse == 0){
+        const obj41 = '当班责任护士'
+        checkdata.push(obj41)
+      } if(this.dialysisOrder==null || this.dialysisOrder.finish_nurse == 0){
+        const obj42 = '下机护士'
+        checkdata.push(obj42)
+      } if(this.monitors.length > 0){
+        for(let i in this.monitors){
+          if(this.monitors[i].systolic_blood_pressure=='' || this.monitors[i].diastolic_blood_pressure==''){
+            const obj43='监测第'+((i*1)+1)+'行血压'
+            checkdata.push(obj43)
+          }
+          if(this.monitors[i].pulse_frequency==''){
+            const obj44='监测第'+((i*1)+1)+'行脉搏'
+            checkdata.push(obj44)
+          }
+          if(this.monitors[i].breathing_rate==''){
+            const obj45='监测第'+((i*1)+1)+'行呼吸'
+            checkdata.push(obj45)
+          }
+          if(this.monitors[i].blood_flow_volume==''){
+            const obj46='监测第'+((i*1)+1)+'行血流量'
+            checkdata.push(obj46)
+          }
+          if(this.monitors[i].ultrafiltration_volume==''){
+            const obj47='监测第'+((i*1)+1)+'行超滤量'
+            checkdata.push(obj47)
+          }
+          if(this.monitors[i].venous_pressure==''){
+            const obj48='监测第'+((i*1)+1)+'行静脉压'
+            checkdata.push(obj48)
+          }
+          if(this.monitors[i].transmembrane_pressure==''){
+            const obj49='监测第'+((i*1)+1)+'行TMP'
+            checkdata.push(obj49)
+          }
+          if(this.monitors[i].conductivity==''){
+            const obj50='监测第'+((i*1)+1)+'行电导度'
+            checkdata.push(obj50)
+          }
+          if(this.monitors[i].dialysate_temperature==''){
+            const obj51='监测第'+((i*1)+1)+'行液温'
+            checkdata.push(obj51)
+          }
         }
-        if(this.tableAdvice.length > 0){
-          this.tableAdvice.map(item => {
-            if(item.id > 0 && (item.created_time || item.start_time)){
-              this.users.map(it => {
-                if(it.id == item.advice_doctor){
-                  if(it.user_type == 3){
-                    num++
-                    this.$message.closeAll()
-                    this.$message.error('存在不是医生保存的医嘱')
-                  }else if(it.id == item.execution_staff && item.execution_staff > 0){
-                    if(it.user_type == 2){
-                      num++
-                      this.$message.closeAll()
-                      this.$message.error('存在不是护士执行的医嘱')
-                    }
-                  }else if(it.id == item.checker && item.checker > 0){
-                    if(it.user_type == 2){
-                      num++
-                      this.$message.closeAll()
-                      this.$message.error('存在不是护士核对的医嘱')
-                    }
-                  }
-                }else if(it.id == item.execution_staff && item.execution_staff > 0){
-                  if(it.user_type == 2){
-                    num++
-                    this.$message.closeAll()
-                    this.$message.error('存在不是护士执行的医嘱')
-                  }
-                }else if(it.id == item.checker && item.checker > 0){
-                  if(it.user_type == 2){
-                    num++
-                    this.$message.closeAll()
-                    this.$message.error('存在不是护士核对的医嘱')
-                  }
-                }
-              })
+      } if(this.tableAdvice.length > 0){
+        this.tableAdvice.map((item) =>{
+          if(item.id > 0 && (item.created_time || item.start_time)){
+            if(item.execution_staff ==0 || item.advice_doctor==0){
+              const obj52 = '执行人员,医生签名'
+              checkdata.push(obj52)
             }
+          }
         })
-        }
-        
-        if(num == 0){
-          this.$message.success('核对完成')
-        }
-      }else{
-        this.$message.success('核对完成')
       }
+      this.getcheckData(checkdata)
     },
     getNewAge(UUserCard) {
       if (UUserCard != null && UUserCard != '') {
@@ -1898,6 +1928,18 @@ export default {
           // checker: 0,
         }
       )
+    },
+    getcheckData(val){
+      if(val.length >0){
+        let message = `记录单未填数据:<br/>&nbsp;${val.join("<br/>&nbsp;")}`;
+        this.$alert(message, '提示', {
+          confirmButtonText: '确定',
+          type: 'warning',
+          dangerouslyUseHTMLString: true,
+        });
+      }else{
+        this.$message.success('核对完成')
+      }
     }
   },
   watch: {

src/xt_pages/dialysis/template/DialysisPrintOrdereightyfour.vue

@@ -278,7 +278,7 @@
                 <td>{{ advice.delivery_way }}</td>
                 <td>{{ getTime(advice.execution_time, "{y}-{m}-{d} {h}:{i}") }}</td>
                 <td style="height:30px;line-height:30px">
-                  杨能华/
+                  <span v-if="advice.start_time>0">杨能华/</span>
                   <span v-if="setAdminUserES(advice.advice_doctor) == ''">
                     {{ getAdminUser(advice.advice_doctor)}}
                   </span>

src/xt_pages/dialysis/template/DialysisPrintOrdereightythree.vue

@@ -244,6 +244,8 @@
                   showValue="临时(颈、股)静脉导管"></label-box>&nbsp;
                 <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('人造血管') != -1 ? true : false"
                   showValue="人造血管"></label-box>&nbsp;
+                  <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('股静脉') != -1 ? true : false"
+                  showValue="股静脉"></label-box>&nbsp;
                 其他:
                 <div style="display: inline-block;" 
                   v-if="predialysis.blood_access_part_opera_name.indexOf('内瘘') == -1 &&

src/xt_pages/dialysis/template/DialysisPrintOrdereightytwo.vue

@@ -7,7 +7,7 @@
         class="dialysis-print-order print-template-two print_page_main_content"
       >
 
-        <div style="display:inline-block;width:100%;text-align:center;">
+        <div style="display:inline-block;width:99%;text-align:center;">
           <div
             class="order-title"
             style="letter-spacing: 0;font-weight:600;font-size:22px;display:inline-block;"
@@ -15,7 +15,7 @@
           {{ orgname }} 血液净化治疗记录单
           </div>
         </div>
-        <div class="row">
+        <div class="row" style="width: 99%;">
           <div class="inline_block" style="margin-right:10px;">
               日期 <div class="inline_block under_line" style="width:50px">{{ queryParams.xtdate.slice(0,4) }}</div>年
               <div class="inline_block under_line" style="width:50px">{{ queryParams.xtdate.slice(5,7) }}</div>月
@@ -50,7 +50,7 @@
           </div>
         </div>
         <div style="border-bottom: 2px solid #000;width:100%;"></div>
-        <div class="row">
+        <div class="row" style="width: 99%;">
             <div class="inline_block" style="margin-right:30px;">
               血液净化方式
               <div class="under_line" style="width: 100px;text-align: center;font-weight:600;">
@@ -67,9 +67,6 @@
                       : ""
                   }}
                 </span> -->
-
-
-
                 <span v-if="prescription.dialysis_dialyszers !=''">
                   {{
                     prescription.dialysis_dialyszers
@@ -115,8 +112,6 @@
           
           
         </div>
-
-        
         <div class="row">
           抗凝药物&nbsp;&nbsp;
           <div class="inline_block under_line" style="width:90%;text-align: left;">
@@ -288,14 +283,14 @@
           </div>
         </div>
 
-        <table class="print-table" border="1">
+        <table class="print-table" border="1" style="width: 99%;">
           <tr>
-            <td style="height:25px;line-height:25px">时间</td>
-            <td>医嘱</td>
-            <td>医师签名</td>
-            <td>执行时间</td>
-            <td>执行者签名</td>
-            <td>核对者签名</td>
+            <td width="10%" style="height:25px;line-height:25px;">时间</td>
+            <td width="45%">医嘱</td>
+            <td width="10%">医师签名</td>
+            <td width="10%">执行时间</td>
+            <td width="10%">执行者签名</td>
+            <td width="10%">核对者签名</td>
           </tr>
           <tr v-for="(advice, advice_index) in tableAdvice" :key="advice_index">
             <td style="height:25px;line-height:25px">{{ getTime(advice.start_time, "{y}-{m}-{d} {h}:{i}") }}</td>
@@ -347,7 +342,7 @@
           </tr>
         </table>
 
-        <table class="print-table" border="1">
+        <table class="print-table" border="1" style="width: 99%;">
           <tbody>
               <tr style="line-height:20px;">
                 <td width="60">时间</td>
@@ -364,8 +359,8 @@
                 <td width="40">UF/hr<br/>ml/h</td>
                 <td width="200">病情变化处理方式及结果</td>
               </tr>
-              <tr v-for="monitor in monitors" :key="monitor.id">
-                <td style="height:35px;line-height:35px">&nbsp;
+              <tr v-for="monitor in monitors" :key="monitor.id" >
+                <td style="height:35px;line-height:35px">
                   {{getTime(monitor.operate_time,'{h}:{i}')}}
                 </td>
                 <td>
@@ -390,10 +385,10 @@
                   </span>
                 </td>
                 <td>&nbsp;{{monitor.transmembrane_pressure?monitor.transmembrane_pressure:''}}</td>
-                <td>&nbsp;{{monitor.conductivity?monitor.conductivity:''}}</td>
-                <td>&nbsp;{{monitor.dialysate_temperature ? monitor.dialysate_temperature : ''}}</td>
+                <td>{{monitor.conductivity?monitor.conductivity:''}}</td>
+                <td>{{monitor.dialysate_temperature ? monitor.dialysate_temperature : ''}}</td>
                 <!-- <td>&nbsp; <span v-if="monitor.operate_time"> {{ monitor.dialysate_flow ? monitor.dialysate_flow : "" }} </span></td> -->
-                <td>&nbsp;
+                <td>
                   <span v-if="monitor.ultrafiltration_rate !=''">
                     {{monitor.ultrafiltration_rate?monitor.ultrafiltration_rate:''}}
                   </span>
@@ -401,16 +396,16 @@
                     0
                   </span>
                 </td>
-                <td>
+                <td style="line-height: 20px;">
                   <span v-if="monitor.symptom"> {{ monitor.symptom }} </span>
-                  <span v-if="monitor.dispose"> {{ "  " + monitor.dispose }} </span>
+                  <span v-if="monitor.dispose">{{ "  " + monitor.dispose }} </span>
                   <span v-if="monitor.result"> {{ "  " + monitor.result }} </span>
                 </td>
               </tr>
           </tbody>
         </table>
 
-        <table class="print-table" border="1">
+        <table class="print-table" border="1" style="width: 99%;">
           <tbody>
             <tr style="height:30px;line-height:30px">
               <td width="30" rowspan="4" style="padding-left:5px;border:none;border-right:1px solid #000;">
@@ -565,7 +560,7 @@
           </tbody>
         </table>
 
-        <table class="print-table" border="1">
+        <table class="print-table" border="1" style="width: 99%;">
           <tr style="line-height:25px;text-align:left;border:none;">
             <td style="padding-left:5px;border:none">
                 <div style="padding-bottom:10px;">
@@ -1968,7 +1963,7 @@ export default {
   /* text-align: center; */
   font-size: 16px;
   padding: 5px 8px;
-  line-height: 30px;
+  /* line-height: 30px; */
 }
 
 .print_page_main_content .proj_table .inside_table {