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

@@ -151,9 +151,9 @@
                     white-space: normal;
                   "
                 >
-                {{ record.dialysis_order.dialysis_dialyszers ?  record.dialysis_order.dialysis_dialyszers : "/"}}
+                <span v-if="record.dialysis_order.dialysis_dialyszers!=''&& record.dialysis_order.dialysis_dialyszers!=0" > {{ record.dialysis_order.dialysis_dialyszers ?  record.dialysis_order.dialysis_dialyszers : "/"}}</span>
 
-                <span v-if="record.dialysis_order.dialysis_strainer!=''"> /{{ record.dialysis_order.dialysis_strainer ?  record.dialysis_order.dialysis_strainer : ""}}</span>
+                <span v-if="record.dialysis_order.dialysis_strainer!='' && record.dialysis_order.dialysis_strainer!=0"> /{{ record.dialysis_order.dialysis_strainer ?  record.dialysis_order.dialysis_strainer : ""}}</span>
                 </div>
               </div>
               <div class="inline_block" style="flex: 1;" >

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1644,7 +1644,9 @@
                             "
                             width="50"
                           >
-                            置换量<br />(ml)
+                            置换量<br />
+                            <span v-if="org_id!=10598 && org_id!=10567">(ml)</span>
+                            <span v-if="org_id==10598 || org_id == 10567">L</span>
                           </td>
                           <td v-if="org_id == 3877  || org_id == 10449" width="50">滤前压(mmHg)</td>
                           <td

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1734,8 +1734,8 @@
                         <td width="50" v-if="org_id ==3877 || org_id == 10449 || org_id ==0">累计超滤量<br />(ml)</td>
                         <td v-if="(prescription.mode_id == 2 ||prescription.mode_id == 5 ||prescription.mode_id == 12) &&org_id!=10478 && org_id!=0 && org_id!=10206" width="50">
                           置换量<br />
-                          <span v-if="org_id!=10598">(ml)</span>
-                          <span v-if="org_id==10598">(L)</span>
+                          <span v-if="org_id!=10598 && org_id!=10567">(ml)</span>
+                          <span v-if="org_id==10598 || org_id == 10567">(L)</span>
                         </td>
                         <td width="50" v-if="org_id == 3877 || org_id == 10449">滤前压(mmHg)</td>
                         <td width="50" v-if="org_id == 9538 || org_id ==10600 || org_id ==10629 || org_id ==10510 || org_id == 10580 || org_id == 0 || org_id == 10598">KT/V</td>

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -72,26 +72,26 @@
           </div>
           <div class="inline_block">
             病区：
-            <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121||org_id == 10138||org_id == 10414 ||org_id == 10447 || org_id == 0 || org_id ==10460">{{
+            <div class="under_line" style="width: 70px; text-align: center">
+              <span>{{
                 patientInfo.DialysisSchedule.device_zone.name
                   ? patientInfo.DialysisSchedule.device_zone.name
-                  : ""
+                  : "/"
               }}</span>
-              <span v-else>{{ "/" }}</span>
+              
             </div>
           </div>
-          <div class="inline_block" v-if="org_id!=10460">
+          <div class="inline_block">
             床号：
-            <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675 || org_id == 0 || org_id ==10460">{{
+            <div class="under_line" style="width: 70px; text-align: center">
+              <span >{{
                 dialysisOrder &&
                 dialysisOrder.DeviceNumber &&
                 dialysisOrder.DeviceNumber.number.length > 0
                   ? dialysisOrder.DeviceNumber.number
                   : patientInfo.DialysisSchedule.device_number.number
               }}</span>
-              <span v-else>{{ "/" }}</span>
+              
             </div>
           </div>
           <div class="inline_block">
@@ -1724,26 +1724,25 @@
             </div>
             <div class="inline_block">
               病区：
