Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

@@ -49,15 +49,15 @@
           <div class="inline_block">
             病区：
             <div class="under_line" style="width: 50px;text-align: center;">
-              <span v-if="org_id == 10121">{{ patientInfo.DialysisSchedule.device_zone.name ? patientInfo.DialysisSchedule.device_zone.name : '' }}</span>
-              <span v-else>{{ "/" }}</span>
+              <span>{{ patientInfo.DialysisSchedule.device_zone.name ? patientInfo.DialysisSchedule.device_zone.name : '' }}</span>
+              
             </div>
           </div>
           <div class="inline_block">
             床号：
             <div class="under_line" style="width: 50px;text-align: center;">
-              <span v-if="org_id == 10121">{{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}</span>
-              <span v-else>{{ "/" }}</span>
+              <span>{{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}</span>
+              
             </div>
           </div>
           <div class="inline_block">
@@ -91,7 +91,9 @@
               :key="index"
               class="under_line"
               v-if="receiverTreatmentAccess.consciousness == item.id"
-              style="width: 180px; text-align: left"
+              
+              style="width: 100px; text-align: left"
+
             >
               {{ item.name }}
             </div>
@@ -99,7 +101,7 @@
           
           <div class="inline_block" style="margin-left: 10px;">
             诊断：
-            <div class="under_line" style="width: 640px;text-align: left;word-wrap: break-word;white-space: inherit;">
+            <div class="under_line" style="width: 500px;text-align: left;word-wrap: break-word;white-space: inherit;">
               {{ patientInfo.diagnose }}
             </div>
           </div>
@@ -138,13 +140,11 @@
                       <div class="inline_block" style="flex: 1">
                       病人食欲：
                       <div
-                        v-for="(item, index) in appetite_arr"
-                        :key="index"
+                        
                         class="under_line"
-                        v-if="receiverTreatmentAccess.appetite == item.id"
-                        style="width: 180px; text-align: left"
+                        style="width: 135px; text-align: left"
                       >
-                        {{ item.name ? item.name : '/' }}
+                        11
                       </div>
                     </div>
 
@@ -888,11 +888,11 @@
                     <div class="inline_block" style="margin-left:10px;flex:1.5;">
                       BP：
                       <div class="under_line" style="width: 50px;text-align: center;">
-                        {{ afterdialysis.systolic_blood_pressure ? afterdialysis.systolic_blood_pressure : "/" }}
+                        {{ afterBP.systolic_blood_pressure ? afterBP.systolic_blood_pressure : "/" }}
                       </div>
                       /
                       <div class="under_line" style="width: 50px;text-align: center;">
-                        {{ afterdialysis.diastolic_blood_pressure ? afterdialysis.diastolic_blood_pressure : "/" }}
+                        {{ afterBP.diastolic_blood_pressure ? afterBP.diastolic_blood_pressure : "/" }}
                       </div>
                       mmHg
                     </div>
@@ -1186,6 +1186,7 @@ export default {
       jilurow: 0,
       advice_jilurow: 0,
       loading: false,
+      afterBP:{},
       orgname: '',
       patientInfo_gender_1: false,
       patientInfo_gender_2: false,
@@ -1588,7 +1589,6 @@ export default {
         this.lastafterdialysis = response.data.data.assessmentAfterDislysis
         console.log("上次透后体重",this.lastafterdialysis.weight_after)
         this.operators = response.data.data.operators
-        console.log('operators', this.operators)
         this.dialysisOrder =
           response.data.data.dialysisOrder === null
             ? null
@@ -1701,7 +1701,7 @@ export default {
 
         this.advices = response.data.data.advices
         this.tableAdvice = response.data.data.advices;
-        console.log('医嘱数据2222222222', this.advices)
+        console.log('医嘱数据', this.advices)
         this.monitors = response.data.data.monitors
         this.summary = response.data.data.summary
         this.org_template_info = response.data.data.org_template_info
@@ -1721,6 +1721,8 @@ export default {
             }
           }
         }
+        let arr = this.monitors.length
+        this.afterBP = this.monitors[arr-1]
 
         var tempmonitorflag = true
         for (let index = 0; index < this.monitors.length; index++) {
@@ -2053,9 +2055,9 @@ export default {
     }
 
     const xtdate = this.$route.query && this.$route.query.xtdate
-    console.log('xtdate', xtdate)
+    
     const xtno = this.$route.query && this.$route.query.xtno
-    console.log('xtno', xtno)
+    
     if (
       typeof xtdate === 'string' &&
       xtdate.length > 0 &&

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -1689,12 +1689,12 @@ export default {
       for (let i = 0; i < this.month_prescriptions.length; i++) {
         if (this.month_prescriptions[i].advices != null) {
           for (let a = 0; a < this.month_prescriptions[i].advices.length; a++) {
-            total = total + this.month_prescriptions[i].advices[a].retail_price * this.month_prescriptions[i].advices[a].prescribing_number
+            total = total.toFixed(2) + (this.month_prescriptions[i].advices[a].retail_price * this.month_prescriptions[i].advices[a].prescribing_number).toFixed(2)
           }
         }
         if (this.month_prescriptions[i].project != null) {
           for (let b = 0; b < this.month_prescriptions[i].project.length; b++) {
-            total = total + this.month_prescriptions[i].project[b].price * this.month_prescriptions[i].project[b].total
+            total = total.toFixed(2) + (this.month_prescriptions[i].project[b].price * this.month_prescriptions[i].project[b].total).toFixed(2)
           }
         }
 

src/xt_pages/hospitalStation/invoiceTemplate/printTwo.vue

@@ -6,14 +6,14 @@
         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ list.department_name }}</div> -->
-            <div  style="position: absolute;top:50px;left:260px">{{ list.id_card_no }}</div>
+            <div  style="position: absolute;top:50px;left:260px">{{ list.his_hospital_record.id_card_no }}</div>
             <div></div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ list.department_name }}</div> -->
             <div  style="position: absolute;top:70px;left:90px">门诊</div>
             <div></div>
-            <div  style="position: absolute;top:70px;left:240px">{{ list.number }}</div>
+            <div  style="position: absolute;top:70px;left:240px">{{ list.his_hospital_record.number }}</div>
             <div  style="position: absolute;left:470px;top:70px;">
                 <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>
             </div>
@@ -66,8 +66,8 @@
             <div style="position: absolute;top:190px;left:260px"></div>
             <div style="position: absolute;top:190px;left:340px">材料费</div>
             <div style="position: absolute;top:190px;left:420px">{{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : '' }}</div>
-            <div style="position: absolute;top:190px;left:480px"></div>
-            <div style="position: absolute;top:190px;left:540px"></div>
+            <div style="position: absolute;top:190px;left:480px">诊察费</div>
+            <div style="position: absolute;top:190px;left:540px">{{ list.zhenChaCostTotal ? list.zhenChaCostTotal.toFixed(2) : '' }}</div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <div style="position: absolute;top:210px;left:50px"></div>
@@ -182,7 +182,7 @@ export default {
                 this.list = res.data.data
                 console.log('res',this.list)
                 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.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal + this.list.zhenChaCostTotal
                 this.smalltoBIG(this.totalPrice)
                 var data = new Date(res.data.data.date * 1000);
                 var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;

src/xt_pages/hospitalStation/summary.vue

@@ -150,7 +150,6 @@
                     style="margin-top:20px;float: right"
                     layout="total, sizes, prev, pager, next, jumper"
                     :total="total"
-
             >
             </el-pagination>
         </div>
@@ -622,7 +621,7 @@
         }
       },
       toPrint(row) {
-        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || (row.order_status == 2 && $store.getters.xt_user.org_id == 10138) || (row.order_status == 2 && $store.getters.xt_user.org_id == 10278)) {
+        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || (row.order_status == 2 && this.$store.getters.xt_user.org_id == 10138) || (row.order_status == 2 && this.$store.getters.xt_user.org_id == 10278)) {
           this.statementVisible9504 = true
           let obj = {
             order_id: row.id,

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1086,7 +1086,11 @@ export default {
     },
     changeTimeTwo() {
       this.getPatientList()
-      this.form.diagnosis_time = this.record_date + ' ' + '00:00:00'
+      var nowDate = new Date()
+      var nowHours = nowDate.getHours()
+      var nowMinutes = nowDate.getMinutes()
+      var nowSeconds = nowDate.getSeconds()
+      this.form.diagnosis_time = this.record_date + ' ' + (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes) + ':' + (nowSeconds < 10 ? '0' + nowSeconds : nowSeconds)
     },
     comfirmPWDialog() {
       var that = this