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

src/xt_pages/dialysis/details/index.vue

           @click="next"
           >下一位</el-button
         >
-        <!-- <el-button
+        <el-button
           size="small"
           type="primary"
           @click="printOrderOne"
           icon="el-icon-printer"
-          >打印上机单</el-button> -->
+          >打印上机单</el-button>
 
         <el-button
           size="small"
         <div class="print_main_content">
           <div class="table_panel">
              <div v-for="(main_collection,index) in printList" :key="index">
-              <div class="signPrint" style="font-size:16px;">
+              <div class="signPrint" style="width: 360px;font-size:16px;">
                 <div style="margin-left:50px;">姓名:
                   <span>{{main_collection.patient.name}} </span>
                   （{{ main_collection.patient.dialysis_no }}，{{ main_collection.patient.age }}岁）
                 </div>
-                <div class="printCell">
-                  <span>
+                <div class="printCell" style="display:flex;justify-content: space-around;">
+                  <span style="display: block;width: 50%;">
                     床号：{{ main_collection.number.number }}
                     <span style="width:auto;" v-if="main_collection.schedule_type == 1">上午</span>
                     <span style="width:auto;" v-if="main_collection.schedule_type == 2">下午</span>
                     <span style="width:auto;" v-if="main_collection.schedule_type == 3">晚上</span>
                   </span>
-                  <span>{{ printDate }}</span>
+                  <span style="display: block;width: 50%;">{{ printDate }}</span>
                 </div>
-                <div class="printCell">
-                   <span>干体重：{{main_collection.assessmentbefor.dry_weight}}Kg</span>
-                    <span>抗凝剂：{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name : ''}}</span>
+                <div class="printCell" style="display:flex;justify-content: space-around;">
+                   <span style="display: block;width: 50%;">干体重：{{main_collection.assessmentbefor.dry_weight}}Kg</span>
+                    <span style="display: block;width: 50%;">抗凝剂：{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name : ''}}</span>
 
                 </div>
-                <div class="printCell">
-                  <span>净重值：{{ main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.additional_weight }}Kg</span>
-                  首剂：<span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_shouji}} mg</span>
+                <div class="printCell" style="display:flex;justify-content: space-around;">
+                  <span style="display: block;width: 50%;">净重值：{{ main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.additional_weight }}Kg</span>
+                  
+                  <span style="display: block;width: 50%;">
+                    首剂： <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_shouji}} mg</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 2">
                     {{main_collection.dialysissolution.anticoagulant_shouji}}mg
                   </span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">
                     {{main_collection.dialysissolution.anticoagulant_shouji}}iu
                    </span>
+                    </span> 
+                 
                 </div>
-                <div class="printCell">
-                  <span>体重增加：{{ (main_collection.assessmentbefor.weight_before - assessmentAfterDislysis.weight_after).toFixed(2) }}Kg</span>
-                 维持：{{main_collection.dialysissolution.anticoagulant_weichi}}
+                <div class="printCell" style="display:flex;justify-content: space-around;">
+                  <span style="display: block;width: 50%;">体重增加：{{ (main_collection.assessmentbefor.weight_before - assessmentAfterDislysis.weight_after).toFixed(2) }}Kg</span>
+                 <span style="display: block;width: 50%;">
+                     维持：{{main_collection.dialysissolution.anticoagulant_weichi}}
                    <span v-if="main_collection.dialysissolution.anticoagulant == 1">
                     mg/h
                   </span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">
                     iu/h
                    </span>
+                  </span>
+                
                 </div>
-                <div class="printCell">
-                  <span>处方脱水量：{{ main_collection.prescription.target_ultrafiltration }}L</span>
-                 总量：{{main_collection.dialysissolution.anticoagulant_zongliang}}
+                <div class="printCell" style="display:flex;justify-content: space-around;">
+                  <span style="display: block;width: 50%;">处方脱水量：{{ main_collection.prescription.target_ultrafiltration }}L</span>
+                  <span style="display: block;width: 50%;">
+                    总量：{{main_collection.dialysissolution.anticoagulant_zongliang}}
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">
                     mg
                   </span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">
                    iu
                    </span>
