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

@@ -311,11 +311,12 @@
                         <tbody>
                         <tr>
                             <td width="70">穿刺方式:</td>
-                            <td width="220">
+                            <td width="250">
                             <div>
                               <label-box showValue="绳梯" :isChecked="record.assessment_before_dislysis.puncture_way.indexOf('绳梯')>-1 ? true : false"></label-box>&nbsp;
                               <label-box showValue="定点" :isChecked="record.assessment_before_dislysis.puncture_way.indexOf('定点')>-1 ? true : false"></label-box>&nbsp;
-                              <label-box showValue="直接穿刺" :isChecked="record.assessment_before_dislysis.puncture_way.indexOf('直接穿刺')>-1 ? true:false"></label-box>&nbsp;             
+                              <label-box showValue="直接穿刺" :isChecked="record.assessment_before_dislysis.puncture_way.indexOf('直接穿刺')>-1 ? true:false"></label-box>&nbsp;   
+                              <label-box showValue="扣眼" :isChecked="record.assessment_before_dislysis.puncture_way.indexOf('扣眼')>-1 ? true:false"></label-box>&nbsp;                       
                             </div>
                             </td>
                            <td width="60"></td>
@@ -946,16 +947,17 @@
                             </td>
                             <td width="35">min</td>
                             <td width="60">去向</td>
-                            <td width="200">
+                            <td width="250">
                             <div style="display:flex;justify-content:space-between;">
                                 <label-box :isChecked="record.assessment_after_dislysis.patient_gose == 1 ? true : false" showValue="回家"></label-box>
                                 <label-box :isChecked="record.assessment_after_dislysis.patient_gose == 2 ? true : false" showValue="留观"></label-box>
                                 <label-box :isChecked="record.assessment_after_dislysis.patient_gose == 3 ? true : false" showValue="住院"></label-box>
+                                <label-box :isChecked="record.assessment_after_dislysis.patient_gose == 4 ? true : false" showValue="门诊"></label-box>
                              </div>
                              </td>
-                              <td>
+                              <!-- <td>
                                  <div class="under-line">&nbsp;</div>
-                              </td>
+                              </td> -->
                             </tr>
                             </tbody>
                         </table>

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -552,6 +552,10 @@
           width="100"
         ></el-table-column>
 
+        <el-table-column label="透前血压(kg)" align="center" width="120" prop="pressure_name">
+          
+        </el-table-column>
+
         <el-table-column
           prop="dry_weight"
           label="干体重(kg)"
@@ -564,6 +568,7 @@
           align="center"
           width="120"
         ></el-table-column>
+
         <el-table-column
           prop="dialysis_after_weight"
           label="透后称重(kg)"