-              <div class="under_line" style="width: 50px; text-align: center">
-                <span v-if="org_id == 10121||org_id == 10138||org_id == 10414 ||org_id == 10447 || org_id == 0 || org_id ==10460">{{
+              <div class="under_line" style="width: 70px; text-align: center">
+                <span>{{
                   patientInfo.DialysisSchedule.device_zone.name
                     ? patientInfo.DialysisSchedule.device_zone.name
-                    : ""
+                    : "/"
                 }}</span>
-                <span v-else>{{ "/" }}</span>
+                
               </div>
             </div>
-            <div class="inline_block" v-if="org_id!=10460">
+            <div class="inline_block">
               床号：
-              <div class="under_line" style="width: 50px; text-align: center">
-                <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675 || org_id == 0 || org_id ==10460">{{
+              <div class="under_line" style="width: 70px; text-align: center">
+                <span>{{
                   dialysisOrder &&
                   dialysisOrder.DeviceNumber &&
                   dialysisOrder.DeviceNumber.number.length > 0
                     ? dialysisOrder.DeviceNumber.number
                     : patientInfo.DialysisSchedule.device_number.number
                 }}</span>
-                <span v-else>{{ "/" }}</span>
               </div>
             </div>
             <div class="inline_block">

src/xt_pages/dialysis/template/DialysisPrintOrderseventyfive.vue

@@ -132,11 +132,13 @@
                   white-space: normal;
                 "
               >
-                <span v-if="dialysisOrder !=null&&dialysisOrder.dialysis_dialyszers!=''" >
+                <span v-if="dialysisOrder !=null&&dialysisOrder.dialysis_dialyszers!='' && dialysisOrder.dialysis_dialyszers!=0" >
+
                   {{dialysisOrder.dialysis_dialyszers ? dialysisOrder.dialysis_dialyszers : "/" }}
                 </span>
-                <span v-if="dialysisOrder !=null && dialysisOrder.dialysis_strainer!=''" >
-                   /{{dialysisOrder.dialysis_strainer ? dialysisOrder.dialysis_strainer : "" }}
+                <span v-if="dialysisOrder !=null && dialysisOrder.dialysis_strainer!='' && dialysisOrder.dialysis_strainer!=0" >
+
+                    /{{dialysisOrder.dialysis_strainer ? dialysisOrder.dialysis_strainer : "" }}
                 </span>
               
               </div>

src/xt_pages/outpatientCharges/listPrint.vue

@@ -14,12 +14,12 @@
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne v-if=" org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675 && org_id!=10485  " :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
+      <printOne v-if=" org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675 && org_id!=10485 &&org_id !=0 " :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
       <printTwo v-if="org_id == 10106 && this.paramsObj.balance_accounts_type != 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
       <print-three v-if="org_id == 10106 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
 <!--      <list-print-two v-if="org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>-->
      <list-print-three v-if="org_id == 10215 || org_id==9675  || org_id ==10485" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-three>
-      <print-two10265  v-if="org_id == 10265  " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
+      <print-two10265  v-if="org_id == 10265 || org_id ==0 " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
     </div>
   </div>
 </template>

src/xt_pages/outpatientCharges/listTemplate/printTwo10265.vue

@@ -15,12 +15,12 @@
             ></TR>
           
           <TR>
-            <TD colspan="1">个人编码:{{ order.psn_no }}</TD>
-            <TD>住院号：{{ order.mdtrt_id }}</TD>
-            <TD>姓名：{{ order.psn_name }}</TD>
-            <TD>性别：{{ patient.gender == 1 ? "男" : "女" }}</TD>
+            <TD colspan="2">个人编码:{{ order.psn_no }}</TD>
+            <TD colspan="2">住院号：{{ order.mdtrt_id }}</TD>
           </TR>
           <TR>
+            <TD>姓名：{{ order.psn_name }}</TD>
+            <TD>性别：{{ patient.gender == 1 ? "男" : "女" }}</TD>
             <TD> 入院科室：血液透析室 </TD>
             <TD> 出院科室：血液透析室 </TD>
           </TR>

src/xt_pages/outpatientDoctorStation/batch_print_checkTemplate/printOne.vue

@@ -16,7 +16,19 @@
           :key="index"
       >
         <img style="width:100%;height:80px" v-if="org_id == 10138 " src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
-        <img style="width:100%;height:80px" v-if="org_id == 10278 || org_id==0" src="https://kuyi.shengws.com/beierlog.png" alt="">
+        <img style="width:100%;height:80px" v-if="org_id == 10278" src="https://kuyi.shengws.com/beierlog.png" alt="">
+        <span v-if="org_id == 10610 ">
+          <img
+            src="@/assets/img/penggang_top.jpg"
+            style="width: 100%;height:80px"
+            alt=""
+        /></span>
+        <span v-if="org_id == 10537 ||org_id ==0">
+          <img
+            src="	https://kuyi.shengws.com/xuwenshou.jpg"
+            style="width: 100%;height:80px"
+            alt=""/>
+        </span>
         <div class="printTitle">检验申请单</div>
 
         <div style="border: 1px solid #000;margin-bottom: 10px;">
@@ -133,8 +145,20 @@
           </div>
         </div>
 
-        <img style="width:100%;" v-if="org_id == 10138 || org_id == 0" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
+        <img style="width:100%;" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
         <img style="width:100%;" v-if="org_id == 10278" src="https://kuyi.shengws.com/bailinbeier.png" alt="">
+        <span v-if="org_id == 10610 ">
+            <img
+              src="@/assets/img/penggang_bottom.jpg"
+              style="width: 100%;height:80px"
+              alt=""
+        /></span>
+        <span v-if="org_id == 10537 ||org_id ==0">
+        <img
+          src="@/assets/img/xuwendizhi.jpg"
+          style="width: 100%;height:80px"
+          alt=""
+        /></span>
       </div>
 
     </div>
@@ -142,7 +166,7 @@
 </template>
 <script>
 import { uParseTime } from '@/utils/tools'
-import { getAllDoctorList } from '@/api/project/project'
+import { getAllDoctorList,getPrescriptionPrint } from '@/api/project/project'
 import { getInitData } from '@/api/his/his'
 
 export default {

src/xt_pages/outpatientDoctorStation/batch_print_template/batchPrintThree.vue

@@ -20,6 +20,18 @@
               style="width: 100%"
               alt=""
             /></span>
+            <span v-if="org_id == 10610 ">
+              <img
+                src="@/assets/img/penggang_top.jpg"
+                style="width: 100%"
+                alt=""
+            /></span>
+            <span v-if="org_id == 10537 ||org_id ==0">
+              <img
+                src="	https://kuyi.shengws.com/xuwenshou.jpg"
+                style="width: 100%"
+                alt=""/>
+            </span>
           <div class="printTitle">
             处方笺
             <span
@@ -232,6 +244,18 @@
             style="width: 100%"
             alt=""
           /></span>
+          <span v-if="org_id == 10610 ">
+            <img
+              src="@/assets/img/penggang_bottom.jpg"
+              style="width: 100%"
+              alt=""
+          /></span>
+          <span v-if="org_id == 10537 ||org_id ==0">
+          <img
+            src="@/assets/img/xuwendizhi.jpg"
+            style="width: 100%"
+            alt=""
+          /></span>
           <!-- <div class="doctorBox">
               <p>医师：{{item.doctor?item.doctor:""}}</p>
               <p>日期：{{getTime(item.ctime)?getTime(item.ctime):""}}</p>

src/xt_pages/outpatientDoctorStation/batch_print_template/index.vue

@@ -13,7 +13,7 @@
       </template> -->
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <div v-if="org_id != 10138 && org_id != 10278 && org_id != 0">
+      <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10610 &&org_id != 10537 && org_id != 0">
         <printOne v-if="org_id != 10215" :printData="printData"  :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
 <!--        <batch-print-two v-if="org_id == 10088 || org_id == 0" :printData="printData"  :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></batch-print-two>-->
 <!--        <print-six v-if="org_id == 10088 || org_id == 0" :printData="printData"  :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></print-six>-->

src/xt_pages/outpatientDoctorStation/batch_print_treatTemplate/index.vue

@@ -13,9 +13,9 @@
       </template> -->
 
       <div class='dialysisPage' style="padding-top:40px;">
-        <printOne v-if="org_id != 10138 && org_id != 10278 && org_id != 0" :printData="printData" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
+        <printOne v-if="org_id != 10138 && org_id != 10278 && org_id != 10610 &&org_id != 10537 && org_id != 0" :printData="printData" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
 <!--        <printTwo v-else :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo>-->
-        <treat-batch-print v-if="org_id == 10138 || org_id == 10278 || org_id == 0"   :printData="printData" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></treat-batch-print>
+        <treat-batch-print v-if="org_id == 10138 || org_id == 10278 || org_id == 10610 || org_id == 10537 || org_id == 0"   :printData="printData" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></treat-batch-print>
       </div>
   </div>
 </template>

src/xt_pages/outpatientDoctorStation/batch_print_treatTemplate/treatBatchPrint.vue

@@ -22,6 +22,18 @@
           style="width: 100%"
           alt=""
         /></span>
+        <span v-if="org_id == 10610 ">
+          <img
+            src="@/assets/img/penggang_top.jpg"
+            style="width: 100%"
+            alt=""
+        /></span>
+        <span v-if="org_id == 10537 ||org_id ==0">
+          <img
+            src="	https://kuyi.shengws.com/xuwenshou.jpg"
+            style="width: 100%"
+            alt=""/>
+        </span>
       <div class="printTitle">
         治疗单
         <span
@@ -210,6 +222,18 @@
         style="width: 100%"
         alt=""
       /></span>
+      <span v-if="org_id == 10610 ">
+        <img
+          src="@/assets/img/penggang_bottom.jpg"
+          style="width: 100%"
+          alt=""
+      /></span>
+      <span v-if="org_id == 10537 ||org_id ==0">
+      <img
+        src="@/assets/img/xuwendizhi.jpg"
+        style="width: 100%"
+        alt=""
+      /></span>
       <div style="page-break-after: always"></div>
 
     </div>