+                  </span>
                 </div>
               </div>
             </div>
         })
       },
     getInitPrintData(){
+      this.startVisibility = true
        var params = {
          patient_id:this.$route.query.patient_id,
          record_date:this.$route.query.date,

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

 <template>
   <div id="dialysis-print-box" style="position: relative">
     <div class="dialysis-print-order">
-      <table class="dialysis-print-order">
-        <thead style="transform: translateY(3px);">
+      <table class="print-table">
+        <thead style="transform: translateY(2px)">
           <tr>
             <td>
               <div class="order-yy-name">{{ orgname }}</div>
           </tr>
         </thead>
         <tbody>
-          <tr>
+          <tr style="transform: translateY(2px);">
             <td>
               <table class="print-table" border="1">
                 <tbody>
-                  <!-- <tr>
-                    <td width="80" colspan="11" style="text-align: center">
-                      治 疗 日 期:&nbsp;<span>{{ queryParams.xtdate }}</span>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td colspan="11" style="padding-left: 10px">
-                      <div class="list_table">
-                        <div>姓 名:&nbsp;{{ patientInfo.name }}</div>
-                        <div>
-                          性别：{{ patientInfo_gender_1 == true ? "男" : "女" }}
-                        </div>
-                        <div>年龄：{{ getoldAge() }}</div>
-                        <div>透析机号:&nbsp;{{ getNumber() }}</div>
-                      </div>
-                    </td>
-                  </tr> -->
                   <tr class="list_table_1">
                     <td colspan="11" style="padding-left: 10px">
                       <div style="display: flex">
                   </tr>
                 </tbody>
               </table>
-
+            </td>
+          </tr>
+          <tr style="transform: translateY(1px)">
+            <td>
               <table class="print-table" border="1">
                 <tr style="text-align: center">
                   <td colspan="15" style="margin-left: 15px; font-size: 20px">
                   </td>
                 </tr>
               </table>
-
+            </td>
+          </tr> 
+          <tr style="transform: translateY(3px);">
+            <td>
               <table class="print-table" border="1" style="text-align: center">
-                <tbody>
-                  <tr class="yizhu">
-                    <td style="width: 20px; height: 20px">
+                  <tr>
+                    <td style="height: 20px" width="50">
                       <p style="height: 20px; line-height: 20px">时间</p>
                     </td>
-                    <td style="width: 200px; height: 20px">
+                    <td style="height: 20px" width="490">
                       <p style="height: 20px; line-height: 20px">
                         医嘱执行记录
                       </p>
                     </td>
-                    <td style="width: 35px; height: 20px">
+                    <td style="height: 20px" width="85">
                       <p style="height: 20px; line-height: 20px">执行</p>
                     </td>
-                    <td style="width: 35px; height: 20px">
+                    <td style=" height: 20px" width="85"> 
                       <p style="height: 20px; line-height: 20px">核对</p>
                     </td>
-                    <td style="width: 60px; height: 20px">
+                    <td style="height: 20px" width="145">
                       <p style="height: 20px; line-height: 20px">
                         上次透后体重
                       </p>
                     </td>
-                    <td style="width: 45px; height: 20px">
+                    <td style="height: 20px">
                       {{
                         patientInfo.total_dialysis +
                           patientInfo.user_sys_before_count >
                       }}kg
                     </td>
                   </tr>
-
-                  <tr v-for="(advice, advice_index) in advices">
-                    <td>{{ getTime(advice.start_time, "{h}:{i}") }}</td>
-                    <td style="text-align: left; padding-left: 5px">
+              </table>
+            </td>
+          </tr> 
+          <tr v-for="(advice, advice_index) in advices" :key="advice_index">
+            <td>
+              <table class="print-table" border="1">
+                <tr>
+                  <td width="50">{{ getTime(advice.start_time, "{h}:{i}") }}</td>
+                  <td style="text-align: left; padding-left: 5px" width="485">
                       <span v-if="advice.parent_id > 0">---></span>
                       <span>{{ advice.advice_name }}</span>
                       <span v-if="advice && advice.advice_desc"
                         >{{ advice.single_dose
                         }}{{ advice.single_dose_unit }}</span
                       >
+
                       <span v-if="advice.parent_id == 0">{{
                         advice.delivery_way
                       }}</span>
                         advice.execution_frequency
                       }}</span>
                       <span>{{ advice.remark }}</span>
-                    </td>
-
-                    <td style="line-height: 30px">
+                    </td> 
+                    <td style="line-height: 30px" width="85">
                       <span
                         v-if="setAdminUserES(advice.execution_staff) == ''"
                         >{{ getAdminUser(advice.execution_staff) }}</span
                         v-else
                       />
                     </td>
-                    <td style="line-height: 30px">
+                    <td style="line-height: 30px" width="85">
                       <span v-if="setAdminUserES(advice.checker) == ''">{{
                         getAdminUser(advice.checker)
                       }}</span>
                       />
                     </td>
 