@@ -1566,7 +1571,7 @@ export default {
         } else {
           this.loading = false;
           this.total = response.data.data.total;
-          console.log(response.data.data.schedule)
+          console.log("世界文化遗产",response.data.data.schedule)
           for (let i = 0; i < response.data.data.schedule.length; i++) {
 
             if (response.data.data.schedule[i].patient&&response.data.data.schedule[i].patient.id > 0) {
@@ -1614,6 +1619,14 @@ export default {
                 SchedualPatientsTable["dialysis_after_weight"] =response.data.data.schedule[i].assessment_after_dislysis.weight_after;
               }
 
+
+              if (response.data.data.schedule[i].assessment_before_dislysis != null) {
+                SchedualPatientsTable["pressure_name"] =response.data.data.schedule[i].assessment_before_dislysis.systolic_blood_pressure+"/"+ response.data.data.schedule[i].assessment_before_dislysis.diastolic_blood_pressure;
+              }
+           
+
+
+
               if(response.data.data.schedule[i].monitoring_record!=null &&response.data.data.schedule[i].monitoring_record.length >0 ){
                  SchedualPatientsTable["monitoring_record"]  = response.data.data.schedule[i].monitoring_record
               }

src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue

@@ -382,6 +382,7 @@
                       <label-box showValue="绳梯" :isChecked="predialysis.puncture_way.indexOf('绳梯')>-1 ? true : false"></label-box>&nbsp;
                       <label-box showValue="定点" :isChecked="predialysis.puncture_way.indexOf('定点')>-1 ? true : false"></label-box>&nbsp;
                       <label-box showValue="直接穿刺" :isChecked="predialysis.puncture_way.indexOf('直接穿刺')>-1 ? true:false"></label-box>&nbsp;
+                      <label-box showValue="扣眼" :isChecked="predialysis.puncture_way.indexOf('扣眼')>-1 ? true : false"></label-box>&nbsp;
                     </div>
                   </td>
                   <td width='20'></td>
@@ -1310,16 +1311,17 @@
                     </td>
                     <td width="20">min</td>
                     <td width="50">去向:</td>
-                      <td width="200">
+                      <td width="250">
                         <div style="display:flex;justify-content:space-between;">
                           <label-box :isChecked="afterdialysis.patient_gose == 1 ? true : false" showValue="回家"></label-box>
                           <label-box :isChecked="afterdialysis.patient_gose == 2 ? true : false" showValue="留观"></label-box>
                           <label-box :isChecked="afterdialysis.patient_gose == 3 ? true : false" showValue="住院"></label-box>
+                          <label-box :isChecked="afterdialysis.patient_gose == 4 ? true : false" showValue="门诊"></label-box>
                         </div>
                       </td>
-                      <td>
+                      <!-- <td>
                         <div class="under-line">&nbsp;</div>
-                      </td>
+                      </td> -->
                   </tr>
                   </tbody>
                 </table>

src/xt_pages/hospitalStation/invoicePrint.vue

@@ -24,7 +24,7 @@
           :paramsObj="invoiceParams"
         ></printOne>
         <printTwo
-          v-if="org_id == 10215 "
+          v-if="org_id == 10215||org_id == 0"
           :paramsObj="invoiceParams"
         ></printTwo>
         <printThree

src/xt_pages/hospitalStation/invoiceTemplate/printTwo.vue

@@ -269,7 +269,7 @@
           </span>
         </span>
         <span style="position: absolute; top: 235px; left: 500px">{{
-          totalPrice.toFixed(2)
+          totalPrice
         }}</span>
       </div>
       <!-- <div style="position: absolute;top:300px;left:460px">现金：{{ list.psn_cash_money }}</div> -->
@@ -326,17 +326,7 @@ export default {
       getInvoice(params).then((res) => {
         this.$nextTick(() => {
           this.list = res.data.data;
-          this.totalPrice =
-            this.list.westernMedicineCostTotal +
-            this.list.checkCostTotal +
-            this.list.treatCostTotal +
-            this.list.bedCostTotal +
-            this.list.chineseTraditionalMedicineCostTotal +
-            this.list.laboratoryCostTotal +
-            this.list.operationCostTotal +
-            this.list.otherCostTotal +
-            this.list.materialCostTotal +
-            this.list.zhenChaCostTotal;
+          this.totalPrice =this.list.order.medfee_sumamt
           this.smalltoBIG(this.list.order.medfee_sumamt);
           var data = new Date(res.data.data.date * 1000);
           var month =

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -395,139 +395,7 @@
       searchAction() {
       },
       getInfo(order_id, obj) {
-        if( this.org_id  == 0){
-          console.log("12222444444")
-          let params = {
-            his_patient_id: obj.his_patient_id,
-            id: obj.order_id,
-            order_id: obj.order_id,
-            admin_user_id: this.$store.getters.xt_user.user.id,
-          };
-          getPrivateExpensesTwo(params).then((response) => {
-            if (response.data.state == 0) {
-              // this.$message.error(response.data.msg)
-
-              return false;
-            } else {
-              var that = this;
-              that.info = response.data.data.info;
-              that.info["p_admin"] = that.p_admin;
-              that.info["charge_admin"] = that.charge_admin;
-              that.info["order_number"] = response.data.data.order_number;
-              that.info["number"] = response.data.data.number;
-              that.info["fixmedins_name"] = response.data.data.org_name;
-              that.info["fixmedins_code"] = response.data.data.org_code;
-              that.info["bed_cost_total"] = response.data.data.bedCostTotal;
-              that.info["bed_cost_self_total"] =
-                response.data.data.bedCostSelfTotal;
-              that.info["bed_cost_part_self_total"] =
-                response.data.data.bedCostPartSelfTotal;
-
-              that.info["bedInscpTotal"] =
-                response.data.data.bedInscpTotal;
-              that.info["bedSelfTotal"] =
-                response.data.data.bedSelfTotal;
-
-
-              that.info["operationInscpTotal"] =
-                response.data.data.operationInscpTotal;
-              that.info["operationSelfTotal"] =
-                response.data.data.operationSelfTotal;
-
-              that.info["checkInscpTotal"] =
-                response.data.data.checkInscpTotal;
-              that.info["checkSelfTotal"] =
-                response.data.data.checkSelfTotal;
-
-              that.info["treatInscpTotal"] =
-                response.data.data.treatInscpTotal;
-              that.info["treatSelfTotal"] =
-                response.data.data.treatSelfTotal;
-
-
-              that.info["laboratoryInscpTotal"] =
-                response.data.data.laboratoryInscpTotal;
-              that.info["laboratorySelfTotal"] =
-                response.data.data.laboratorySelfTotal;
-
-
-              that.info["westernMedicineInscpTotal"] =
-                response.data.data.westernMedicineInscpTotal;
-              that.info["westernMedicineSelfTotal"] =
-                response.data.data.westernMedicineSelfTotal;
-
-              that.info["materialInscpTotal"] =
-                response.data.data.materialInscpTotal;
-              that.info["materialSelfTotal"] =
-                response.data.data.materialSelfTotal;
-
-              that.info["chineseTraditionalInscpTotal"] =
-                response.data.data.chineseTraditionalInscpTotal;
-              that.info["chineseTraditionalSelfTotal"] =
-                response.data.data.chineseTraditionalSelfTotal;
-
-              that.info["otherInscpTotal"] =
-                response.data.data.otherInscpTotal;
-              that.info["otherSelfTotal"] =
-                response.data.data.otherSelfTotal;
-
-              that.info["operation_cost_total"] =
-                response.data.data.operationCostTotal;
-              that.info["operation_cost_self_total"] =
-                response.data.data.operationCostSelfTotal;
-              that.info["operation_cost_part_self_total"] =
-                response.data.data.operationCostPartSelfTotal;
-
-              that.info["other_cost_total"] = response.data.data.otherCostTotal;
-              that.info["other_cost_self_total"] =
-                response.data.data.otherCostSelfTotal;
-              that.info["other_cost_part_self_total"] =
-                response.data.data.otherCostPartSelfTotal;
-
-              that.info["material_cost_total"] =
-                response.data.data.materialCostTotal;
-              that.info["material_cost_self_total"] =
-                response.data.data.materialCostSelfTotal;
-              that.info["material_cost_part_self_total"] =
-                response.data.data.materialCostPartSelfTotal;
-
-              that.info["western_medicine_cost_total"] =
-                response.data.data.westernMedicineCostTotal;
-              that.info["western_medicine_cost_self_total"] =
-                response.data.data.westernMedicineCostSelfTotal;
-              that.info["western_medicine_cost_part_self_total"] =
-                response.data.data.westernMedicineCostPartSelfTotal;
-
-              that.info["chinese_traditional_medicine_cost_total"] =
-                response.data.data.chineseTraditionalMedicineCostTotal;
-              that.info["chinese_traditional_medicine_cost_self_total"] =
-                response.data.data.chineseTraditionalMedicineCostSelfTotal;
-              that.info["chinese_traditional_medicine_cost_part_self_total"] =
-                response.data.data.chineseTraditionalMedicineCostPartSelfTotal;
-
-              that.info["check_cost_total"] = response.data.data.checkCostTotal;
-              that.info["check_cost_self_total"] =
-                response.data.data.checkCostSelfTotal;
-              that.info["check_cost_part_self_total"] =
-                response.data.data.checkCostPartSelfTotal;
-
-              that.info["laboratory_cost_total"] =
-                response.data.data.laboratoryCostTotal;
-              that.info["laboratory_cost_self_total"] =
-                response.data.data.laboratoryCostSelfTotal;
-              that.info["laboratory_cost_part_self_total"] =
-                response.data.data.laboratoryCostPartSelfTotal;
-
-              that.info["treat_cost_total"] = response.data.data.treatCostTotal;
-              that.info["treat_cost_self_total"] =
-                response.data.data.treatCostSelfTotal;
-              that.info["treat_cost_part_self_total"] =
-                response.data.data.treatCostPartSelfTotal;
-              console.log(that.info)
 
-            }
-          });
-        }else{
           if (obj.balance_accounts_type == 2 ) {
             let params = {
               his_patient_id: obj.his_patient_id,
@@ -1387,7 +1255,7 @@
             }
           }
 
-        }
+
 
       },
     },

src/xt_pages/outpatientCharges/statementTemplate/privateChargePrint.vue

@@ -93,13 +93,13 @@
       </tr>
       <tr>
         <td>床位费</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.bed_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.bed_cost_self_total}}</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.bed_cost_part_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.bed_cost_total.toFixed(2)}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.bed_cost_self_total.toFixed(2)}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.bed_cost_part_self_total.toFixed(2)}}</td>
         <td>西成药</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.western_medicine_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.western_medicine_cost_self_total}}</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.western_medicine_cost_part_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.western_medicine_cost_total.toFixed(2)}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.western_medicine_cost_self_total.toFixed(2)}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.western_medicine_cost_part_self_total.toFixed(2)}}</td>
       </tr>
       <tr>
         <td>中药费</td>
