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

@@ -790,7 +790,7 @@
                                   <label-box :isChecked="record.assessment_after_dislysis.catheter.indexOf('更换敷料')>-1?true:false" showValue='更换敷料'></label-box>
                               </td>
                               <td width='50'>
-                                  <label-box :isChecked="record.assessment_after_dislysis.catheter.indexOf('干洁')==-1 && record.assessment_after_dislysis.catheter.indexOf('更换敷料')==-1?true:false" showValue='其他'></label-box>
+                                  <label-box :isChecked="record.assessment_after_dislysis.catheter!=''&&record.assessment_after_dislysis.catheter.indexOf('干洁')==-1 && record.assessment_after_dislysis.catheter.indexOf('更换敷料')==-1?true:false" showValue='其他'></label-box>
                               </td>
                               <td width='100'>
                                   <div class="under-line">&nbsp;

src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue

@@ -1127,7 +1127,7 @@
                           <label-box :isChecked="afterdialysis.catheter.indexOf('更换敷料')>-1?true:false" showValue='更换敷料'></label-box>
                       </td>
                       <td width='50'>
-                          <label-box :isChecked="afterdialysis.catheter.indexOf('干洁')==-1 && afterdialysis.catheter.indexOf('更换敷料')==-1?true:false" showValue='其他'></label-box>
+                          <label-box :isChecked="afterdialysis.catheter!=''&& afterdialysis.catheter.indexOf('干洁')==-1 && afterdialysis.catheter.indexOf('更换敷料')==-1?true:false" showValue='其他'></label-box>
                       </td>
                       <td width='100'>
                           <div class="under-line">&nbsp;

src/xt_pages/dialysis/template/DialysisPrintOrdersixtySeven.vue

@@ -38,11 +38,9 @@
                 <td>姓名：{{ patientInfo.name }}</td>
                 <td>性别： {{ patientInfo_gender_1 ? "男" : "女" }}</td>
                 <td>年龄：{{ getAge(patientInfo) }}</td>
-                <td>门诊号： {{
-                    patientInfo.admission_number
-                      ? patientInfo.admission_number
-                      : "/"
-                  }}</td>
+                <td>门诊号：
+                  {{patientInfo.dialysis_no}}
+                </td>
               </tr>
               <tr>
                 <td>病床床号：
@@ -57,8 +55,7 @@
                   </span>
                 </td>
                 <td>治疗时间：
-                  {{afterdialysis.actual_treatment_hour }}<span v-if="afterdialysis.actual_treatment_hour>0">时</span>
-                  <span v-if="afterdialysis.actual_treatment_minute>0">{{afterdialysis.actual_treatment_minute>0}}</span> {{afterdialysis.actual_treatment_minute }}<span v-if="afterdialysis.actual_treatment_minute>0">分</span>
+                  {{getTime(prescription.record_date,"{y}-{m}-{d}") }}
                 </td>
                 <td>干体重：{{ predialysis.dry_weight ? predialysis.dry_weight : "/" }}kg</td>
                 <td>上次透后体重：
@@ -73,25 +70,34 @@
                 </td>
                 <td>透析总次数：{{ patientInfo.total_dialysis + patientInfo.user_sys_before_count }}</td>
                 <td colspan="2">患者评估：
-                  {{ receiverTreatmentAccess.sick_condition ? receiverTreatmentAccess.sick_condition : "/" }}
+                  入科方式:
+                  <span v-if="receiverTreatmentAccess.way == 1">步行</span>
+                  <span v-if="receiverTreatmentAccess.way == 2">扶行</span>
+                  <span v-if="receiverTreatmentAccess.way == 3">轮椅</span>
+                  <span v-if="receiverTreatmentAccess.way == 4">平车</span>
+
+                  意识:
+                  <span v-if="receiverTreatmentAccess.consciousness == 1">清醒</span>
+                  <span v-if="receiverTreatmentAccess.consciousness == 2">嗜睡</span>
+                  <span v-if="receiverTreatmentAccess.consciousness == 4">模糊</span>
+                  <span v-if="receiverTreatmentAccess.consciousness == 3">昏迷</span>
                 </td>
               </tr>
               <tr>
                 <td colspan="4">
-                  <span style="width: 14%;">血管通路：
+                  <span>血管通路：
                     {{ predialysis.blood_access_part_opera_name }}
                   </span>
