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/template/DialysisPrintOrdersixtySeven.vue

@@ -37,7 +37,7 @@
               <tr>
                 <td>姓名：{{ patientInfo.name }}</td>
                 <td>性别： {{ patientInfo_gender_1 ? "男" : "女" }}</td>
-                <td>年龄：{{ getAge(patientInfo) }}</td>
+                <td>年龄：{{ getAge(patientInfo) }}岁</td>
                 <td>门诊号： {{
                     patientInfo.admission_number
                       ? patientInfo.admission_number
@@ -57,9 +57,9 @@
                   </span>
                 </td>
                 <td>治疗时间：{{getTime(prescription.record_date,"{y}-{m}-{d}") }}</td>
-                <td>干体重：{{ predialysis.dry_weight ? predialysis.dry_weight : "/" }}</td>
+                <td>干体重：{{ predialysis.dry_weight ? predialysis.dry_weight : "/" }}kg</td>
                 <td>上次透后体重：
-                  {{lastafterdialysis.weight_after?lastafterdialysis.weight_after:"未称重"}}
+                  {{lastafterdialysis.weight_after?lastafterdialysis.weight_after:"未称重"}}kg
                 </td>
               </tr>
               <tr>
@@ -68,7 +68,7 @@
                     predialysis.weight_before ? predialysis.weight_before : "/"
                   }}kg
                 </td>
-                <td>透析总次数：{{ patientInfo.total_dialysis + patientInfo.user_sys_before_count }}</td>
+                <td>透析总次数：{{ patientInfo.total_dialysis + patientInfo.user_sys_before_count }}次</td>
                 <td colspan="2">患者评估：
                   入科方式:
                   <span v-if="receiverTreatmentAccess.way == 1">步行</span>
@@ -131,8 +131,8 @@
                         }}次/分
                       </span>&nbsp;
                     BP <span>
-                        {{predialysis.systolic_blood_pressure ? predialysis.systolic_blood_pressure : "/"}} /
-                        {{ predialysis.diastolic_blood_pressure ? predialysis.diastolic_blood_pressure : '/' }}
+                        {{predialysis.systolic_blood_pressure ? predialysis.systolic_blood_pressure : "/"}} mmHg/
+                        {{ predialysis.diastolic_blood_pressure ? predialysis.diastolic_blood_pressure : '/' }}mmHg
                       </span>&nbsp;
                   </div>
                 </td>
@@ -179,7 +179,7 @@
                   {{ prescription.dialysis_duration_minute ? prescription.dialysis_duration_minute : "0" }} min
                 </td>
                 <td>预超：{{prescription.target_ultrafiltration }}L</td>
-                <td>血流量：{{ prescription.blood_flow_volume ? prescription.blood_flow_volume : "/" }}</td>
+                <td>血流量：{{ prescription.blood_flow_volume ? prescription.blood_flow_volume : "/" }}ml/min</td>
               </tr>
               <tr>
                 <td colspan="4">抗凝剂：
@@ -251,18 +251,16 @@
                 <td colspan="2">
                   处方医生：
                   <span
-                    style="height: 30px; display: inline-block"
-                      v-if="setAdminUserES(doctor_advices[0].advice_doctor) == ''"
-                      >
+                    style="height: 30px; display: inline-block">
                      {{ getAdminUser(doctor_advices[0].advice_doctor) }}
                   </span>
-                  <img
+                  <!-- <img
                     style="height: 60px; width:30%"
                     :src="setAdminUserES(doctor_advices[0].advice_doctor)"
                     alt=""
                     srcset=""
                     v-else
-                  />
+                  /> -->
                 </td>
               </tr>
             </table>
@@ -271,7 +269,7 @@
           <div class="infoTitle">透析记录</div>
           <div style="margin: 10px 0px;">
             <table class="table" border="1"
-            style="border-collapse: collapse;text-align: center;width: 100%;"
+            style="border-collapse: collapse;width: 100%;"
             >
               <tr>
                 <th rowspan="2" width="50">时间</th>
@@ -281,9 +279,9 @@
                 <th rowspan="2" width="80">签名</th>
               </tr>
               <tr>
-                <th width="50">血压<br>mmHg</th>
-                <th width="50">呼吸<br>次/分</th>
-                <th width="50">心率<br>次/分</th>
+                <th width="70">血压<br>mmHg</th>
+                <th width="40">呼吸<br>次/分</th>
+                <th width="40">心率<br>次/分</th>
                 <th width="50">血流量<br>ml/min</th>
                 <th width="50">静脉压<br>mmHg</th>
                 <th width="50">透析液<br>温度℃</th>
