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/DialysisPrintOrderFortyOne.vue

@@ -60,7 +60,7 @@
         <div class="inline_block">
           透析次数：
           <div class="under_line" style="width: 40px;text-align: left">
-            {{ patientInfo.total_dialysis + patientInfo.user_sys_before_count }}
+            {{ patientInfo.total_dialysis + patientInfo.user_sys_before_count }} 次
           </div>
         </div>
         <div class="inline_block">
@@ -268,7 +268,7 @@
                     <div class="under_line" style="width: 60px;text-align: center">
                       {{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : "/" }}
                     </div>
-                    ml
+                    L
                   </div>
                   <div class="inline_block" style="margin-left:48px;">
                     透后体重：
@@ -321,7 +321,7 @@
                   <div class="inline_block" style="flex:1;">
                     透析时长：
                     <div class="under_line" style="width: 50px;text-align: center">
-                      {{ prescription.dialysis_duration_hour ? prescription.dialysis_duration_hour : "0" }}.{{ prescription.dialysis_duration_minute ? prescription.dialysis_duration_minute : "0" }}
+                      {{ prescription.dialysis_duration_hour ? prescription.dialysis_duration_hour + prescription.dialysis_duration_minute / 60 : "0" }}
                     </div>
                     h
                   </div>
@@ -594,7 +594,7 @@
                       <td>{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }}
                       <td><span v-if="getTime(monitor.operate_time, '{h}:{i}')">{{ monitor.venous_pressure ? monitor.venous_pressure : "" }}/{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }}</span></td>
                       <td><span v-if="getTime(monitor.operate_time, '{h}:{i}')">{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : "" }}/{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}</span></td>
