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

src/xt_pages/dialysis/dialysisPrintOrder.vue

         '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
       const style2 =
         // 防止分页错位问题：table设置border: none；.tr设置page-break-inside:avoid; // 防止table数据太多，tr分页错乱 td设置border: 1px solid #000;// 防止部分分页的tr边框线没有
-        '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .print-table{border: none} .print-table tr{page-break-inside:avoid;} .print-table tr td{border: 1px solid #000;} .inside_table{border: none} .inside_table tr{page-break-inside:avoid;} .inside_table tr td{border: 1px solid #000;} .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 20px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;} .print_page_main_content .proj_table tbody tr{page-break-inside:avoid;} .print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}.table-box1 tr {border-bottom: 1px solid #000;} .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px} ';
+        '@media print {.dialysis-print-order{width:960px;margin:0 auto} .option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .print-table{border: none} .print-table tr{page-break-inside:avoid;} .print-table tr td{border: 1px solid #000;} .inside_table{border: none} .inside_table tr{page-break-inside:avoid;} .inside_table tr td{border: 1px solid #000;} .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 20px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;} .print_page_main_content .proj_table tbody tr{page-break-inside:avoid;} .print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}.table-box1 tr {border-bottom: 1px solid #000;} .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px} ';
       const style3 =
         '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:16px;border-color: #000;}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #000;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}.row {font-size: 16px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line {display: inline-block;border-bottom: 1px solid #000;text-align: center;white-space: nowrap; width: 50%;}';
       // const style3 =

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyNine.vue

                         }}
                       </div>
                       <span v-if="prescription.anticoagulant == 4">mg</span>
+                      <span v-if="prescription.anticoagulant == 6">iu</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="prescription.anticoagulant == 2">mg</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
+                      <span v-if="prescription.anticoagulant == 7">iu</span>
                     </div>
                     <div class="inline_block" style="margin-left: 20px">
                       维持：
                             : "0"
                         }}
                       </div>
+                      <span v-if="prescription.anticoagulant == 7">iu/h</span>
+                      <span v-if="prescription.anticoagulant == 6">iu/h</span>
                       <span v-if="prescription.anticoagulant == 5">ml/h</span>
                       <span v-if="prescription.anticoagulant == 4">mg/h</span>
                       <span v-if="prescription.anticoagulant == 3">iu/h</span>
                             : "/"
                         }}
                       </div>
+                      <span v-if="prescription.anticoagulant == 6">iu</span>
+                      <span v-if="prescription.anticoagulant == 7">iu</span>
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="prescription.anticoagulant == 2">mg</span>
                       <tr>
                         <td width="60">时间</td>
                         <td width="60">体温<br />(℃)</td>
