Merge branches '2022-10-17_vue_schedule_branch' and '20220812' of http://git.shengws.com/csx/Vue_New into 20220812

src/router/modules/dialysis.js

@@ -480,7 +480,7 @@ export default {
       }
     },
     {
-      path: '/dialysis/print/batch/twentyFive',
+      path: '/dialysis/print/batch/twentyFive',                            
       component: () =>
         import('@/xt_pages/dialysis/batch_print/batch_print_order_twentyFive'),
       hidden: true,
@@ -491,6 +491,18 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/print/batch/twentySeven',
+      component: () =>
+      import('@/xt_pages/dialysis/batch_print/batch_print_order_twentySeven'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysis_batch_twentySeven',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/print/batch/twentyEight',
       component: () =>

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -219,6 +219,16 @@
           >批量打印</el-button
         >
       </template>
+      <template v-if="this.template_id == 27">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button
+        >
+      </template>
       <template v-if="this.template_id == 28">
         <el-button
           size="small"
@@ -962,7 +972,9 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/twentyTwo" });
       } else if (this.template_id == 25) {
         this.$router.push({ path: "/dialysis/print/batch/twentyFive" });
-      }else if(this.template_id == 28){
+      }else if (this.template_id == 27) {
+        this.$router.push({ path: "/dialysis/print/batch/twentySeven" });
+      } else if(this.template_id == 28){
          this.$router.push({path:"/dialysis/print/batch/twentyEight"})
       } else if (this.template_id == 30) {
         this.$router.push({ path: "/dialysis/print/batch/thirty" });

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -760,7 +760,7 @@
       </template>
       <template
         v-if="
-          org_template_info.template_id == 61
+          org_template_info.template_id == 61||org_template_info.template_id == 63
         "
       >
         <el-button
@@ -1220,6 +1220,10 @@
           v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 62">
           </DialysisPrintOrderSixtyTwo>
+          <DialysisPrintOrderSixtyThree
+          v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 63">
+          </DialysisPrintOrderSixtyThree>
         </div>
       </el-container>
     </div>
@@ -1300,9 +1304,11 @@ import DialysisPrintOrderFiftyNine from "./template/DialysisPrintOrderFiftyNine"
 import DialysisPrintOrderSixty from "./template/DialysisPrintOrderSixty";
 import DialysisPrintOrderSixtyOne from "./template/DialysisPrintOrderSixtyOne"
 import DialysisPrintOrderSixtyTwo from "./template/DialysisPrintOrderSixtyTwo"
+import DialysisPrintOrderSixtyThree from "./template/DialysisPrintOrderSixtyThree"
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderSixtyThree,
     DialysisPrintOrderSixtyTwo,
     DialysisPrintOrderSixtyOne,
     DialysisPrintOrderSixty,

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -42,7 +42,9 @@
                     <td colspan="11" style="padding-left: 10px">
                       <div style="display: flex">
                         <div style="width: 250px">
-                          病情评估:&nbsp;<span>{{sick_condition ? sick_condition : ""}}</span>
+                          病情评估:&nbsp;<span>{{
+                            sick_condition ? sick_condition : ""
+                          }}</span>
                         </div>
                         <div style="width: 250px">
                           入科方式:&nbsp;<span
@@ -66,15 +68,17 @@
                     </td>
                   </tr>
                   <tr class="list_table_1">
-                     <td colspan="11" style="padding-left: 10px">
+                    <td colspan="11" style="padding-left: 10px">
                       <div style="display: flex">
                         <div style="width: 100%">
                           病情描述:&nbsp;<span>{{
-                            receiverTreatmentAccess.sick_condition_other ? receiverTreatmentAccess.sick_condition_other : ""
+                            receiverTreatmentAccess.sick_condition_other
+                              ? receiverTreatmentAccess.sick_condition_other
+                              : ""
                           }}</span>
                         </div>
                       </div>
-                     </td>
+                    </td>
                   </tr>
                   <tr class="list_table_1">
                     <td
@@ -618,14 +622,19 @@
             <td>
               <table class="print-table" border="1">
                 <tr style="text-align: center">
-                  <td colspan="15" style="margin-left: 15px; font-size: 20px">
+                  <td
+                    :colspan="org_id == 10441 || org_id == 9675 ? 14 : 15"
+                    style="margin-left: 15px; font-size: 20px"
+                  >
                     治 疗 过 程 记 录
                   </td>
                 </tr>
                 <tr>
                   <td style="width: 60px" rowspan="2">时间</td>
                   <td colspan="4">透析参数</td>
-                  <td colspan="5">生命体征</td>
+                  <td :colspan="org_id == 10441 || org_id == 9675 ? 4 : 5">
+                    生命体征
+                  </td>
                   <td colspan="1">治疗中病情变化</td>
                 </tr>
                 <tr class="short_tr">
@@ -667,7 +676,10 @@
                     <p style="height: 20px; line-height: 20px">mmHg</p>
                   </th>
 
-                  <th style="width: 80px; font-weight: normal">
+                  <th
+                    style="width: 80px; font-weight: normal"
+                    v-if="org_id != 10441 && org_id != 9675"
+                  >
                     <p style="height: 20px; line-height: 20px">SpO₂</p>
                     <p style="height: 20px; line-height: 20px">%</p>
                   </th>
@@ -710,13 +722,13 @@
                     </span>
                   </td>
                   <td style="min-width: 45px">
-                    <span v-if="getTime(monitor.operate_time) != ''">
-                      {{
-                        monitor.ultrafiltration_volume
-                          ? monitor.ultrafiltration_volume
-                          : ""
-                      }}
+                    <span v-if="getTime(monitor.operate_time) != ''&&monindex == 0 && (org_id == 10441||org_id == 9675)">
+                      {{'/'}}
+                    </span>
+                    <span v-else-if="getTime(monitor.operate_time) != ''&&monindex == 0 && (org_id != 10441&&org_id != 9675)">
+                      {{monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}
                     </span>
+                    <span v-else>{{monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
                   </td>
 
                   <td>
@@ -751,7 +763,7 @@
                       }}
                     </span>
                   </td>
-                  <td>
+                  <td v-if="org_id != 10441 && org_id != 9675">
                     <span v-if="getTime(monitor.operate_time) != ''">
                       {{
                         monitor.blood_oxygen_saturation

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyTwo.vue

@@ -174,7 +174,7 @@
             </td>
             <td style="text-align: left" colspan="2">
               <span style="display: inline-block; margin-left: 15px">
-                钙:
+                 钙:
                 {{
                   prescription.calcium ? prescription.calcium : "/"
                 }}&nbsp;mmol/L
@@ -252,6 +252,9 @@
                 <span v-if="prescription.anticoagulant == 10"
                   >体外抗凝肝素首剂:</span
                 >
+                <span v-if="prescription.anticoagulant == 11"
+                  >那屈肝素首剂:</span
+                >
 
                 {{
                   prescription.anticoagulant_shouji
@@ -259,6 +262,8 @@
                     : "/"
                 }}
               </span>
+              <span v-if="prescription.anticoagulant == 5">iu</span>
+              <span v-if="prescription.anticoagulant == 6">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>
@@ -273,6 +278,7 @@
                     : "/"
                 }}
               </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>
@@ -288,6 +294,8 @@
                     : "/"
                 }}
               </span>
+              <span v-if="prescription.anticoagulant == 5">iu</span>
+              <span v-if="prescription.anticoagulant == 6">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>
@@ -319,14 +327,14 @@
             </td>
             <td style="text-align: left" colspan="2">
               <span style="display: inline-block; margin-left: 15px">
-                透析时间:
+                实际治疗时长:
                 {{
-                  prescription.dialysis_duration_hour
-                    ? prescription.dialysis_duration_hour
+                  afterdialysis.actual_treatment_hour
+                    ? afterdialysis.actual_treatment_hour
                     : "0"
                 }}小时{{
-                  prescription.dialysis_duration_minute
-                    ? prescription.dialysis_duration_minute
+                  afterdialysis.actual_treatment_minute
+                    ? afterdialysis.actual_treatment_minute
                     : "0"
                 }}分钟
               </span>

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -828,7 +828,7 @@ export default {
         }
 
       } else {
-        if (this.org_id == 10191) {
+        if (this.org_id == 10191 || this.org_id == 0) {
           let params = {
             his_patient_id: obj.his_patient_id,
             id: obj.order_id,

src/xt_pages/outpatientCharges/statementTemplate/printFive.vue

@@ -57,6 +57,12 @@
         <tr>
           <td colspan="6">
             <table class="list_table">
+              <tr>
+                <td colspan="2">{{'名称'}}</td>
+                <td>{{'规格'}}</td>
+                <td>{{'数量'}}</td>
+                <td>{{'价格'}}</td>
+              </tr>
               <tr colspan="6" v-for="(v, index) in info.L_list" :key="index">
                 <td colspan="2">{{v.name}}</td>
                 <td>{{v.spec}}</td>
@@ -68,6 +74,10 @@
 
           <td colspan="6">
             <table class="list_table">
+              <td colspan="2">{{'名称'}}</td>
+              <td>{{'规格'}}</td>
+              <td>{{'数量'}}</td>
+              <td>{{'价格'}}</td>
               <tr colspan="6" v-for="(v, index) in info.R_list" :key="index">
                 <td colspan="2">{{v.name}}</td>
                 <td>{{v.spec}}</td>

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -30,8 +30,8 @@
       </tr>
       <tr>
         <td width="70">就医登记号</td>
-        <td colspan="11">{{info.psn_no}}</td>
-        <td width="80">门诊号</td>
+        <td colspan="7">{{info.psn_no}}</td>
+        <td width="50">门诊号</td>
         <td colspan="3">{{info.number}}</td>
       </tr>
       <tr>