@@ -107,11 +107,11 @@
         <td style="text-align:right;padding-right:10px;">0</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
         <td>中成药</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.chinese_traditional_medicine_cost_total}}
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.chinese_traditional_medicine_cost_total.toFixed(2)}}
         </td>
-        <td style="text-align:right;padding-right:10px;">{{info.chinese_traditional_medicine_cost_self_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.chinese_traditional_medicine_cost_self_total.toFixed(2)}}</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">
-          {{info.chinese_traditional_medicine_cost_part_self_total}}
+          {{info.chinese_traditional_medicine_cost_part_self_total.toFixed(2)}}
         </td>
       </tr>
       <tr>
@@ -120,15 +120,15 @@
         <td style="text-align:right;padding-right:10px;">0</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
         <td>检查费</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.check_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.check_cost_self_total}}</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.check_cost_part_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.check_cost_total.toFixed(2)}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.check_cost_self_total.toFixed(2)}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.check_cost_part_self_total.toFixed(2)}}</td>
       </tr>
       <tr>
         <td>治疗费</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.treat_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.treat_cost_self_total}}</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.treat_cost_part_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.treat_cost_total.toFixed(2)}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.treat_cost_self_total.toFixed(2)}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.treat_cost_part_self_total.toFixed(2)}}</td>
         <td>放射费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
         <td style="text-align:right;padding-right:10px;">0</td>
