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

@@ -23,7 +23,7 @@
             <div class="dialysis-print-order">
               <div class="order-yy-name">{{ orgname }}</div>
               <div class="order-title">血液透析(滤过)记录表单</div>
-              <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;width: 100%;">
+              <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;width: 100%;font-size: 16px;">
                 <tbody>
                   <tr>
                     <td width="80" style="line-height:30px;">治疗日期:
@@ -32,7 +32,7 @@
                   </tr>
                 </tbody>
               </table>
-              <table border="1" class="table-box" style="border-collapse: collapse;width: 100%;">
+              <table border="1" class="table-box" style="border-collapse: collapse;width: 100%;font-size: 16px;">
                 <tbody>
                   <tr>
                     <td colspan="3">
@@ -142,7 +142,7 @@
                 </tbody>
               </table>
 
-              <table border="1" class="table-box" style="border-collapse: collapse;width: 100%;">
+              <table border="1" class="table-box" style="border-collapse: collapse;width: 100%;font-size: 16px;">
                 <tr>
                   <td style="width: 20%; line-height: 30px;">透析机：
                     {{record.assessment_before_dislysis.machine_type ? record.assessment_before_dislysis.machine_type : " "}}
@@ -198,7 +198,7 @@
                 </tr>
               </table>
 
-              <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;width: 100%;">
+              <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;width: 100%;font-size: 16px;">
                 <tbody>
                   <tr>
                     <td colspan="12" style="padding: 5px;">治疗过程记录</td>
@@ -255,7 +255,7 @@
                 </tbody>
               </table>
               <div>
-                <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;width: 100%;">
+                <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;width: 100%;font-size: 16px;">
                   <tbody>
                     <tr>
                       <td style="width:12%;height:25px;">
@@ -323,17 +323,17 @@
                       <td v-if="advice_index === 1">{{(record.assessment_before_dislysis.weight_before - record.lastafterweight.weight_after).toFixed(1) }}kg</td>
                       <td v-if="advice_index === 2">干体重(DW):</td>
                       <td v-if="advice_index === 2">{{record.assessment_before_dislysis.dry_weight ? record.assessment_before_dislysis.dry_weight : "0"}}kg</td>
-                      <td v-if="advice_index === 3">较干体重增加量:</td>
+                      <!-- <td v-if="advice_index === 3">较干体重增加量:</td>
                       <td v-if="advice_index === 3">
                         {{(record.assessment_before_dislysis.weight_before - record.assessment_before_dislysis.dry_weight -
                               record.assessment_before_dislysis.additional_weight).toFixed(2)}}kg
                       </td>
                       <td v-if="advice_index === 4">净脱水量:</td>
-                      <td v-if="advice_index === 4">{{record.assessment_after_dislysis.actual_ultrafiltration}}L</td>
-                      <td v-if="advice_index === 5">透后体重:</td>
-                      <td v-if="advice_index === 5">{{record.assessment_after_dislysis.weight_after}}kg</td>
-                      <td v-if="advice_index === 6">本次透析体重下降量:</td>
-                      <td v-if="advice_index === 6">
+                      <td v-if="advice_index === 4">{{record.assessment_after_dislysis.actual_ultrafiltration}}L</td> -->
+                      <td v-if="advice_index === 3">透后体重:</td>
+                      <td v-if="advice_index === 3">{{record.assessment_after_dislysis.weight_after}}kg</td>
+                      <td v-if="advice_index === 4">本次透析体重下降量:</td>
+                      <td v-if="advice_index === 4">
                         {{record.assessment_after_dislysis.weight_after == 0 || record.assessment_before_dislysis.weight_before == 0 ?
                         0 : ( record.assessment_before_dislysis.weight_before - record.assessment_after_dislysis.weight_after ).toFixed(2)
                       }}kg</td>
@@ -341,7 +341,7 @@
                   </tbody>
                 </table>
               </div>
-              <div style="border: 1px solid black;width: 100%;">
+              <div style="border: 1px solid black;width: 100%;font-size: 16px;">
                 <div>
                   治疗小结
                   <span class="under-line">&nbsp;