-                        <td width="60">血压<br />(mmHg)</td>
+                        <td width="70">血压<br />(mmHg)</td>
                         <td width="50">脉搏<br />(次/分)</td>
                         <td width="50">呼吸<br />(次/分)</td>
                         <td width="50">血流量<br />(ml/min)</td>
                         :key="monindex"
                       >
                         <td>{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
+                        <td>
+                          {{ monitor.temperature ? monitor.temperature : "" }}
+                        </td>
                         <td>
                           {{
                             monitor.systolic_blood_pressure
                               : ""
                           }}
                         </td>
-                        <td>
-                          {{ monitor.temperature ? monitor.temperature : "" }}
-                        </td>
+                        
                         <td>
                           {{
                             monitor.pulse_frequency
         for (let index = 0; index < this.monitors.length; index++) {
           const monitor = this.monitors[index];
           this.monitors[index].end = "";
-          if (Object.keys(monitor).length > 0 && index >= 1) {
+          if (Object.keys(monitor).length > 0 && index > 1) {
             if (
               this.dialysisOrder &&
               monitor.operate_time == this.dialysisOrder.end_time
             ) {
               this.monitors[index].end = "【结束透析】";
-
               tempmonitorflag = false;
             }
-            if (tempmonitorflag == false && index == this.monitors.length - 1) {
+            if (tempmonitorflag && index == this.monitors.length - 1) {
               this.monitors[index].end = "【结束透析】";
             }
           }
           this.doctor_advices[index]["isShow"] = 2;
         }
 
-        // if (this.doctor_advices.length > 0) {
-        //   var group = this.newAdviceGroupObject()
-        //   var initGroupBlock = function(group, advice) {
-        //     group.group_no = advice.groupno
-        //   }
-        //   for (let index = this.doctor_advices.length - 1; index >= 0; index--) {
-        //     var new_advice_index = 0
-
-        //     if ('children' in this.doctor_advices[index] && this.doctor_advices[index].children.length > 0) {
-        //       new_advice_index = index + this.doctor_advices[index].children.length + 1
-
-        //       var doctor_advice = {
-        //         delivery_way: this.doctor_advices[index].delivery_way,
-        //         execution_frequency: this.doctor_advices[index].execution_frequency,
-        //         groupno: this.doctor_advices[index].groupno,
-        //         id: this.doctor_advices[index].id,
-        //         parent_id: this.doctor_advices[index].parent_id,
-        //         children: this.doctor_advices[index].children,
-        //         remark: this.doctor_advices[index].remark,
-        //         execution_staff: this.doctor_advices[index].execution_staff,
-        //         checker: this.doctor_advices[index].checker,
-        //         execution_time: this.doctor_advices[index].execution_time,
-        //         advice_doctor: this.doctor_advices[index].advice_doctor
-
-        //       }
-        //       doctor_advice['isShow'] = 1
-        //       this.doctor_advices.splice(new_advice_index, 0, doctor_advice)
-        //       // this.doctor_advices.push(doctor_advice)
-        //     }
-        //   }
-
-        //   for (let index = 0; index < this.doctor_advices.length; index++) {
-        //     const advice = this.doctor_advices[index]
-        //     if (advice.groupno == 0) {
-        //       // 老版本的医嘱没有分组的概念，所以这一个 if 是解决这个问题的，将每个无分组的医嘱各自归为一组
-        //       if (advice.parent_id > 0) {
-        //         if (this.advice_groups.length > 0) {
-        //           var parent_group = this.advice_groups[
-        //             this.advice_groups.length - 1
-        //           ]
-        //           if (parent_group.advices.length > 0) {
-        //             if (parent_group.advices[0].id == advice.parent_id) {
-        //               parent_group.advices.push(advice)
-        //             }
-        //           }
-        //         }
-        //         continue
-        //       } else {
-        //         if (group.group_no > 0) {
-        //           this.advice_groups.push(group)
-        //           group = this.newAdviceGroupObject()
-        //         }
-
-        //         initGroupBlock(group, advice)
-        //         group.advices.push(advice)
-        //         this.advice_groups.push(group)
-        //         group = this.newAdviceGroupObject()
-        //         continue
-        //       }
-        //     }
-
-        //     if (group.group_no > 0 && group.group_no != advice.groupno) {
-        //       this.advice_groups.push(group)
-        //       group = this.newAdviceGroupObject()
-        //     }
-        //     if (group.group_no == 0) {
-        //       initGroupBlock(group, advice)
-        //     }
-        //     if (group.group_no == advice.groupno) {
-        //       group.advices.push(advice)
-        //     }
-        //   }
-
-        //   if (group.group_no > 0) {
-        //     // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加上
-        //    this.advice_groups.push(group)
-        //   }
-        // }
         if (this.doctor_advices.length <= 6) {
           var nl = 6;
           this.print_length = 6;
           }
         }
 
-        if (this.org_id == 10330 || this.org_id == 0 || this.org_id == 9675) {
-          let newArr = [];
-          this.doctor_advices.forEach((o) => {
-            if (o.delivery_way && o.delivery_way != "") {
-              if (o.delivery_way.indexOf("注射") > -1) {
-                newArr.push(o);
-              }
-            }
-          });
-          this.doctor_advices = newArr;
-        }
-
         this.totollength = this.doctor_advices.length + this.monitors.length;
         if (this.totollength > 18) {
-          var temp_advice_length = 17 - this.monitors.length;
+          var temp_advice_length = 14 - this.monitors.length;
           var doctor_advices_1 = [];
           var doctor_advices_2 = [];
           for (let index = 0; index < this.doctor_advices.length; index++) {
       }
       // })
     },
-
     bloodAccessParOperaName(id) {
       if (id in this.bloodAccessParOpera) {
         return this.bloodAccessParOpera[id].name;

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyOne.vue

                     <div class="inline_block" style="flex:1;">
                       透析器/灌流器：
                       <div class="under_line" style="width: 100px;text-align: center">
-                        {{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "" }}
-                        {{prescription.dialysis_dialyszers?prescription.dialysis_dialyszers:"/"}}
+                        {{ prescription.dialysis_dialyszers ? prescription.dialysis_dialyszers : "" }}&nbsp;&nbsp;
+                        {{prescription.dialysis_irrigation?prescription.dialysis_irrigation:""}}
                       </div>
                     </div>
                     <div class="inline_block" style="flex:1;" v-if="org_id == 9538">
                       </tr>
                       <tr>
                         <td width="60">时间</td>
-                        <td width="60">血压<br />(mmHg)</td>
+                        <td width="70">血压<br />(mmHg)</td>
                         <td width="60">体温<br />(°C)</td>
                         <td width="50">脉搏<br />(次/分)</td>
                         <td width="50">呼吸<br />(次/分)</td>

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

                         >
                           置换量<br />(L)
                         </td>
-                        <td width="200">病情变化及处理</td>
+                        <td width="210">病情变化及处理</td>
 
                         <!-- <td width="100">时间</td>
                     <td width="30">T<br>C°</td>