@@ -136,13 +136,13 @@
       </tr>
       <tr>
         <td>手术费</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.operation_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.operation_cost_self_total}}</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.operation_cost_part_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.operation_cost_total.toFixed(2)}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.operation_cost_self_total.toFixed(2)}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.operation_cost_part_self_total.toFixed(2)}}</td>
         <td>化验费</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.laboratory_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.laboratory_cost_self_total}}</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.laboratory_cost_part_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.laboratory_cost_total.toFixed(2)}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.laboratory_cost_self_total.toFixed(2)}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.laboratory_cost_part_self_total.toFixed(2)}}</td>
       </tr>
       <tr>
         <td>输血费</td>
@@ -156,9 +156,9 @@
       </tr>
       <tr>
         <td>其他</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.other_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.other_cost_self_total}}</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.other_cost_part_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.other_cost_total.toFixed(2)}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.other_cost_self_total.toFixed(2)}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.other_cost_part_self_total.toFixed(2)}}</td>
         <td>麻醉费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
         <td style="text-align:right;padding-right:10px;">0</td>
@@ -166,9 +166,9 @@
       </tr>
       <tr>
         <td>材料费</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.material_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.material_cost_self_total}}</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.material_cost_part_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.material_cost_total.toFixed(2)}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.material_cost_self_total.toFixed(2)}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.material_cost_part_self_total.toFixed(2)}}</td>
         <td>特殊检查费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
         <td style="text-align:right;padding-right:10px;">0</td>
@@ -186,24 +186,24 @@
       </tr>
       <tr>
         <td>合计</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_total) +
-            parseFloat(info.operation_cost_total) + parseFloat(info.other_cost_total) +
-            parseFloat(info.material_cost_total) + parseFloat(info.western_medicine_cost_total) +
-            parseFloat(info.chinese_traditional_medicine_cost_total) + parseFloat(info.check_cost_total) +
-            parseFloat(info.laboratory_cost_total) + parseFloat(info.treat_cost_total)).toFixed(2) }}
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_total.toFixed(2)) +
+            parseFloat(info.operation_cost_total.toFixed(2)) + parseFloat(info.other_cost_total.toFixed(2)) +
+            parseFloat(info.material_cost_total.toFixed(2)) + parseFloat(info.western_medicine_cost_total.toFixed(2)) +
+            parseFloat(info.chinese_traditional_medicine_cost_total.toFixed(2)) + parseFloat(info.check_cost_total.toFixed(2)) +
+            parseFloat(info.laboratory_cost_total.toFixed(2)) + parseFloat(info.treat_cost_total.toFixed(2))).toFixed(2) }}
         </td>