@@ -292,7 +290,7 @@
                 <th width="50">超滤率<br>ml/h</th>
                 <th width="50">电导率<br>ms/cm</th>
               </tr>
-              <tr v-for="(monitor, monindex) in monitors" :key="monindex">
+               <tr v-for="(monitor, monindex) in monitors" :key="monindex">
                 <td>{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
                 <td>{{monitor.systolic_blood_pressure? monitor.systolic_blood_pressure + "/": ""}}
                 {{monitor.diastolic_blood_pressure? monitor.diastolic_blood_pressure: ""}}</td>
@@ -305,28 +303,26 @@
                 <td>{{monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</td>
                 <td>{{monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: ""}}</td>
                 <td>{{monitor.conductivity? monitor.conductivity: ""}}</td>
-                <td>
+               <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.monitoring_nurse) == ''"
-                      >
+                    style="height: 30px; display: inline-block">
                      {{ getAdminUser(monitor.monitoring_nurse) }}
                   </span>
-                  <img
+                  <!-- <img  v-if="setAdminUserES(monitor.monitoring_nurse) != ''"
                     style="height: 60px"
                     :src="setAdminUserES(monitor.monitoring_nurse)"
                     alt=""
                     srcset=""
                     v-else
-                  />
+                  /> -->
 
                 </td>
-              </tr>
+                </tr>
             </table>
           </div>
           <div style="margin-bottom: 10px;">
@@ -383,17 +379,9 @@
                 </td>
 
                 <td height="32px">
-                  <span
-                    v-if="setAdminUserES(advice.advice_doctor) == ''"
-                    >{{ getAdminUser(advice.advice_doctor) }}</span
-                  >
-                  <img
-                    style="height: 60px ;width: 84%;"
-                    :src="setAdminUserES(advice.advice_doctor)"
-                    alt=""
-                    srcset=""
-                    v-else
-                  />
+                  <span>
+                    {{ getAdminUser(advice.advice_doctor) }}
+                  </span>
                 </td>
                 <td height="32px">
                   <span v-if="advice.execution_time">{{
@@ -401,17 +389,9 @@
                   }}</span>
                 </td>
                 <td height="32px">
-                  <span
-                    v-if="setAdminUserES(advice.execution_staff) == ''"
-                    >{{ getAdminUser(advice.execution_staff) }}</span
-                  >
-                  <img
-                    style="height: 60px;width: 84%;"
-                    :src="setAdminUserES(advice.execution_staff)"
-                    alt=""
-                    srcset=""
-                    v-else
-                  />
+                  <span>
+                    {{ getAdminUser(advice.execution_staff) }}
+                  </span>
                 </td>
               </tr>
             </table>
@@ -431,7 +411,7 @@
                             afterdialysis.additional_weight
                         ).toFixed(1)
                       : "/"
-                  }}kg
+                  }} kg
                 </td>
                 <td>实超：{{ afterdialysis.actual_ultrafiltration }}ml</td>
                 <td>实际治疗时长：
@@ -496,15 +476,7 @@
                 <td width="8%">上机护士：</td>
                 <td width="10%">
                   <div>
-                    <span
-                      v-if="
-                        setAdminUserES(
-                          dialysisOrder == null
-                            ? 0
-                            : dialysisOrder.start_nurse
-                        ) == ''
-                      "
-                    >
+                    <span>
                       {{
                         getAdminUser(
                           dialysisOrder == null
@@ -512,36 +484,22 @@
                             : dialysisOrder.start_nurse
                         )
                       }}</span>
-                    <img
-                      style="height: 65px;width: 100%;"
-                      :src="
-                        setAdminUserES(
-                          dialysisOrder == null
-                            ? 0
-                            : dialysisOrder.start_nurse
-                        )
-                      "
-                      alt=""
-                      srcset=""
-                      v-else
-                    />
-
                   </div>
                 </td>
                 <td width="8%">核对护士：</td>
                 <td width="10%">
-                  <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.finish_nurse)}}</span>
-                  <img style="height:65px;width: 90%;" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse)" alt="" srcset="" v-else>
+                  <span>{{getAdminUser(dialysisOrder==null?0:dialysisOrder.finish_nurse)}}</span>
+                  <!-- <img style="height:65px;width: 90%;" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse)" alt="" srcset="" v-else> -->
                 </td>
                 <td width="8%">下机护士：</td>
                 <td width="10%">