-                      <td><span v-if="getTime(monitor.operate_time, '{h}:{i}')">{{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}/{{ monitor.temperature ? monitor.temperature : "" }}</span></td>
+                      <td><span v-if="getTime(monitor.operate_time, '{h}:{i}')">{{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}/{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}</span></td>
                       <td>{{ monitor.pulse_frequency ? monitor.pulse_frequency : "" }}</td>
                       <td>
                         {{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure + "/" : "" }}

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyEight.vue

@@ -14,9 +14,9 @@
       <div class="lineHeight">基本信息</div>
       <div class="lineHeight">
           <div class="widthLength25">年龄：{{ getAge(patientInfo) }}</div>
-          <div class="widthLength25">透析年龄：{{ patientInfo.dialysis_age ? patientInfo.dialysis_age : '/' }}月</div>
+          <div class="widthLength25">透析年龄：{{ patientInfo.first_dialysis_date ? getMonths(patientInfo.first_dialysis_date) : '/' }}月</div>
           <div class="widthLength25">入院方式：{{ receiverTreatmentAccess.way ? receiverTreatmentAccess.way : '/' }}</div>
-          <div class="widthLength25">累计：{{ patientInfo.total_dialysis + patientInfo.user_sys_before_count }}</div>
+          <div class="widthLength25">累计：{{ patientInfo.total_dialysis + patientInfo.user_sys_before_count }} 次</div>
       </div>
       <div class="lineHeight">
           <div class="widthLength25">首次透析时间：{{ patientInfo.first_treatment_date ? getTime(patientInfo.first_treatment_date ? patientInfo.first_treatment_date : 0, "{y}-{m}-{d}") : '/' }}</div>
@@ -111,7 +111,7 @@
       <div class="lineHeight">
           <div class="widthLength25">实际进食量：{{ afterdialysis.dialysis_during ? afterdialysis.dialysis_during : '' }} g</div>
           <div class="widthLength25">透后体重：{{ afterdialysis.weight_after ? afterdialysis.weight_after : "" }} Kg</div>
-          <div class="widthLength25">脉搏：{{ afterdialysis.weight_after ? afterdialysis.weight_after : "" }} 次/分</div>
+          <div class="widthLength25">脉搏：{{ afterdialysis.pulse_frequency ? afterdialysis.pulse_frequency : "" }} 次/分</div>
           <div class="widthLength25"></div>
       </div>
       <div class="lineHeight">治疗方案：</div>
@@ -576,6 +576,16 @@ export default {
     };
   },
   methods: {
+    getMonths(t){
+      var ot=new Date(t); //转为时间对象（js的时间戳是毫秒数）
+      var oy=ot.getFullYear(); //年
+      var om=ot.getMonth()+1; //月
+      var tt=new Date(); //今天
+      var ty=tt.getFullYear(); //今天年
+      var tm=tt.getMonth()+1; //今天月
+      var gm=(ty-oy)*12+(tm-om); //距今月数
+      return gm
+    },
     getComplication(id){
       var name = "";
       for(let i=0;i<this.complicationList.length;i++){

src/xt_pages/outpatientCharges/newStatementPrintTwo.vue

@@ -389,32 +389,34 @@
                       }
                     })
                     that.num = num
-                    let newTotal = 0
-                    for (var i = that.info.transBody.outputlist2.length - 1; i >= 0; i--) {
-                      if(that.info.transBody.outputlist2[i].aka111 == '07') {
-                        console.log('0707007')
-                        newTotal += that.info.transBody.outputlist2[i].bka058
+                    if(that.org_id == 10138){
+                      let newTotal = 0
+                      for (var i = that.info.transBody.outputlist2.length - 1; i >= 0; i--) {
+                        if(that.info.transBody.outputlist2[i].aka111 == '07') {
+                          console.log('0707007')
+                          newTotal += that.info.transBody.outputlist2[i].bka058
+                        }
+                        if(that.info.transBody.outputlist2[i].aka111 == '19'){
+                          console.log('191919')
+                          newTotal += that.info.transBody.outputlist2[i].bka058
+                        }
+                        console.log(8888888,that.info.transBody.outputlist2)
                       }
-                      if(that.info.transBody.outputlist2[i].aka111 == '19'){
-                        console.log('191919')
-                        newTotal += that.info.transBody.outputlist2[i].bka058
+                      console.log(1111111111111)
+                      let aka111obj = {
+                        aka111:'99',
+                        bka058:newTotal
                       }
-                      console.log(8888888,that.info.transBody.outputlist2)
-                    }
-                    console.log(1111111111111)
-                    let aka111obj = {
-                      aka111:'99',
-                      bka058:newTotal
+                      console.log('aka111obj',aka111obj)
+                      let newOutputlist2 = []
+                      newOutputlist2.push(aka111obj)
+                      that.info.transBody.outputlist2.map(item => {
+                        if(item.aka111 != '07' && item.aka111 != '19'){
+                          newOutputlist2.push(item)
+                        }
+                      })
+                      that.info.transBody.outputlist2 = newOutputlist2
                     }
-                    console.log('aka111obj',aka111obj)
-                    let newOutputlist2 = []
-                    newOutputlist2.push(aka111obj)
-                    that.info.transBody.outputlist2.map(item => {
-                      if(item.aka111 != '07' && item.aka111 != '19'){
-                        newOutputlist2.push(item)
-                      }
-                    })
-                    that.info.transBody.outputlist2 = newOutputlist2
                     console.log('that.info.transBody.outputlist2',that.info.transBody.outputlist2)
                     console.log('this.num222',that.num)
                     

src/xt_pages/outpatientCharges/newTreatTemplate/printTwo.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <div v-if="paramsObj.balance_accounts_type != 2" id='prescription-print' class="prescription-print" style="position: relative;">
-            <img style="width:100%;height:80px" src="../../../assets/img/bailinTop.jpg" alt="">
+            <img style="width:100%;height:80px" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
             <div class="printTitle" style="position: absolute;left: 40%;top: 50px;">门诊收费清单</div>
             <div style="display:flex;">
                 <div>单据号：<span style="display:inline-block;width:200px;">{{info.order_number ? info.order_number : ''}}</span></div>
@@ -74,10 +74,10 @@
                 <div>操作人：<span style="width:100px;display:inline-block;">{{info.doctor_name}}</span></div>
                 <div>操作日期：<span style="width:100px;display:inline-block;">{{info.record_date}}</span></div>
             </div>
-            <img style="width:100%;" src="../../../assets/img/bailinBottom.jpg" alt="">
+            <img style="width:100%;" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
         </div>
         <div v-else id='prescription-print' class="prescription-print" style="position: relative;">
-          <img style="width:100%;height:80px" src="../../../assets/img/bailinTop.jpg" alt="">
+          <img style="width:100%;height:80px" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
             <div class="printTitle" style="position: absolute;left: 40%;top: 50px;">门诊收费清单</div>
             <div style="display:flex;">
                 <div>单据号：<span style="display:inline-block;width:200px;">{{balanceAccounts.his.number ? balanceAccounts.his.number : ''}}</span></div>
@@ -181,7 +181,7 @@
                 <div>操作人：<span style="width:100px;display:inline-block;">{{balanceAccounts.current_admin.user_name}}</span></div>
                 <div>操作日期：<span style="width:100px;display:inline-block;">{{getTime(new Date(),"{y}-{m}-{d}")?getTime(new Date(),"{y}-{m}-{d}"):""}}</span></div>
             </div>
-            <img style="width:100%;" src="../../../assets/img/bailinBottom.jpg" alt="">
+            <img style="width:100%;" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
         </div>
     </div>
 

src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <div id='prescription-print3' class="prescription-print">
-            <img style="width:100%;height:80px" src="../../../assets/img/bailinTop.jpg" alt="">
+            <img style="width:100%;height:80px" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
             <div class="printTitle">检验申请单</div>
 
             <div style="border:1px solid #000;">
@@ -19,12 +19,12 @@
                     <div>年龄：{{advicePrint[0].patient.age?advicePrint[0].patient.age:""}}岁</div>
                 </div>
                 <div style="margin-bottom:20px;padding:10px 10px 0;">病史摘要：{{history.history_of_present_illness?history.history_of_present_illness:''}}</div>
-                <div style="margin-bottom:20px;padding:0 10px;">体格检查：
+                <!-- <div style="margin-bottom:20px;padding:0 10px;">体格检查：
                     <span>体温：{{ history.temperature ? history.temperature + '℃' : '/' }}</span>
                     <span>脉搏：{{ history.pulse ? history.pulse + '次/分' : '/' }}</span>
                     <span>呼吸：{{ history.breathing ? history.breathing + '次/分' : '/' }}</span>
                     <span>血压：{{ history.sbp }}/{{ history.dbp }}mmHg</span>
-                </div>
+                </div> -->
                 <div style="margin-bottom:20px;padding:0 10px;">临床诊断：{{ getDiagnosis(advicePrint[0].info.diagnosis) }}</div>
                 <div style="display:flex;margin-bottom:20px;padding:0 10px;">
                     <div>检验项目：</div>
@@ -40,7 +40,7 @@
                     <div>医生签字：{{ doctor ? doctor : '' }}</div>
                 </div>
             </div>   
-            <img style="width:100%;" src="../../../assets/img/bailinBottom.jpg" alt="">
+            <img style="width:100%;" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
         </div>
     </div>
 

src/xt_pages/outpatientDoctorStation/template/printThree.vue

@@ -3,14 +3,14 @@
   <div id='prescriptionPrint1'>
     <div v-for="(item,index) in advicePrint" :key="index">
       <div id='prescription-print' v-if="item.project.length == 0" v-for='(i,pageIndex) in item.pageArr.length' :key="pageIndex" class="prescription-print" style="page-break-after: always;">
-          <img src="../../../assets/img/bailinTop.jpg" style="width:100%" alt="">
+          <img src="https://kuyi.shengws.com/bailin/bltotle.jpg" style="width:100%" alt="">
           <div class="printTitle">
             处方笺
             <span v-if="item.med_type == '1111'" style="margin-left: 50px;border: 1px solid #000;">精一</span>
             <span v-if="item.med_type == '1112'" style="margin-left: 50px;border: 1px solid #000;">精二</span>
           </div>
           <div style="display:flex;">
-            <div style="width:33%;display:flex;">费别：<span class="under_line"><span v-if="faber && faber.transBody">{{ faber && faber.transBody ? getName(faber.transBody.outputlist1) : '' }}</span></span></div>
+            <div style="width:33%;display:flex;">费别：<span class="under_line"><span>{{ faber && faber.transBody ? getName(faber.transBody.outputlist1) : '自费' }}</span></span></div>
             <div style="width:33%;display:flex;">电脑号：<span class="under_line">{{ faber && faber.transBody ? faber.transBody.aac999 : ''  }}</span></div>
             <div style="width:33%;display:flex;">处方编号：<span class="under_line">{{ item.prescription_number.substring(item.prescription_number.length-6) }}</span></div>
           </div>
@@ -58,7 +58,7 @@
           </div>
           <div style="display:flex;">
             <div>医&nbsp;&nbsp;&nbsp;&nbsp;师：<span style="width:100px;display:inline-block;">{{item.doctor?item.doctor:""}}</span></div>
-            <div>药品金额：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}</div>
+            <!-- <div>药品金额：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}</div> -->
           </div>
           <div style="display:flex;">
             <div style="display:flex;">审核药师：<span style="width:100px" class="under_line"></span></div>
@@ -70,7 +70,7 @@
           </div>
           <div>*处方当日有效，特殊情况可适当延长，一般不超过3天</div>
           <div>*药品属于特殊商品，非质量问题不允许退换</div>
-          <img src="../../../assets/img/bailinBottom.jpg" style="width:100%" alt="">
+          <img src="https://kuyi.shengws.com/bailin/blend.jpg" style="width:100%" alt="">
           <!-- <div class="doctorBox">
               <p>医师：{{item.doctor?item.doctor:""}}</p>
               <p>日期：{{getTime(item.ctime)?getTime(item.ctime):""}}</p>

src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue

@@ -2,13 +2,13 @@
    <div id='prescriptionPrint2'>
     <div id='prescription-print' v-if="item.advices.length == 0" class="prescription-print" v-for="(item,index) in advicePrint" :key="index">
 
-        <img src="../../../assets/img/bailinTop.jpg" style="width:100%" alt="">
+        <img src="https://kuyi.shengws.com/bailin/bltotle.jpg" style="width:100%" alt="">
         <div class="printTitle">治疗单
           <span v-if="item.med_type == '1111'" style="margin-left: 50px;border: 1px solid #000;">精一</span>
           <span v-if="item.med_type == '1112'" style="margin-left: 50px;border: 1px solid #000;">精二</span>
         </div>
         <div style="display:flex;">
-            <div style="width:33%;display:flex;">费别：<span class="under_line">{{ faber && faber.transBody ? getName(faber.transBody.outputlist1) : '' }}</span></div>
+            <div style="width:33%;display:flex;">费别：<span class="under_line">{{ faber && faber.transBody ? getName(faber.transBody.outputlist1) : '自费' }}</span></div>
             <div style="width:33%;display:flex;">电脑号：<span class="under_line">{{ faber && faber.transBody ? faber.transBody.aac999 : ''  }}</span></div>
             <div style="width:33%;display:flex;">处方编号：<span class="under_line">{{ item.prescription_number.substring(item.prescription_number.length-6) }}</span></div>
         </div>
@@ -77,13 +77,13 @@
                   <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;<span v-if="it.drug.min_unit != it.drug.dose_unit">{{it.drug.dose}}{{it.drug.dose_unit}}&nbsp;* &nbsp;</span>{{it.drug.min_number}}{{it.drug.min_unit}}/{{it.drug.max_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
               </div> -->
               <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
-                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{ it.type == 2 ? it.project.project_name : it.good_info.good_name }}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</div>
+                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{ it.type == 2 ? it.project.project_name : it.good_info.good_name }}&nbsp;&nbsp;×&nbsp; {{it.count}}{{unit}}</div>
               </div>
               <div style="text-align:center;" >(以下空白)</div>
         </div>
         <div style="display:flex;">
             <div>医&nbsp;&nbsp;&nbsp;&nbsp;师：<span style="width:100px;display:inline-block;">{{item.doctor?item.doctor:""}}</span></div>
-            <div>药品金额：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):''}}</div>
+            <!-- <div>药品金额：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):''}}</div> -->
           </div>
           <div style="display:flex;">
             <div style="display:flex;">核对护士：</div>
@@ -91,7 +91,7 @@
           <div style="display:flex;">
             打印时间：<span style="border-bottom:1px solid #000;">{{getTime(new Date())?getTime(new Date()):""}}</span>
           </div>
-          <img src="../../../assets/img/bailinBottom.jpg" style="width:100%" alt="">
+          <img src="https://kuyi.shengws.com/bailin/blend.jpg" style="width:100%" alt="">
           <div style="page-break-after:always"></div>
      </div>