-        <td style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_self_total )+
-            parseFloat(info.operation_cost_self_total) + parseFloat(info.other_cost_self_total) +
-            parseFloat(info.material_cost_self_total) + parseFloat(info.western_medicine_cost_self_total) +
-            parseFloat(info.chinese_traditional_medicine_cost_self_total) + parseFloat(info.check_cost_self_total) +
-            parseFloat(info.laboratory_cost_self_total) + parseFloat(info.treat_cost_self_total)).toFixed(2)}}
+        <td style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_self_total.toFixed(2) )+
+            parseFloat(info.operation_cost_self_total.toFixed(2)) + parseFloat(info.other_cost_self_total.toFixed(2)) +
+            parseFloat(info.material_cost_self_total.toFixed(2)) + parseFloat(info.western_medicine_cost_self_total.toFixed(2)) +
+            parseFloat(info.chinese_traditional_medicine_cost_self_total.toFixed(2)) + parseFloat(info.check_cost_self_total.toFixed(2)) +
+            parseFloat(info.laboratory_cost_self_total.toFixed(2)) + parseFloat(info.treat_cost_self_total.toFixed(2))).toFixed(2)}}
         </td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_part_self_total) +
-            parseFloat(info.operation_cost_part_self_total) + parseFloat(info.other_cost_part_self_total) +
-            parseFloat(info.material_cost_part_self_total) + parseFloat(info.western_medicine_cost_part_self_total) +
-            parseFloat(info.chinese_traditional_medicine_cost_part_self_total) +
-            parseFloat(info.check_cost_part_self_total) + parseFloat(info.laboratory_cost_part_self_total) +
-            parseFloat(info.treat_cost_part_self_total)).toFixed(2)}}
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_part_self_total.toFixed(2)) +
+            parseFloat(info.operation_cost_part_self_total.toFixed(2)) + parseFloat(info.other_cost_part_self_total.toFixed(2)) +
+            parseFloat(info.material_cost_part_self_total.toFixed(2)) + parseFloat(info.western_medicine_cost_part_self_total.toFixed(2)) +
+            parseFloat(info.chinese_traditional_medicine_cost_part_self_total.toFixed(2)) +
+            parseFloat(info.check_cost_part_self_total.toFixed(2)) + parseFloat(info.laboratory_cost_part_self_total.toFixed(2)) +
+            parseFloat(info.treat_cost_part_self_total.toFixed(2))).toFixed(2)}}
         </td>
         <td style="text-align:right;padding-right:10px;"></td>
         <td colspan="2" style="text-align:right;padding-right:10px;"></td>

src/xt_pages/user/components/PatientForm.vue

@@ -33,7 +33,7 @@
               <el-form-item
                 :label="item.item_name"
                 v-else
-                
+
                 :prop="'formItem.' + index + '.value'"
               >
                 <el-select
@@ -711,7 +711,7 @@
                 <el-input
                   v-model="form.respiratory"
                   style="width: 220px"
-                  
+
                 >
                   <template slot="prepend">呼吸: </template>
                   <template slot="append">次/分</template>
@@ -1184,7 +1184,7 @@ const defaultForm = {
   dbp: "",
   showOne:true,
   treatment_plan:"",
- 
+
 };
 
 export default {
@@ -1359,7 +1359,7 @@ export default {
         firstDialysisDate: [
           { required: true, message: "请选择日期", trigger: "blur" }
         ],
-      
+
         homeTelephone: [{ validator: checkFamilyPhone, trigger: "blur" }],
         homeAddress: [{ required: true, message: "请填写住址", trigger: "blur" }],
       },
@@ -1378,10 +1378,10 @@ export default {
     }
   },
   created() {
-  
+
    this.fetchAllAdminUsers();
-  
-  
+
+
     if(this.isEdit == true){
        this.showLapseto = false
     }
@@ -1443,7 +1443,7 @@ export default {
         if (response.data.state === 1) {
           this.form.doctor = this.$store.getters.xt_user.user.id
           this.adminUserOptions = response.data.data.users;
-         
+
         }
       });
     },