-                  <span style="width: 14%;">部位：
+                  <span>部位：
                     {{ predialysis.blood_access_part_id }}
                  </span>
-                  <span style="width: 14%;">通路评估：
+                  <span>通路评估：
                      <span v-if="predialysis.internal_fistula.indexOf('震颤-存在') >-1">震颤-存在</span>
                      <span v-if="predialysis.internal_fistula.indexOf('震颤-减弱') >-1">震颤-减弱</span>
                      <span v-if="predialysis.internal_fistula.indexOf('震颤-无') >-1">震颤-无</span>
 
                   </span>
-                  <!-- <span style="width: 14%;">震颤：</span> -->
-                  <!-- <span style="width: 14%;">外观：</span> -->
+                
                   <span style="width: 14%;">置换方式：
                     {{
                       getDisplaceLiquiPart(prescription.displace_liqui_part)
@@ -265,19 +271,21 @@
                 <td>{{monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</td>
                 <td>{{monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: ""}}</td>
                 <td>{{monitor.conductivity? monitor.conductivity: ""}}</td>
-                <td>{{monitor.dispose? monitor.dispose: ""}}
+                <td>
+                  {{monitor.symptom?monitor.symptom:"" }}&nbsp;
+                  {{monitor.dispose? monitor.dispose: ""}}&nbsp;
                   {{monitor.result? monitor.result: ""}}
                 </td>
                 <td>
                   <span
                     style="height: 30px; display: inline-block"
-                      v-if="setAdminUserES(monitor.creater) == ''"
+                      v-if="setAdminUserES(monitor.monitoring_nurse) == ''"
                       >
-                     {{ getAdminUser(monitor.creater) }}
+                     {{ getAdminUser(monitor.monitoring_nurse) }}
                   </span>
                   <img
                     style="height: 40px"
-                    :src="setAdminUserES(monitor.creater)"
+                    :src="setAdminUserES(monitor.monitoring_nurse)"
                     alt=""
                     srcset=""
                     v-else
@@ -430,14 +438,14 @@
               </tr>
               <tr>
                 <td colspan="4">
-                  <span style="width: 14%;">通路评估：
-                    {{
+                  <span>通路评估：
+                    内瘘:{{
                       afterdialysis.internal_fistula
                         ? afterdialysis.internal_fistula
                         : ""
                      }}
 
-                     {{
+                  导管:{{
                         afterdialysis.catheter ? afterdialysis.catheter : ""
                     }}
                   </span>

src/xt_pages/outpatientCharges/invoiceTemplate/printTen.vue

@@ -1,11 +1,11 @@
 <template>
   <div id='invoice-print' style="position: relative;">
-    
+      <div style="text-align: center;width: 573px;font-size: 20px; font-weight: bolder;">灵山盛康收费收据</div>
       <div style="display: flex;width: 575px;margin-bottom: 5px; position: relative;left: 506px;">
         {{printDate}}
       </div>
-      
-        <div style="display: flex; justify-content: space-between;width: 573px;border: 1px solid black; position: relative;padding: 5px;">
+      <div style="border: 1px solid black;width: 573px;">
+        <div style="display: flex; justify-content: space-between;width: 573px;border-bottom: 1px solid black; position: relative;padding: 5px;">
           <div >
             <span>姓名：{{paramsObj.name}}</span>
             <span style="margin-left: 60px;">性别：</span>
@@ -16,7 +16,7 @@
             <span style="margin-right: 60px;">NO：</span>
           </div>
         </div>
-        <div style="display: flex;justify-content: space-around;width: 573px;  padding: 5px;border-left: 1px solid black;border-right: 1px solid black;border-bottom: 1px solid black;">
+        <div style="display: flex;justify-content: space-around;width: 573px;  padding: 5px;border-bottom: 1px solid black;">
           <div>项目</div>
           <div>金额</div>
           <div>项目</div>
@@ -24,14 +24,14 @@
           <div>项目</div>
           <div>金额</div>
         </div>
-        <div style="border: 1px solid black; border-top: none; width: 573px;min-height: 220px;">
+        <div style=" width: 573px;min-height: 220px;">
           <div style="display:flex;justify-content: space-around;">
             
             <div style="">西药费</div>
             <div style="">{{ list.westernMedicineCostTotal ? list.westernMedicineCostTotal.toFixed(2) : '' }}</div>
             <div style="">检查费</div>
             <div style="">{{ list.checkCostTotal ? list.checkCostTotal.toFixed(2) : '' }}</div>
-            <div style="">治疗费</div>
+            <div style="position: relative;left: 16px">治疗费</div>
             <div style="position:  relative;left: 16px;">{{ list.treatCostTotal ? list.treatCostTotal.toFixed(2) : '' }}</div>
           </div>
 
@@ -61,9 +61,9 @@
             <div style="position:  relative;left: -169px;">{{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : '' }}</div>
           </div>
         </div>
-        <div style="border: 1px solid black;border-top:none;padding: 5px;width: 573px;">
+        <div style="border-top:1px solid black;width: 573px;">
           
-          <div style="border-right: 1px solid black;display: inline-block;width: 360px;">
+          <div style="border-right: 1px solid black;display: inline-block;width: 360px;padding: 5px;">
             <span>合计（大写）:</span>
             <span  style="">
               <span v-if="zhongwen.indexOf('万') > -1 && zhongwen.indexOf('拾') > -1 && zhongwen.indexOf('拾') == 1">
@@ -121,7 +121,9 @@
           </div>
           <span style="position: relative;top:0px;left:0px">￥：{{totalPrice.toFixed(2)}}</span>
         </div>
-      
+      </div>
+      <div style="width: 20px;font-size: 13px;position: absolute;top: 120px;left: -15px;">报销联加盖医院收费章有效</div>
+      <div style="width: 20px;font-size: 13px;position: absolute;top: 100px;left: 575px;">白 &nbsp; 存根 &nbsp; 红 &nbsp; 收据 &nbsp; 黄 &nbsp; 记账</div>
       <div style="border-bottom: 1px solid black;width:573px;font-Size:12px">
         <div  style="display:flex;margin: 3px 0px;">
           <div style="width:140px">医保：门慢统筹：{{list.order.hifp_pay}}</div>
@@ -146,7 +148,7 @@
           <div style="width:140px">收款人：{{list.admin_user_name}}</div>
         </div>
       </div>
-   
+      
   </div>
 </template>
 <script>

src/xt_pages/outpatientDoctorStation/print.vue

@@ -8,7 +8,6 @@
         :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date"
         :prescription_id="prescription_id"></printOne>
 
-
         <print-ten-one
           v-if="org_id == 10188" v-bind:childResponse="childResponse"
           :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient"
@@ -16,7 +15,6 @@
           :prescription_id="prescription_id"
         ></print-ten-one>
 
-
         <prinSeven v-if="org_id == 10375"
           v-bind:childResponse="childResponse"
           :advicePrint="advicePrint"

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -326,13 +326,6 @@
 <!--        </div>-->
 
 
-
-
-
-
-
-
-
         <div class="doctorBox">
           <p v-if="org_id == 10217">
             医师：

src/xt_pages/outpatientDoctorStation/treatPrint.vue

@@ -16,8 +16,8 @@
         <!-- 此下条为本地开发下页面 -->
         <!-- <printTwo v-if="org_id == 4" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo> -->
         <!-- org_id != 10138 && org_id != 10278 && org_id !=4&& org_id !=0 -->
-        <printOne v-if="org_id != 10138 && org_id != 10278 && org_id !=4 && org_id != 10375 " v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
-        <printThree v-if=" org_id == 10375" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printThree>
+        <printOne v-if="org_id != 10138 && org_id != 10278 && org_id !=4 && org_id != 10375 && org_id != 0 " v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
+        <printThree v-if=" org_id == 10375 || org_id==0" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printThree>
         <printTwo v-if="org_id == 10138 || org_id == 10278 || org_id ==4" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printTwo>
       </div>
   </div>

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

@@ -25,6 +25,7 @@
                             <thead>
                                 <tr>
                                   <td rowspan="2" width="80">序号</td>
+                                  <td rowspan="2" width="80">耗材名称</td>
                                   <td rowspan="2" width="80">耗材类型</td>
                                   <td rowspan="2" width="80">规格&单位</td>
                                   <td rowspan="2" width="80">生产厂商</td>
@@ -52,6 +53,7 @@
                             <tbody>
                                 <tr v-for="(item,index) in this.tableList" :key="index">
                                  <td>{{index + 1}}</td>
+                                 <td>{{item.good_name}}</td>
                                  <td>{{getGoodTypeName(item.good_type_id)}}</td>
                                  <td>{{item.specification_name}}</td>
                                  <td> {{getManufacturName(item.manufacturer)}}</td>