@@ -569,9 +569,9 @@
 
               if (
                 this.records[recordIndex].advices &&
-                this.records[recordIndex].advices.length < 13
+                this.records[recordIndex].advices.length < 10
               ) {
-                delghTwo = 13 - this.records[recordIndex].advices.length
+                delghTwo = 10 - this.records[recordIndex].advices.length
               } else {
                 delghTwo = 0
               }

src/xt_pages/dialysis/template/DialysisPrintOrderSeventynine.vue

@@ -5,14 +5,14 @@
       <div class="dialysis-print-order">
         <div class="order-yy-name">{{ orgname }}</div>
         <div class="order-title">血液透析(滤过)记录表单</div>
-        <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;width: 99%;">
+        <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;width: 99%;font-size: 16px;">
           <tbody>
             <tr>
               <td width="80" style="line-height:30px;">治疗日期: <span>{{ year }}</span>年<span>{{ months }}</span>月<span>{{ day }}</span>日</td>
             </tr>
           </tbody>
         </table>
-        <table border="1" class="table-box" style="border-collapse: collapse;width: 99%;">
+        <table border="1" class="table-box" style="border-collapse: collapse;width: 99%;font-size: 16px;">
           <tbody>
             <tr>
               <td colspan="3">
@@ -121,7 +121,7 @@
 
           </tbody>
         </table>
-        <table border="1" class="table-box" style="border-collapse: collapse;width: 99%;">
+        <table border="1" class="table-box" style="border-collapse: collapse;width: 99%;font-size: 16px;">
           <tr>
             <td style="width: 20%; line-height: 30px;">透析机：
               {{predialysis.machine_type ? predialysis.machine_type : " "}}
@@ -172,7 +172,7 @@
           </tr>
         </table>
 
-        <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;width: 99%;">
+        <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;width: 99%;font-size: 16px;">
           <tbody>
             <tr>
               <td colspan="12" style="padding: 5px;">治疗过程记录</td>
@@ -230,7 +230,7 @@
           </tbody>
         </table>
         <div>
-          <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;width: 99%;">
+          <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;width: 99%;font-size: 16px;">
             <tbody>
               <tr>
                 <td style="width:12%;height:25px;">
@@ -278,24 +278,24 @@
                 <td v-if="advice_index === 1">{{ (predialysis.weight_before - assessmentafter.weight_after).toFixed(1) }}kg</td>
                 <td v-if="advice_index === 2">干体重(DW):</td>
                 <td v-if="advice_index === 2">{{ predialysis.dry_weight }}kg</td>
-                <td v-if="advice_index === 3">较干体重增加量:</td>
+                <!-- <td v-if="advice_index === 3">较干体重增加量:</td>
                 <td v-if="advice_index === 3">