@@ -1553,7 +1553,7 @@ export default {
             this.form.troble_shoot = parseInt(this.form.troble_shoot)
             this.form.doctor = parseInt(this.form.doctor)
             console.log("form233322332w",this.form)
-           
+
             createPatient(this.form)
               .then(response => {
                 if (response.data.state == 0) {

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -172,66 +172,66 @@
           <span v-if="scope.row.dialysissolution.anticoagulant === 9">达肝素</span>
           <span v-if="scope.row.dialysissolution.anticoagulant === 10">体外抗凝</span>
           <span v-if="scope.row.dialysissolution.anticoagulant === 11">那屈肝素</span>
-         <span v-if="scope.row.prescription.antioxidant_commodity_name!=''">
+         <!-- <span v-if="scope.row.prescription.antioxidant_commodity_name!=''">
              (<span>{{scope.row.prescription.antioxidant_commodity_name}}</span>)
-          </span>
+          </span> -->
         </template>
       </el-table-column>
       <el-table-column label="总量" min-width="100" align="center">
         <template slot-scope="scope">
-          <span v-if="scope.row.prescription.anticoagulant == 1">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + "mg"
+          <span v-if="scope.row.dialysissolution.anticoagulant == 1">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + "mg"
               : ""
           }}</span>
-          <span v-if="scope.row.prescription.anticoagulant == 2">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+          <span v-if="scope.row.dialysissolution.anticoagulant == 2">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + "iu"
               : ""
           }}</span>
-          <span v-if="scope.row.prescription.anticoagulant == 3">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+          <span v-if="scope.row.dialysissolution.anticoagulant == 3">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + "iu"
               : ""
           }}</span>
-          <span v-if="scope.row.prescription.anticoagulant == 4">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + "mg"
+          <span v-if="scope.row.dialysissolution.anticoagulant == 4">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + "mg"
               : ""
           }}</span>
-          <span v-if="scope.row.prescription.anticoagulant == 5">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + "mg"
+          <span v-if="scope.row.dialysissolution.anticoagulant == 5">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + "mg"
               : ""
           }}</span>
-          <span v-if="scope.row.prescription.anticoagulant == 6">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+          <span v-if="scope.row.dialysissolution.anticoagulant == 6">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + "iu"
               : ""
           }}</span>
-          <span v-if="scope.row.prescription.anticoagulant == 7">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+          <span v-if="scope.row.dialysissolution.anticoagulant == 7">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + "iu"
               : ""
           }}</span>
-          <span v-if="scope.row.prescription.anticoagulant == 8">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+          <span v-if="scope.row.dialysissolution.anticoagulant == 8">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + "iu"
               : ""
           }}</span>
-         <span v-if="scope.row.prescription.anticoagulant == 9">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+         <span v-if="scope.row.dialysissolution.anticoagulant == 9">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + "iu"
               : ""
           }}</span>
-          <span v-if="scope.row.prescription.anticoagulant == 10">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+          <span v-if="scope.row.dialysissolution.anticoagulant == 10">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + "iu"
               : ""
           }}</span>
-          <span v-if="scope.row.prescription.anticoagulant == 11">{{
-            scope.row.prescription.anticoagulant_zongliang
-              ? scope.row.prescription.anticoagulant_zongliang + "iu"
+          <span v-if="scope.row.dialysissolution.anticoagulant == 11">{{
+            scope.row.dialysissolution.anticoagulant_zongliang
+              ? scope.row.dialysissolution.anticoagulant_zongliang + "iu"
               : ""
           }}</span>
         </template>

src/xt_pages/workforce/remind_print_setting.vue

@@ -125,11 +125,12 @@
                 <!-- 透析器灌流器 -->
                
                  <div>
-                  <span v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">透析器/灌流器:</span>
+                  <span v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">透析器/灌流器 <span v-if="org_id==10445">/滤过器</span>:</span>
                   <span v-if="printObj.dialyzers == 1&& main_collection.dialysissolution.dialysis_dialyszers!=''">{{main_collection.dialysissolution.dialysis_dialyszers}}</span>
                   <span v-if="printObj.perfusion_apparatus == 1&& main_collection.dialysissolution.dialysis_irrigation!=''">{{main_collection.dialysissolution.dialysis_irrigation}}</span>
-
+               
                   <span v-if="org_id == 10440 && main_collection.dialysissolution.dialyzer_perfusion_apparatus!=''">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
+                  <span v-if="org_id == 10445"><span v-if="main_collection.dialysissolution.dialysis_strainer!=''">/</span>{{ main_collection.dialysissolution.dialysis_strainer }}</span>
                 </div>
                 <div v-if="printObj.doctor_advice == 1">
                     医嘱：