-                  <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.finish_nurse)}}</span>
-                  <img style="height:65px;width: 90%;" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse)" alt="" srcset="" v-else>
+                  <span>{{getAdminUser(dialysisOrder==null?0:dialysisOrder.finish_nurse)}}</span>
+                  <!-- <img style="height:65px;width: 90%;" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse)" alt="" srcset="" v-else> -->
                 </td>
                 <td width="5%">医生：</td>
                 <td width="10%">
-                  <span v-if="setAdminUserES(prescription.creater) == ''">{{getAdminUser(prescription.creater)}}</span>
-                  <img style="height:65px;width: 90%;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else>
+                  <span>{{getAdminUser(prescription.creater)}}</span>
+                  <!-- <img style="height:65px;width: 90%;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else> -->
                 </td>
               </tr>
             </table>

src/xt_pages/outpatientCharges/invoiceTemplate/printTen.vue

@@ -9,8 +9,8 @@
           <div >
             <span>姓名：{{paramsObj.name}}</span>
             <span style="margin-left: 60px;">性别：</span>
-            <span style="" v-if="list.gender == 1">女</span>
-            <span style="" v-else-if="list.gender == 2">男</span>
+            <span style="" v-if="list.gender == 2">女</span>
+            <span style="" v-else-if="list.gender == 1">男</span>
           </div>
           <div>
             <span style="margin-right: 60px;">NO：</span>

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -23,7 +23,7 @@
           org_id == 10138 ||
           org_id == 9504 ||
           org_id == 10028 ||
-          org_id == 10278
+          org_id == 10278 || org_id == 0
         "
       >
         <printTwo :info="info" v-if="org_id == 9990"></printTwo>
@@ -31,10 +31,10 @@
           :info="info"
           :paramsObj="paramsObj"
           :balanceAccounts="balanceAccounts"
-          v-if="org_id == 10138 || org_id == 0 || org_id == 10278  "
+          v-if="org_id == 10138 || org_id == 10278  "
         ></printThree>
         <printFour
-          v-if="org_id == 9504 || org_id == 10028 || org_id == 10088"
+          v-if="org_id == 9504 || org_id == 10028 || org_id == 10088 || org_id == 0 "
           :info="info"
           :paramsObj="paramsObj"
           :balanceAccounts="balanceAccounts"
@@ -483,8 +483,7 @@
                   console.log("this.num", this.num);
                 }
               });