-                  {{ patientInfo.total_dialysis +patientInfo.user_sys_before_count >0 && afterdialysis.weight_after != 0
+                  {{ afterdialysis.weight_after != 0 && predialysis.dry_weight !=0
                     ? (afterdialysis.weight_after - predialysis.dry_weight).toFixed(2): 0 }}kg
                 </td>
                 <td v-if="advice_index === 4">净脱水量:</td>
-                <td v-if="advice_index === 4">{{ afterdialysis.actual_ultrafiltration }}ml</td>
-                <td v-if="advice_index === 5">透后体重:</td>
-                <td v-if="advice_index === 5">{{ afterdialysis.weight_after }}kg</td>
-                <td v-if="advice_index === 6">本次透析体重下降量:</td>
-                <td v-if="advice_index === 6">
+                <td v-if="advice_index === 4">{{ afterdialysis.actual_ultrafiltration }}L</td> -->
+                <td v-if="advice_index === 3">透后体重:</td>
+                <td v-if="advice_index === 3">{{ afterdialysis.weight_after }}kg</td>
+                <td v-if="advice_index === 4">本次透析体重下降量:</td>
+                <td v-if="advice_index === 4">
                   {{  afterdialysis.weight_after == 0 || predialysis.weight_before == 0? '0.00'
                       : (predialysis.weight_before - afterdialysis.weight_after).toFixed(2) }}kg</td>
               </tr>
             </tbody>
           </table>
         </div>
-        <div style="border: 1px solid black;width: 99%;">
+        <div style="border: 1px solid black;width: 99%;font-size: 16px;">
           <div >
             治疗小结
             <span class="under-line">&nbsp;{{ summary.dialysis_summary }}</span>
@@ -1130,16 +1130,16 @@ export default {
             var obj2 = { advice_name: "", start_time: "" };
             var obj3 = { advice_name: "", start_time: "" };
             var obj4 = { advice_name: "", start_time: "" };
-            var obj5 = { advice_name: "", start_time: "" };
-            var obj6 = { advice_name: "", start_time: "" };
+            // var obj5 = { advice_name: "", start_time: "" };
+            // var obj6 = { advice_name: "", start_time: "" };
 
             tableAdvice.push(obj);
             tableAdvice.push(obj1);
             tableAdvice.push(obj2);
             tableAdvice.push(obj3);
             tableAdvice.push(obj4);
-            tableAdvice.push(obj5);
-            tableAdvice.push(obj6);
+            // tableAdvice.push(obj5);
+            // tableAdvice.push(obj6);
 
             this.tableAdvice = tableAdvice;
             return this.tableAdvice
@@ -1150,15 +1150,15 @@ export default {
             var obj1 = { advice_name: "", start_time: "" };
             var obj2 = { advice_name: "", start_time: "" };
             var obj3 = { advice_name: "", start_time: "" };
-            var obj4 = { advice_name: "", start_time: "" };
-            var obj5 = { advice_name: "", start_time: "" };
+            // var obj4 = { advice_name: "", start_time: "" };
+            // var obj5 = { advice_name: "", start_time: "" };
 
             tableAdvice.push(obj);
             tableAdvice.push(obj1);
             tableAdvice.push(obj2);
             tableAdvice.push(obj3);
-            tableAdvice.push(obj4);
-            tableAdvice.push(obj5);
+            // tableAdvice.push(obj4);
+            // tableAdvice.push(obj5);
 
             this.tableAdvice = tableAdvice;
             // return this.tableAdvice
@@ -1168,14 +1168,14 @@ export default {
             var obj = { advice_name: "", start_time: "" };
             var obj1 = { advice_name: "", start_time: "" };
             var obj2 = { advice_name: "", start_time: "" };
-            var obj3 = { advice_name: "", start_time: "" };
-            var obj4 = { advice_name: "", start_time: "" };
+            // var obj3 = { advice_name: "", start_time: "" };
+            // var obj4 = { advice_name: "", start_time: "" };
 
             tableAdvice.push(obj);
             tableAdvice.push(obj1);
             tableAdvice.push(obj2);
-            tableAdvice.push(obj3);
-            tableAdvice.push(obj4);
+            // tableAdvice.push(obj3);
+            // tableAdvice.push(obj4);
 
             this.tableAdvice = tableAdvice;
             // return this.tableAdvice
@@ -1184,13 +1184,13 @@ export default {
             console.log('444444',tableAdvice.length);
             var obj = { advice_name: "", start_time: "" };
             var obj1 = { advice_name: "", start_time: "" };
-            var obj2 = { advice_name: "", start_time: "" };
-            var obj3 = { advice_name: "", start_time: "" };
+            // var obj2 = { advice_name: "", start_time: "" };
+            // var obj3 = { advice_name: "", start_time: "" };
 
             tableAdvice.push(obj);
             tableAdvice.push(obj1);
-            tableAdvice.push(obj2);
-            tableAdvice.push(obj3);
+            // tableAdvice.push(obj2);
+            // tableAdvice.push(obj3);
 
             this.tableAdvice = tableAdvice;
             // return this.tableAdvice
@@ -1198,39 +1198,39 @@ export default {
           if (tableAdvice.length === 4) {
             console.log('5555555',tableAdvice.length);
             var obj = { advice_name: "", start_time: "" };
-            var obj1 = { advice_name: "", start_time: "" };
-            var obj2 = { advice_name: "", start_time: "" };
+            // var obj1 = { advice_name: "", start_time: "" };
+            // var obj2 = { advice_name: "", start_time: "" };
 
             tableAdvice.push(obj);
-            tableAdvice.push(obj1);
-            tableAdvice.push(obj2);
+            // tableAdvice.push(obj1);
+            // tableAdvice.push(obj2);
 
             this.tableAdvice = tableAdvice;
             // return this.tableAdvice
           }
           if (tableAdvice.length === 5) {
             console.log('6666666',tableAdvice.length);
-            var obj = { advice_name: "", start_time: "" };
-            var obj1 = { advice_name: "", start_time: "" };
-            var obj2 = { advice_name: "", start_time: "" };
+            // var obj = { advice_name: "", start_time: "" };
+            // var obj1 = { advice_name: "", start_time: "" };
+            // var obj2 = { advice_name: "", start_time: "" };
 
-            tableAdvice.push(obj);
-            tableAdvice.push(obj1);
-            tableAdvice.push(obj2);
+            // tableAdvice.push(obj);
+            // tableAdvice.push(obj1);
+            // tableAdvice.push(obj2);
 
             this.tableAdvice = tableAdvice;
             // return this.tableAdvice
           }
-          if (tableAdvice.length === 6) {
-            console.log('6666666',tableAdvice.length);
-            var obj = { advice_name: "", start_time: "" };
-            tableAdvice.push(obj);
+          // if (tableAdvice.length === 6) {
+          //   console.log('6666666',tableAdvice.length);
+          //   var obj = { advice_name: "", start_time: "" };
+          //   tableAdvice.push(obj);
 
-            this.tableAdvice = tableAdvice;
-            // return this.tableAdvice
-          }
+          //   this.tableAdvice = tableAdvice;
+          //   // return this.tableAdvice
+          // }
 
-          if (tableAdvice.length >7) {
+          if (tableAdvice.length >5) {
             console.log('777777',tableAdvice);
             this.tableAdvice = tableAdvice;
 
@@ -1408,7 +1408,6 @@ export default {
   width: 100%;
   line-height: 25px;
   font-size: 14px;
-
 }
 
 

src/xt_pages/outpatientCharges/summaryDetail.vue

@@ -106,13 +106,13 @@
           </ul>
           <p class="centerRightTitle" style="margin-top:10px;">收费信息</p>
           <ul >
-            <li style="width:30%;">医疗费总额：{{order.medfee_sumamt.toFixed(2) }}元</li>
-            <li style="width:30%;">基金支付总额：{{order.fund_pay_sumamt.toFixed(2)}}元</li>
-            <li style="width:30%;">基本医疗保险统筹基金支出：{{order.hifp_pay}}元</li>
-            <li style="width:30%;">医疗救助基金支出：{{order.maf_pay.toFixed(2)}}元</li>
-            <li style="width:30%;">个人账户支付金额:{{ order.acct_pay}}</li>
-            <li v-if="this.hisPatientInfo.balance_accounts_type == 2" style="width:30%;">个人支付金额:{{order.medfee_sumamt.toFixed(2) }}元</li>
-            <li v-else="this.hisPatientInfo.balance_accounts_type == 2" style="width:30%;">个人支付金额:{{order.psn_cash_pay.toFixed(2)}}元</li>
+            <li style="width:90%;line-height: 25px;">医疗费总额：{{order.medfee_sumamt.toFixed(2) }}元</li>
+            <li style="width:90%;line-height: 25px;">基金支付总额：{{order.fund_pay_sumamt.toFixed(2)}}元</li>
+            <li style="width:90%;line-height: 25px;">基本医疗保险统筹基金支出：{{order.hifp_pay}}元</li>
+            <li style="width:90%;line-height: 25px;">医疗救助基金支出：{{order.maf_pay.toFixed(2)}}元</li>
+            <li style="width:90%;line-height: 25px;">个人账户支付金额:{{ order.acct_pay}}</li>
+            <li v-if="this.hisPatientInfo.balance_accounts_type == 2" style="width:90%;line-height: 25px;">个人支付金额:{{order.medfee_sumamt.toFixed(2) }}元</li>
+            <li v-else="this.hisPatientInfo.balance_accounts_type == 2" style="width:90%;line-height: 25px;">个人支付金额:{{order.psn_cash_pay.toFixed(2)}}元</li>
           </ul>
 
         </div>