-                    <td v-if="advice_index === 0">透前体重:</td>
+                    <td v-if="advice_index === 0" width="145">透前体重:</td>
                     <td v-if="advice_index === 0">
                       {{
                         patientInfo.total_dialysis +
                           : "/"
                       }}kg
                     </td>
-                    <td v-if="advice_index === 1">体重增加量:</td>
+                    <td v-if="advice_index === 1" width="145">体重增加量:</td>
                     <td v-if="advice_index === 1">
                       {{
                         patientInfo.total_dialysis +
                           : "/"
                       }}kg
                     </td>
-                    <td v-if="advice_index === 2">干体重(DW):</td>
+                    <td v-if="advice_index === 2" width="145">干体重(DW):</td>
                     <td v-if="advice_index === 2">
                       {{
                         patientInfo.total_dialysis +
                           : "/"
                       }}kg
                     </td>
-                    <td v-if="advice_index === 3">较干体重增加量:</td>
+                    <td v-if="advice_index === 3" width="145">较干体重增加量:</td>
                     <td v-if="advice_index === 3">
                       {{
                         patientInfo.total_dialysis +
                           : "/"
                       }}kg
                     </td>
-                    <td v-if="advice_index === 4">净脱水量:</td>
+                    <td v-if="advice_index === 4" width="145">净脱水量:</td>
                     <td v-if="advice_index === 4">
                       {{
                         patientInfo.total_dialysis +
                           : "/"
                       }}ml
                     </td>
-                    <td v-if="advice_index === 5">透后体重:</td>
+                    <td v-if="advice_index === 5" width="145">透后体重:</td>
                     <td v-if="advice_index === 5">
                       {{
                         patientInfo.total_dialysis +
                           : "/"
                       }}kg
                     </td>
-                    <td v-if="advice_index === 6">本次透析体重下降量:</td>
+                    <td v-if="advice_index === 6" width="145">本次透析体重下降量:</td>
                     <td v-if="advice_index === 6">
                       {{
                         patientInfo.total_dialysis +
                           : "/"
                       }}kg
                     </td>
+                    <td v-if="advice_index > 6" width="145"></td>
                     <td v-if="advice_index > 6"></td>
-                    <td v-if="advice_index > 6"></td>
-                  </tr>
-                </tbody>
+
+
+                </tr>
               </table>
+            </td>
+            
+          </tr>
+        
+          <tr style="transform: translateY(-4px)">
+            <td>
               <table class="print-table" border="1">
                 <tr style="height: 50px; text-align: left">
                   <td style="padding-left: 5px; border-bottom: none">
           this.monitors = response.data.data.monitors;
           this.summary = response.data.data.summary;
           this.org_template_info = response.data.data.org_template_info;
+          console.log(this.advices, "this.advices");
           if (this.monitors.length <= 0) {
             var nl = 8 - this.monitors.length;
             for (let index = 0; index < nl; index++) {
           }
 
           var tableAdvice = this.advices;
-          console.log("医生", tableAdvice);
+          // console.log("医生", tableAdvice);
           if (tableAdvice.length === 0) {
             var obj = { advice_name: "", start_time: "" };
             var obj1 = { advice_name: "", start_time: "" };
 
           this.loading = false;
 
-          this.doctor_advices =
-            response.data.data.advices == null
-              ? []
-              : response.data.data.advices;
+          // this.doctor_advices =
+          //   response.data.data.advices == null
+          //     ? []
+          //     : response.data.data.advices;
 
-          for (let index = 0; index < this.doctor_advices.length; index++) {
-            this.doctor_advices[index]["isShow"] = 2;
-          }
+          // for (let index = 0; index < this.doctor_advices.length; index++) {
+          //   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,
-                };
-                doctor_advice["isShow"] = 1;
-                this.doctor_advices.splice(new_advice_index, 0, doctor_advice);
-                // this.doctor_advices.push(doctor_advice)
-              }
-            }
+          // 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,
+          //       };
+          //       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);
-            }
-          }
+          //   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);
+          //   }
+          // }
           console.log(this.advice_groups);
         } else {
           this.loading = false;

src/xt_pages/hospitalStation/invoiceTemplate/printTwo.vue

                   .substring(0, 1) != '拾' &&
                 zhongwen
                   .substring(this.zhongwen.indexOf('元') - 1)
-                  .substring(0, 1) != '佰'
+                  .substring(0, 1) != '佰' &&
+                  zhongwen
+                  .substring(this.zhongwen.indexOf('元') - 1)
+                  .substring(0, 1) != '仟'
               "
             >
               {{