-            } else
-              if (this.org_id == 10028) {
+            } else if (this.org_id == 10028 ||  this.org_id == 0  || this.org_id == 9504) {
               getPrivateExpenses(params).then((response) => {
                 if (response.data.state == 0) {
                   // this.$message.error(response.data.msg)
@@ -528,8 +527,7 @@
                   console.log(111, this.balanceAccounts);
                 }
               });
-            } else
-            {
+            } else {
               getPrivateExpensesOrder(params).then((response) => {
                 if (response.data.state == 0) {
                   // this.$message.error(response.data.msg)

src/xt_pages/outpatientCharges/statementTemplate/printFour.vue

@@ -32,55 +32,55 @@
                       <div style="width:20%;">
                           <div class="chargeUl" v-if="info.bed_cost_total > 0">
                               <p style="width:50%;">床位费</p>
-                              <p style="width:50%;">{{info.bed_cost_total?info.bed_cost_total:0}}元</p>
+                              <p style="width:50%;">{{info.bed_cost_total?info.bed_cost_total.toFixed(2):0}}元</p>
                           </div>
                           <div class="chargeUl" v-if="info.operation_cost_total > 0">
                               <p style="width:50%;">手术费</p>
-                              <p style="width:50%;">{{info.operation_cost_total?info.operation_cost_total:0}}元</p>
+                              <p style="width:50%;">{{info.operation_cost_total?info.operation_cost_total.toFixed(2):0}}元</p>
                           </div>
                           <div class="chargeUl" v-if="info.other_cost_total > 0">
                               <p style="width:50%;">其他费</p>
-                              <p style="width:50%;">{{info.other_cost_total?info.other_cost_total:0}}元</p>
+                              <p style="width:50%;">{{info.other_cost_total?info.other_cost_total.toFixed(2):0}}元</p>
                           </div>
                           <div class="chargeUl" v-if="info.material_cost_total > 0">
                               <p style="width:50%;">材料费</p>
-                              <p style="width:50%;">{{info.material_cost_total?info.material_cost_total:0}}元</p>
+                              <p style="width:50%;">{{info.material_cost_total?info.material_cost_total.toFixed(2):0}}元</p>
                           </div>
                           <div class="chargeUl" v-if="info.western_medicine_cost_total > 0">
                               <p style="width:50%;">西药费</p>
-                              <p style="width:50%;">{{info.western_medicine_cost_total?info.western_medicine_cost_total:0}}元</p>
+                              <p style="width:50%;">{{info.western_medicine_cost_total?info.western_medicine_cost_total.toFixed(2):0}}元</p>
                           </div>
                           <div class="chargeUl" v-if="info.chinese_traditional_medicine_cost_total > 0">
                               <p style="width:50%;">中成费</p>
-                              <p style="width:50%;">{{info.chinese_traditional_medicine_cost_total?info.chinese_traditional_medicine_cost_total:0}}元</p>
+                              <p style="width:50%;">{{info.chinese_traditional_medicine_cost_total?info.chinese_traditional_medicine_cost_total.toFixed(2):0}}元</p>
                           </div>
                           <div class="chargeUl" v-if="info.check_cost_total > 0">
                               <p style="width:50%;">检查费</p>
-                              <p style="width:50%;">{{info.check_cost_total?info.check_cost_total:0}}元</p>
+                              <p style="width:50%;">{{info.check_cost_total?info.check_cost_total.toFixed(2):0}}元</p>
                           </div>
                           <div class="chargeUl" v-if="info.laboratory_cost_total > 0">
                               <p style="width:50%;">化验费</p>
-                              <p style="width:50%;">{{info.laboratory_cost_total?info.laboratory_cost_total:0}}元</p>
+                              <p style="width:50%;">{{info.laboratory_cost_total?info.laboratory_cost_total.toFixed(2):0}}元</p>
                           </div>
                           <div class="chargeUl" v-if="info.treat_cost_total > 0">
                               <p style="width:50%;">治疗费</p>
-                              <p style="width:50%;">{{info.treat_cost_total?info.treat_cost_total:0}}元</p>
+                              <p style="width:50%;">{{info.treat_cost_total?info.treat_cost_total.toFixed(2):0}}元</p>
                           </div>
                           <div class="chargeUl" style="border-top:1px solid #000;">
                               <p style="width:50%;">费用合计</p>
-                              <p style="width:50%;">{{info.medfee_sumamt?info.medfee_sumamt:0}}元</p>
+                              <p style="width:50%;">{{info.medfee_sumamt?info.medfee_sumamt.toFixed(2):0}}元</p>
                           </div>
                           <div class="chargeUl" style="border-top:1px solid #000;">
                               <p style="width:50%;">记账支付</p>
-                              <p style="width:50%;">{{info.hifp_pay?info.hifp_pay:0}}元</p>
+                              <p style="width:50%;">{{info.hifp_pay?info.hifp_pay.toFixed(2):0}}元</p>
                           </div>
                           <div class="chargeUl" style="border-top:1px solid #000;">
                               <p style="width:50%;">个人账号</p>
-                              <p style="width:50%;">{{info.acct_pay?info.acct_pay:0}}元</p>
+                              <p style="width:50%;">{{info.acct_pay?info.acct_pay.toFixed(2):0}}元</p>
                           </div>
                           <div class="chargeUl" style="border-top:1px solid #000;border-bottom:1px solid #000;">
                               <p style="width:50%;">现金支付</p>
-                              <p style="width:50%;">{{info.psn_pay?info.psn_pay:0}}元</p>
+                              <p style="width:50%;">{{info.psn_pay?info.psn_pay.toFixed(2):0}}元</p>
                           </div>
                       </div>
                       <div style="width:80%;max-height:500px;">
@@ -171,7 +171,7 @@
                               <span v-if="item.type == 2">治疗费</span>
                               <span v-if="item.type == 3">耗材费</span>
                             </p>
-                            <p style="width:50%;">{{item.total?item.total:0}}元</p>
+                            <p style="width:50%;">{{item.total?item.total.toFixed(2):0}}元</p>
                         </div>
                         <div class="chargeUl" style="border-top:1px solid #000;">
                             <p style="width:50%;">费用合计</p>
@@ -408,6 +408,7 @@ export default {
       }else{
         this.page = 1
         this.pageArr = []
+
         if(this.balanceAccounts.order_info.length <= 13){
             this.page = 1
             this.pageArr.push(this.balanceAccounts.order_info.length)