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

src/router/modules/hisTool.js

@@ -57,6 +57,11 @@ export default {
       component: () => import('@/xt_pages/outpatientTool/yidiClear'),
       name: 'yidiClear',
       meta: { title: 'yidiClear', noCache: true }
+    },{
+      path: '/hisTool/statistics',
+      component: () => import('@/xt_pages/outpatientTool/statistics'),
+      name: 'statistics',
+      meta: { title: 'statistics', noCache: true }
     },
 
   ]

src/xt_pages/hospitalStation/invoiceTemplate/printTwo.vue

@@ -35,8 +35,8 @@
             <!-- <div>{{ paramsObj.gend == 1 ? '男' : '女' }}</div> -->
             <div v-if="paramsObj.gend == 1" style="position: absolute;top:110px;left:100px;">√</div>
             <div v-else style="position: absolute;top:110px;left:140px;">√</div>
-            <div style="position: absolute;top:110px;left:260px;">{{ list.number.length <= 13 ? (totalPrice - list.psn_cash_money).toFixed(2) : '0.00' }}</div>
-            <div style="position: absolute;top:110px;left:420px;">{{ list.number.length <= 13 ? list.psn_cash_money.toFixed(2) : (totalPrice - list.psn_cash_money).toFixed(2) }}</div>
+            <div style="position: absolute;top:110px;left:260px;">{{ list.his_hospital_record.number.length <= 13 ? (totalPrice - list.order.psn_cash_money).toFixed(2) : '0.00' }}</div>
+            <div style="position: absolute;top:110px;left:420px;">{{ list.his_hospital_record.number.length <= 13 ? list.order.psn_cash_money.toFixed(2) : (totalPrice - list.psn_cash_money).toFixed(2) }}</div>
             <div style="position: absolute;top:110px;left:540px;">现金</div>
         </div>
         <div style="display:flex;justify-content: space-between;">

src/xt_pages/hospitalStation/settlementTemplate/hospitalSettlePrint.vue

@@ -696,7 +696,7 @@
                   </tr>
                   <tr>
                     <td>其他支付：</td>
-                    <td>&nbsp;</td>
+                    <td>&nbsp;{{info.oth_pay}}</td>
                   </tr>
                   <tr>
                     <td>大病保险</td>
@@ -712,11 +712,11 @@
                   </tr>
                   <tr>
                     <td>大额补充</td>
-                    <td>&nbsp;</td>
+                    <td>&nbsp;{{info.hifob_pay}}</td>
                   </tr>
                   <tr>
                     <td>企业补充</td>
-                    <td>&nbsp;</td>
+                    <td>&nbsp;{{info.hifes_pay}}</td>
                   </tr>
                   <tr>
                     <td>......</td>
@@ -736,19 +736,19 @@
                   <tr>
                     <td rowspan="4" style="width:4%;">个人支付</td>
                     <td style="width:36%">个人自付</td>
-                    <td>{{info.psn_pay}}</td>
+                    <td>{{info.psn_part_amt}}</td>
                   </tr>
                   <tr>
                     <td style="width:36%">个人自费</td>
-                    <td>&nbsp;</td>
+                    <td>{{info.psn_cash_pay}}</td>
                   </tr>
                   <tr>
                     <td style="width:36%">个人账户支付</td>
-                    <td>&nbsp;</td>
+                    <td>{{info.acct_pay}}</td>
                   </tr>
                   <tr>
                     <td style="width:36%">个人现金支付</td>
-                    <td>&nbsp;</td>
+                    <td>{{info.psn_cash_pay}}</td>
                   </tr>
 
                   </tbody>

src/xt_pages/outpatientCharges/allListPrint.vue

@@ -15,6 +15,7 @@
 
     <div class='dialysisPage' style="padding-top:40px;">
       <printOne :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printOne>
+<!--      <list-print-two :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></list-print-two>-->
     </div>
   </div>
 </template>
@@ -23,10 +24,12 @@
   import { getHisOrderDetailCollect } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
   import printOne from './allListTemplate/printOne'
+  import ListPrintTwo from './listTemplate/listPrintTwo'
 
   export default {
     name: 'allListPrint',
     components: {
+      ListPrintTwo,
       printOne
     },
     props: {
@@ -276,7 +279,7 @@
       printThisPage() {
 
         const style =
-          '@media print {.allListTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .allListTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 14px;border-color: #000;text-align:left;}.allListTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
+          '@media print {.allListTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .allListTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}.allListTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
         printJS({
           printable: 'allList-print',
           type: 'html',

src/xt_pages/outpatientCharges/allListTemplate/printOne.vue

@@ -167,7 +167,7 @@ export default {
   width: 100%;
   text-align: center;
   border-collapse: collapse;
-  line-height: 40px;
+  line-height: 20px;
   font-size: 14px;
   border-color: #000;
   text-align: left;

src/xt_pages/outpatientCharges/allListTemplate/summary.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: 'summary'
+}
+</script>
+
+<style scoped>
+
+</style>

src/xt_pages/outpatientCharges/listPrint.vue

@@ -17,6 +17,7 @@
       <printOne v-if="org_id != 10106" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
       <printTwo v-if="org_id == 10106 && this.paramsObj.balance_accounts_type != 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
       <print-three v-if="org_id == 10106 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
+<!--      <list-print-two></list-print-two>-->
     </div>
   </div>
 </template>
@@ -30,10 +31,12 @@
   import { uParseTime } from '@/utils/tools'
   import axios from 'axios'
   import PrintThree from './listTemplate/printThree'
+  import ListPrintTwo from './listTemplate/listPrintTwo'
 
   export default {
     name: 'listPrint',
     components: {
+      ListPrintTwo,
       PrintThree,
       printOne,
       printTwo
@@ -190,7 +193,7 @@
       printThisPage() {
         if(this.org_id != 10106){
           const style =
-          '@media print {.listTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 14px;border-color: #000;text-align:left;}.listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
+          '@media print {.listTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}.listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 40px;}}'
           printJS({
             printable: 'list-print',
             type: 'html',

src/xt_pages/outpatientCharges/listTemplate/listPrintTwo.vue

@@ -0,0 +1,173 @@
+<template>
+  <div id="allList-print" class="allList-print">
+      <div class="allListTitle">{{ $store.getters.xt_user.org.org_name }}费用清单</div>
+      <div class="allListInfo">
+        <div>患者姓名：{{ patient.name }}</div>
+        <div>性别：{{ patient.gender == 1 ? '男' : '女' }}</div>
+        <div>结算类型：{{balance_accounts_type == 1 ?'医保':'自费'}}</div>
+        <div>发票号码：</div>
+        <div>住院/门诊号：{{order.mdtrt_id}}</div>
+        <div>科室：</div>
+        <div>就诊流水号：</div>
+        <div>总费用：{{order.medfee_sumamt}}</div>
+        <div>个人支付：{{order.psn_part_amt}}</div>
+        <div>基金支付记账：{{order.fund_pay_sumamt}}</div>
+        <div>补充医疗支付记账：0.00</div>
+        <div>救助支付金额：{{order.maf_pay}}</div>
+      </div>
+      <table class="allListTable" border="1">
+        <tr>
+          <td style="width:10%">序号</td>
+          <td style="width:10%">处方日期</td>
+          <td style="width:10%">费用编号</td>
+          <td style="width:10%">费用名称/规格</td>
+          <td style="width:10%">单位</td>
+          <td style="width:10%">数量</td>
+          <td style="width:10%">单价</td>
+          <td style="width:10%">金额</td>
+        </tr>
+        <template v-for='(item,index) in list'>
+          <tr>
+            <td style="width:10%">{{index + 1}}</td>
+            <td style="width:10%">{{}}</td>
+            <td style="width:10%">{{ item.feedetl_sn }}</td>
+            <td style="width:50%">{{ }}</td>
+            <td style="width:10%">{{ }}</td>
+            <td style="width:10%">{{ item.cnt }}</td>
+            <td style="width:10%">{{ item.pric }}</td>
+            <td style="width:10%">{{ (item.pric * item.cnt).toFixed(2) }}</td>
+          </tr>
+        </template>
+      </table>
+
+    </div>
+</template>
+
+<script>
+import { uParseTime } from '@/utils/tools'
+
+export default {
+  props: {
+    list: {
+      type: Array,
+      default: function() {
+        return []
+      }
+    }, patient: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    }, order: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    }, admin: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    }, hospital: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+
+    }
+  },
+  data() {
+    return {
+      page: 1,
+      pageArr: []
+    }
+  },
+  methods: {
+    getNowTime: function() {
+      let dateTime
+      let yy = new Date().getFullYear()
+      let mm = new Date().getMonth() + 1
+      let dd = new Date().getDate()
+      let hh = new Date().getHours()
+      let mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes()
+          :
+          new Date().getMinutes()
+      let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds()
+          :
+          new Date().getSeconds()
+      dateTime = yy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf + ':' + ss
+      return dateTime
+    },
+    getTimes(time) {
+      return uParseTime(time, '{y}-{m}-{d}')
+    }, getTotal: function(items) {
+      let total = 0
+      for (let i = 0; i < items.length; i++) {
+        total = total + (items[i].count * items[i].price).toFixed(2)
+      }
+      return total
+
+    },
+
+
+  },
+  watch: {
+    list: {
+      handler(newVal) {
+        this.getPage()
+      },
+      deep: true
+    }
+  }
+}
+
+
+</script>
+
+<style lang="scss" scoped>
+.allList-print {
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+  margin-bottom: 20px;
+  padding: 20px 10px;
+}
+
+.allListTitle {
+  font-size: 24px;
+  text-align: center;
+  font-weight: bold;
+  margin-bottom: 10px;
+}
+
+.allListInfo {
+  display: flex;
+  font-size: 16px;
+  justify-content: space-between;
+  margin: 10px 0;
+}
+
+.allListTable {
+  width: 100%;
+  text-align: center;
+  border-collapse: collapse;
+  line-height: 20px;
+  font-size: 14px;
+  border-color: #000;
+  text-align: left;
+}
+
+.allListTable tr td {
+  padding: 0 5px;
+}
+
+.tableBottom {
+  font-size: 16px;
+  display: flex;
+  margin-top: 20px;
+}
+
+.tableBottomOne {
+  margin-right: 40px;
+}
+</style>

src/xt_pages/outpatientCharges/listTemplate/printOne.vue

@@ -153,7 +153,7 @@
     width: 100%;
     text-align: center;
     border-collapse: collapse;
-    line-height: 40px;
+    line-height: 20px;
     font-size: 14px;
     border-color: #000;
     text-align: left;

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -142,7 +142,7 @@
                           >
 
                             <el-button
-                           su     v-if="radio == 1"
+                                v-if="radio == 1"
                                 size="small"
                                 @click="openDialog(item)"
                                 type="primary"
@@ -2960,7 +2960,7 @@ export default {
           }).catch(() => {
           })
         } else {
-          if(this.order.id > 0){
+          if(this.$store.getters.xt_user.org_id == 10215 && this.order.id > 0){
             this.$message.error("该就诊号尚未撤销明细或者退费无法进行退号操作")
             return
           }

src/xt_pages/outpatientDoctorStation/batch_print_checkTemplate/printOne.vue

@@ -15,7 +15,7 @@
           class="prescription-print"
           style="page-break-after: always"
           v-for="(item, index) in i.prescriptions"
-          v-if="getTeam(i.prescriptions).length > 0"
+          v-if="item.project.length > 0 && getTeam(i.prescriptions).length > 0"
           :key="index"
       >
         <div class="printTitle">检验申请单</div>
@@ -172,6 +172,19 @@ export default {
         }
       }
       return name
+    }, unique_two(array) {
+      var res = []
+      for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
+        for (var j = 0, resLen = res.length; j < resLen; j++) {
+          if (array[i].team_id === res[j].team_id) {
+            break
+          }
+        }
+        if (j === resLen) {
+          res.push(array[i])
+        }
+      }
+      return res
     },
     getTime(value, temp) {
       if (value != undefined) {
@@ -200,6 +213,8 @@ export default {
         // }
       })
       let data = []
+      console.log(projectPrint)
+      projectPrint =  this.unique_two(projectPrint)
       projectPrint.map((item) => {
         // console.log(item, "999");
         if (item.team.id == 0) {

src/xt_pages/outpatientDoctorStation/batch_print_template/batchPrintTwo.vue

@@ -0,0 +1,365 @@
+<template>
+  <div id='prescriptionPrint'>
+    <div v-for="(i, index) in printData" :key="index">
+      <div v-for="(item, index) in i.prescriptions" :key="index">
+        <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
+          <div class="printTitle">{{orgname}}处方笺</div>
+          <div class="infoTitle">
+            <p>姓名：{{i.his_patient.id != 0 ? i.his_patient.name : i.name}}</p>
+            <p>性别：
+              <span v-if="item.gender == 1">男</span>
+              <span v-if="item.gender == 2">女</span>
+            </p>
+            <p>年龄：{{ i.his_patient.id != 0 ? getAge(i.his_patient) : i.age}}岁</p>
+          </div>
+          <div class="infoMain">
+            <div style="margin-bottom: 10px;">门诊号：{{ i.his_patient.id != 0 ? i.his_patient.number : ""}}</div>
+            <div style="margin-bottom: 10px;">科室：{{ i.info.id != 0
+                ? getDepart(i.info.departments)
+                : ""}}</div>
+            <div style="margin-bottom: 10px;">医保卡号：</div>
+            <div style="margin-bottom: 10px;">电话：{{i.phone}}</div>
+            <div>地址：{{i.home_address}}</div>
+            <div style="display:flex;width:50%;">临床诊断：{{getDiagnosis(i.info.diagnosis)}}</div>
+          </div>
+          <div class="prescriptionBox">
+            <div class="Rp">Rp:</div>
+            <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
+              <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
+              <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;<span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
+              <div style="margin-left:100px;"><span>{{it.drug.drug_spec}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</span></div>
+            </div>
+            <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
+              <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</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>{{getProjectName(it.project_id)?getProjectName(it.project_id):""}}&nbsp;&nbsp;<span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.delivery_way}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
+              <div style="margin-left:100px;"><span>{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</span></div>
+            </div>
+            <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
+              <div class="drugsOne">{{it.project_id?it.project_id:""}}:&nbsp;{{it.price.toFixed(2)}}元/{{it.count}}次</div>
+            </div>
+            <div style="text-align:center;" >(以下空白)</div>
+
+          </div>
+          <div class="doctorBox">
+            <p>医师：{{item.doctor?item.doctor:""}}</p>
+            <p>日期：{{getTime(item.ctime)?getTime(item.ctime):""}}</p>
+          </div>
+          <div class="actionBar">
+            <!-- <p>审核：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
+            <p>配对：</p>
+            <p>核对：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
+            <p>发药：{{getDoctor(item.advices[0].execution_staff)?getDoctor(item.advices[0].execution_staff):""}}</p>
+            <p>药费：{{getTotalOne(item.id)?getTotalOne(item.id):0}}元</p> -->
+
+            <p>审核：</p>
+            <p>配对：</p>
+            <p>核对：</p>
+            <p>发药：</p>
+            药费：{{
+              getTotalOne(item.advices).toFixed(2)
+                  ? getTotalOne(item.advices).toFixed(2)
+                  : 0
+            }}元
+            <!--            <p>药费：551.2元</p>-->
+            <!--            <p>药费：466.2元</p>-->
+
+
+          </div>
+          <div style="page-break-after:always"></div>
+        </div>
+      </div>
+
+    </div>
+
+  </div>
+
+
+</template>
+<script>
+import { jsGetAge, uParseTime } from '@/utils/tools'
+import {getAllDoctorList,getPrescriptionPrint,getHisPatientDetail} from "@/api/project/project"
+import {getInitData} from "@/api/his/his"
+export default {
+    props:{
+      patient_id: String,
+      record_date: String,
+      prescription_id: String,
+      ids: String,
+      printData: Array,
+    },
+    data(){
+      return {
+        doctorList: [],
+        advicePrint: {},
+        patient: {},
+        tableData: [],
+        prescriptionInfo: [],
+        hisPatient: {},
+        department: [],
+        prescriptions: [],
+        projectList: [],
+        orgname: "",
+        diagnoses: [],
+        org_id: 0,
+      }
+    },
+   methods:{
+     getAge(patient){
+       var thisLen = patient.id_card_no.length
+       var birth = ''
+       if (thisLen == 15) {
+         birth = '19' + patient.id_card_no.substr(6, 6)
+       } else {
+         birth = patient.id_card_no.substr(6, 8)
+       }
+       var births =
+         birth.substr(0, 4) +
+         '-' +
+         birth.substr(4, 2) +
+         '-' +
+         birth.substr(6, 2)
+        return jsGetAge(births, '-')
+
+     },
+
+     getAllDoctorList(){
+      getAllDoctorList().then(response=>{
+        if(response.data.state == 1){
+               var doctor =  response.data.data.doctor
+
+               this.doctorList = doctor
+             }
+         })
+     },
+
+      getDoctor(id){
+        var name = ""
+        for(let i=0;i<this.doctorList.length;i++){
+          if(id == this.doctorList[i].admin_user_id){
+              name = this.doctorList[i].user_name
+          }
+        }
+        return name
+      },
+      getTime(value, temp) {
+        if (value != undefined) {
+            return uParseTime(value, temp)
+        }
+        return ''
+     },
+       getPrescriptionPrint(){
+         var params = {
+          // patient_id:this.patient_id,
+          // record_date:this.record_date,
+          // prescription_id:this.prescription_id,
+          patient_id:this.patient_id,
+          record_date:this.record_date,
+          prescription_id:this.prescription_id,
+          ids:this.ids,
+           p_type:2,
+
+         }
+        console.log("params",params)
+       getPrescriptionPrint(params).then(response=>{
+         if(response.data.state == 1){
+            var advicePrint =  response.data.data.advicePrint
+            console.log("adviceprint9999",advicePrint)
+            this.advicePrint = advicePrint
+            this.prescriptions = advicePrint
+            console.log("处方222222",this.prescriptions)
+            var hisPatient = response.data.data.hisPatient
+            console.log("hisPatient",hisPatient)
+            this.hisPatient = hisPatient
+            var projectlist =  response.data.data.projectlist
+            console.log("所有项目列表",projectlist)
+            this.projectList = projectlist
+          }
+       })
+     },
+     getHisPatientDetail(){
+          const params = {
+              patient_id:this.patient_id
+          }
+       getHisPatientDetail(params).then(response=>{
+          if(response.data.state == 1){
+             var hisPatient =  response.data.data.hisPatient
+             console.log("挂号病人",hisPatient)
+             this.hisPatient = hisPatient
+          }
+       })
+     },
+     getInitData(){
+       getInitData().then(response=>{
+          if(response.data.state == 1){
+            this.department = response.data.data.department
+            this.diagnoses = response.data.data.diagnose
+            console.log("争端",this.diagnoses)
+          }
+       })
+     },
+     getDepart(id){
+         var name = ""
+       for(let i=0;i<this.department.length;i++){
+           if(id == this.department[i].id){
+               name = this.department[i].name
+           }
+       }
+       return name
+     },
+    getTotalOne(id) {
+
+        var total = 0
+        var addtotal = 0
+        for (let i = 0; i < this.prescriptions.length; i++) {
+          if(id == this.prescriptions[i].id){
+            if (this.prescriptions[i].project != null) {
+              for (let a = 0; a < this.prescriptions[i].project.length; a++) {
+                total = total + this.prescriptions[i].project[a].price * this.prescriptions[i].project[a].count
+              }
+            }
+
+            if (this.prescriptions[i].additionalcharge != null) {
+              for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
+                addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
+              }
+            }
+              addtotal =  Math.floor(addtotal * 100) / 100
+        }
+
+       }
+
+      for (let i = 0; i < this.prescriptions.length; i++) {
+          if(id == this.prescriptions[i].id){
+            if (this.prescriptions[i].advices != null) {
+              for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
+                total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
+              }
+            }
+
+            if (this.prescriptions[i].additionalcharge != null) {
+              for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
+                addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
+              }
+            }
+              addtotal =  Math.floor(addtotal * 100) / 100
+        }
+       }
+
+        return total + addtotal
+      },
+
+     getProjectName(id){
+        var project_name = ""
+        for(let i=0;i<this.projectList.length;i++){
+           if(id == this.projectList[i].id){
+               project_name = this.projectList[i].project_name
+           }
+        }
+        return project_name
+     },
+
+     getDiagnosis(id){
+       let arr = id.split(',')
+       var name = ""
+       for(let i=0;i<this.diagnoses.length;i++){
+         if(arr.indexOf(String(this.diagnoses[i].id)) > -1){
+           name += this.diagnoses[i].class_name + ' '
+         }
+       }
+       return name
+     }
+
+   },
+   created(){
+      this.getAllDoctorList()
+      this.getInitData()
+      this.getPrescriptionPrint()
+      this.getHisPatientDetail()
+      var xtuser = this.$store.getters.xt_user;
+      this.orgname = xtuser.org.org_name;
+
+   },
+   watch:{
+     ids:function(val){
+      this.ids = val
+      this.getPrescriptionPrint()
+    }
+   }
+}
+</script>
+
+
+<style lang="scss" scoped>
+.prescription-print{
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+    margin-bottom: 20px;
+    padding:20px 10px;
+}
+.printTitle{
+    font-size: 22px;
+    text-align: center;
+    font-weight: bold;
+}
+.infoTitle{
+    display: flex;
+    border-bottom: 2px solid #000;
+    margin-top:10px;
+    line-height: 24px;
+    padding:0 10px;
+}
+.infoTitle p{
+    width: 200px;
+}
+.infoMain{
+    display: flex;
+    flex-wrap: wrap;
+    border-bottom: 2px solid #000;
+    padding:0 10px;
+}
+.infoMain div{
+    width: 50%;
+    line-height: 24px;
+}
+.prescriptionBox{
+    padding:0 10px;
+    min-height:450px;
+}
+.Rp{
+    font-size: 22px;
+    font-weight: bold;
+}
+.drugsBox{
+    padding-left: 40px;
+    margin-bottom: 10px;
+}
+.drugsBox div{
+    line-height: 20px;
+}
+.drugsOne{
+    line-height: 24px;
+}
+.drugsOne span{
+    margin-right: 20px;
+}
+.doctorBox{
+    display: flex;
+    justify-content: space-between;
+    padding:0 10px;
+    line-height: 24px;
+    border-bottom: 2px solid #000;
+}
+.actionBar{
+    display: flex;
+    justify-content: space-between;
+    line-height: 24px;
+    padding:0 10px;
+}
+.actionBar p{
+    width:150px;
+}
+</style>

src/xt_pages/outpatientDoctorStation/batch_print_template/index.vue

@@ -14,13 +14,13 @@
 
     <div class='dialysisPage' style="padding-top:40px;">
       <div v-if="org_id != 10138 && org_id != 10278">
-        <printOne v-if="org_id != 10088 && org_id != 10215" :printData="printData"  :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
-        <printFour v-if="org_id == 10088" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printFour>
-        <printFive v-if="org_id == 10215" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printFive>
-      </div>
-      <div v-else>
-        <printThree v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printThree>
+        <printOne v-if="org_id != 10088 && org_id != 10215  && org_id != 0" :printData="printData"  :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
+        <batch-print-two v-if="org_id == 10088 || org_id == 0" :printData="printData"  :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></batch-print-two>
+<!--        <print-six v-if="org_id == 10088 || org_id == 0" :printData="printData"  :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></print-six>-->
+<!--        <printFour v-if="org_id == 10088 || org_id == 0"  :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printFour>-->
+<!--        <printFive v-if="org_id == 10215" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printFive>-->
       </div>
+
     </div>
   </div>
 </template>
@@ -36,13 +36,15 @@ import { jsGetAge, uParseTime } from "@/utils/tools";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import print from "print-js";
 import printOne from "./printOne"
-// import printThree from "./template/printThree"
-// import printFour from "./template/printFour"
-// import printFive from "./template/printFive"
+import printFour from "./batchPrintTwo"
 import { getAllDoctorList,getAllHisPatientList,getPrescriptionPrint } from "@/api/project/project"
+import PrintSix from '../template/printSix'
+import BatchPrintTwo from './batchPrintTwo'
 export default {
   name: "dialysisPrintOrder",
   components: {
+    BatchPrintTwo,
+    PrintSix,
     BreadCrumb,
     printOne
   },

src/xt_pages/outpatientDoctorStation/batch_print_template/printOne.vue

@@ -43,8 +43,8 @@
             </div>
             <div style="margin-bottom: 10px">
               科室：{{
-                i.his_patient.id != 0
-                  ? getDepart(i.his_patient.departments)
+                i.info.id != 0
+                  ? getDepart(i.info.departments)
                   : ""
               }}
             </div>

src/xt_pages/outpatientDoctorStation/batch_print_treatTemplate/printOne.vue

@@ -1,8 +1,7 @@
 <template>
   <div id='prescriptionPrint'>
     <div v-for="(i,index) in printData">
-      <div id='prescription-print' class="prescription-print" v-for="(item,index) in i.prescriptions" :key="index">
-
+      <div id='prescription-print' class="prescription-print" v-for="(item,index) in i.prescriptions" :key="index" v-if="item.project.length > 0">
         <div style="display:flex;justify-content: space-between;font-weight:bold;align-items:center;">
           <div style="width:200px;display:flex;justify-content: space-between;font-weight:bold;">
             <span>费别</span>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -134,7 +134,7 @@
             <!-- <el-button size="small" ref="button_four"  @click="open(5)" type="primary" :disabled='prescriptions && prescriptions[0].advices && prescriptions[0].project ? prescriptions[0].advices.length == 0 && prescriptions[0].project.length == 0 : false'>存模板</el-button> -->
           </div>
           <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子病历'">
-            <el-button size="small" :loading="keepLoad" @click="opentwo(1)" type="primary">保存</el-button>
+            <el-button size="small" @click="opentwo(1)" type="primary">保存</el-button>
             <el-button size="small" @click="opentwo(2)" type="primary">打印</el-button>
             <el-button size="small" @click="opentwo(3)" type="primary">病历调用</el-button>
             <el-button size="small" @click="opentwo(4)" type="primary">存模板</el-button>
@@ -275,7 +275,6 @@
         <template>
           <el-button
               style="float:right;"
-              :loading="loading"
               size="small"
               icon="el-icon-printer"
               @click="printThisPage"
@@ -4504,7 +4503,8 @@ export default {
           record: this.record_date,
           prescription_id: this.prescription_id,
           ids: ids1,
-          patient_id: this.patientid
+          patient_id: this.patientid,
+          his_patient_id: this.hisPatientInfo.id,
         }
         this.paramsObj = obj1
       }
@@ -4520,7 +4520,9 @@ export default {
           record: this.record_date,
           prescription_id: this.prescription_id,
           ids: ids2,
-          patient_id: this.patientid
+          patient_id: this.patientid,
+          his_patient_id: this.hisPatientInfo.id,
+
         }
         this.paramsObj2 = obj2
       }
@@ -4534,7 +4536,9 @@ export default {
           record: this.record_date,
           prescription_id: this.prescription_id,
           ids: ids2,
-          patient_id: this.patientid
+          patient_id: this.patientid,
+          his_patient_id: this.hisPatientInfo.id,
+
         }
         this.paramsObj3 = obj3
       }

src/xt_pages/outpatientDoctorStation/pastInquiries.vue

@@ -6,94 +6,99 @@
     <div class="app-container">
       <div class="cell clearfix">
         <el-input
-          size="small"
-          style="width: 150px"
-          v-model="keywords"
-          class="filter-item"
+            size="small"
+            style="width: 150px"
+            v-model="keywords"
+            class="filter-item"
         />
         <el-button
-          size="small"
-          style="margin: 0 10px"
-          class="filter-item"
-          type="primary"
-          @click="searchAction"
-          >搜索
+            size="small"
+            style="margin: 0 10px"
+            class="filter-item"
+            type="primary"
+            @click="searchAction"
+        >搜索
         </el-button>
         <el-date-picker
-          v-model="record_date"
-          prefix-icon="el-icon-date"
-          @change="handleScheduleDateChange"
-          :editable="false"
-          :clearable="false"
-          style="width: 196px; margin-right: 10px"
-          type="date"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-          placeholder="选择日期时间"
-          align="right"
+            v-model="record_date"
+            prefix-icon="el-icon-date"
+            @change="handleScheduleDateChange"
+            :editable="false"
+            :clearable="false"
+            style="width: 196px; margin-right: 10px"
+            type="date"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期时间"
+            align="right"
         ></el-date-picker>
         <el-button
-          size="small"
-          style="margin: 0 10px"
-          class="filter-item"
-          type="primary"
-          @click="batchPrint(1)"
-          >处方筏批量打印</el-button
+            size="small"
+            style="margin: 0 10px"
+            class="filter-item"
+            type="primary"
+            @click="batchPrint(1)"
+        >处方筏批量打印
+        </el-button
         >
         <el-button
-          size="small"
-          style="margin: 0 10px"
-          class="filter-item"
-          type="primary"
-          @click="batchPrint(2)"
-          >治疗单批量打印</el-button
+            size="small"
+            style="margin: 0 10px"
+            class="filter-item"
+            type="primary"
+            @click="batchPrint(2)"
+        >治疗单批量打印
+        </el-button
         >
         <el-button
-          size="small"
-          style="margin: 0 10px"
-          class="filter-item"
-          type="primary"
-          @click="batchPrint(3)"
-          >检验单批量打印</el-button
+            size="small"
+            style="margin: 0 10px"
+            class="filter-item"
+            type="primary"
+            @click="batchPrint(3)"
+        >检验单批量打印
+        </el-button
         >
       </div>
       <el-table
-        :data="tableData"
-        border
-        ref="table"
-        style="width: 100%"
-        :row-style="{ color: '#303133' }"
-        @selection-change="handleSelectionChange"
-        :header-cell-style="{
+          :data="tableData"
+          border
+          ref="table"
+          style="width: 100%"
+          :row-style="{ color: '#303133' }"
+          @selection-change="handleSelectionChange"
+          :header-cell-style="{
           backgroundColor: 'rgb(245, 247, 250)',
           color: '#606266',
         }"
-        highlight-current-row
+          highlight-current-row
       >
         <el-table-column
-          align="center"
-          type="selection"
-          width="55"
+            align="center"
+            type="selection"
+            width="55"
         ></el-table-column>
         <el-table-column
-          align="center"
-          label="序号"
-          width="60"
-          type="index"
+            align="center"
+            label="序号"
+            width="60"
+            type="index"
         ></el-table-column>
         <el-table-column align="center" prop="name" label="姓名" width="100">
           <template slot-scope="scope">{{
-            scope.row.patients ? scope.row.patients.name : ""
-          }}</template>
+              scope.row.patients ? scope.row.patients.name : ''
+            }}
+          </template>
         </el-table-column>
         <el-table-column
-          align="center"
-          prop="name"
-          label="处方日期"
-          width="200"
+            align="center"
+            prop="name"
+            label="处方日期"
+            width="200"
         >
           <template slot-scope="scope">
-            {{ getTimes(scope.row.ctime) }}</template
+            {{ getTimes(scope.row.ctime) }}
+          </template
           >
         </el-table-column>
         <!--<el-table-column align="center" prop="name" label="患者类型">-->
@@ -101,16 +106,18 @@
         <!--</el-table-column>-->
         <el-table-column align="center" prop="name" label="处方号">
           <template slot-scope="scope">{{
-            scope.row.prescription_number
-          }}</template>
+              scope.row.prescription_number
+            }}
+          </template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="开立医生">
           <template slot-scope="scope">{{ scope.row.doctor }}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="诊断">
           <template slot-scope="scope">{{
-            getDiagnosis(scope.row.diagnosis)
-          }}</template>
+              getDiagnosis(scope.row.diagnosis)
+            }}
+          </template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="状态" width="100">
           <template slot-scope="scope">
@@ -121,58 +128,59 @@
         <el-table-column align="center" prop="name" label="操作" width="100">
           <template slot-scope="scope">
             <el-button
-              size="mini"
-              type="primary"
-              @click="handerShowDetail(scope.row)"
-              >详情</el-button
+                size="mini"
+                type="primary"
+                @click="handerShowDetail(scope.row)"
+            >详情
+            </el-button
             >
           </template>
         </el-table-column>
       </el-table>
       <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100]"
-        :page-size="10"
-        background
-        style="margin-top: 20px; float: right"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :page-sizes="[10, 50, 100]"
+          :page-size="10"
+          background
+          style="margin-top: 20px; float: right"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
       >
       </el-pagination>
       <inquiries-detail ref="inquiriesDetail"></inquiries-detail>
       <el-dialog
-        class="centerDialog"
-        width="600px"
-        title="打印"
-        :visible.sync="innerVisible"
-        append-to-body
+          class="centerDialog"
+          width="600px"
+          title="打印"
+          :visible.sync="innerVisible"
+          append-to-body
       >
         <template>
           <el-button
-            style="float: right"
-            size="small"
-            icon="el-icon-printer"
-            @click="printThisPage(printData)"
-            type="primary"
-            >打印
+              style="float: right"
+              size="small"
+              icon="el-icon-printer"
+              @click="printThisPage(printData)"
+              type="primary"
+          >打印
           </el-button>
         </template>
         <div id="printMain">
           <print
-            ref="print"
-            v-if="printType == 1"
-            :printData="printData"
+              ref="print"
+              v-if="printType == 1"
+              :printData="printData"
           ></print>
           <treatPrint
-            ref="treatPrint"
-            v-if="printType == 2"
-            :printData="printData"
+              ref="treatPrint"
+              v-if="printType == 2"
+              :printData="printData"
           ></treatPrint>
           <checkPrint
-            ref="checkPrint"
-            v-if="printType == 3"
-            :printData="printData"
+              ref="checkPrint"
+              v-if="printType == 3"
+              :printData="printData"
           ></checkPrint>
         </div>
       </el-dialog>
@@ -181,32 +189,32 @@
 </template>
 
 <script>
-import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import inquiriesDetail from "./components/inquiriesDetail";
-import { getHisPrescriptionList } from "@/api/his/his";
-import { uParseTime } from "@/utils/tools";
-import { getInitData, getBatchPrint } from "@/api/his/his";
-import print from "./batch_print_template/index";
-import treatPrint from "./batch_print_treatTemplate/index";
-import checkPrint from "./batch_print_checkTemplate/index";
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import inquiriesDetail from './components/inquiriesDetail'
+import { getBatchPrint, getHisPrescriptionList, getInitData } from '@/api/his/his'
+import { uParseTime } from '@/utils/tools'
+import print from './batch_print_template/index'
+import treatPrint from './batch_print_treatTemplate/index'
+import checkPrint from './batch_print_checkTemplate/index'
+
 export default {
   components: {
     BreadCrumb,
     inquiriesDetail,
     print,
     treatPrint,
-    checkPrint,
+    checkPrint
   },
   data() {
     return {
-      keywords: "",
+      keywords: '',
       total: 0,
-      record_date: "",
+      record_date: '',
       page: 1,
       limit: 10,
       crumbs: [
-        { path: false, name: "门诊医生站" },
-        { path: false, name: "既往查询" },
+        { path: false, name: '门诊医生站' },
+        { path: false, name: '既往查询' }
       ],
       tableData: [],
       diagnoses: [],
@@ -214,55 +222,56 @@ export default {
       selecting_schs: [],
       printData: [],
       printType: 0,
-      org_id: "",
-    };
+      org_id: ''
+    }
   },
   methods: {
     printThisPage(printData) {
       printData.forEach((item) => {
         const print = new Promise((resolve, reject) => {
           if (item.prescriptions.length != 0) {
-            resolve(item.prescriptions);
+            resolve(item.prescriptions)
           } else {
-            reject(false);
+            reject(false)
           }
-        });
+        })
         print
-          .then((printData) => {
-            if (this.org_id == 10138) {
-              const style =
-                "@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 87%;}}}";
-              printJS({
-                printable: "printMain",
-                type: "html",
-                style: style,
-                scanStyles: false,
-              });
-            }
-            if (this.printType == 3) {
-              const style =
-                "@media print {html {zoom: 80%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}#prescriptionPrint div{box-shadow:none;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 20px;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}";
-              printJS({
-                printable: "printMain",
-                type: "html",
-                style: style,
-                scanStyles: false,
-              });
-            } else {
-              const style =
-                "@media print {html {height: auto;margin: 0px;} #prescription-print{font-size:14px;border:1px solid white;margin-bottom:40px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 80%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 20px;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}";
-              printJS({
-                printable: "printMain",
-                type: "html",
-                style: style,
-                scanStyles: false,
-              });
-            }
-          })
-          .catch((reject) => {});
-      });
+            .then((printData) => {
+              if (this.org_id == 10138) {
+                const style =
+                    '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 87%;}}}'
+                printJS({
+                  printable: 'printMain',
+                  type: 'html',
+                  style: style,
+                  scanStyles: false
+                })
+              }
+              if (this.printType == 3) {
+                const style =
+                    '@media print {html {zoom: 80%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}#prescriptionPrint div{box-shadow:none;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 20px;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}'
+                printJS({
+                  printable: 'printMain',
+                  type: 'html',
+                  style: style,
+                  scanStyles: false
+                })
+              } else {
+                const style =
+                    '@media print {html {height: auto;margin: 0px;} #prescription-print{font-size:14px;border:1px solid white;margin-bottom:40px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 80%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 20px;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}'
+                printJS({
+                  printable: 'printMain',
+                  type: 'html',
+                  style: style,
+                  scanStyles: false
+                })
+              }
+            })
+            .catch((reject) => {
+            })
+      })
 
-      this.innerVisible = false;
+      this.innerVisible = false
       // this.$nextTick(() => {
       //   this.$refs.print.printThisPage()
       //   this.$refs.treatPrint.printThisPage()
@@ -271,202 +280,204 @@ export default {
     },
 
     searchAction() {
-      this.page = 1;
-      this.limit = 10;
-      this.getHisPrescriptionList();
+      this.page = 1
+      this.limit = 10
+      this.getHisPrescriptionList()
     },
     handleScheduleDateChange() {
-      this.page = 1;
-      this.limit = 10;
-      this.getHisPrescriptionList();
+      this.page = 1
+      this.limit = 10
+      this.getHisPrescriptionList()
     },
     handleCurrentChange(page) {
-      this.page = page;
-      this.getHisPrescriptionList();
+      this.page = page
+      this.getHisPrescriptionList()
     },
 
     handleSizeChange(limit) {
-      this.limit = limit;
-      this.getHisPrescriptionList();
+      this.limit = limit
+      this.getHisPrescriptionList()
     },
     getTimes(time) {
-      return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
+      return uParseTime(time, '{y}-{m}-{d} {h}:{i}:{s}')
     },
     handerShowDetail(row) {
       if (row.id == 0) {
-        this.$message.error("未就诊");
-        return;
+        this.$message.error('未就诊')
+        return
       }
-      this.$refs.inquiriesDetail.show(row.id);
+      this.$refs.inquiriesDetail.show(row.id)
     },
     getHisPrescriptionList() {
       let params = {
         record_date: this.record_date,
         page: this.page,
         limit: this.limit,
-        keywords: this.keywords,
-      };
+        keywords: this.keywords
+      }
       getHisPrescriptionList(params).then((response) => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
+          this.$message.error(response.data.msg)
+          return false
         } else {
-          this.tableData = response.data.data.order;
-          this.total = response.data.data.total;
+          this.tableData = response.data.data.order
+          this.total = response.data.data.total
           this.$nextTick(() => {
-            this.$refs.table.doLayout(); //解决表格错位
-          });
+            this.$refs.table.doLayout() //解决表格错位
+          })
         }
-      });
+      })
     },
     getInitData() {
       getInitData().then((response) => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
+          this.$message.error(response.data.msg)
+          return false
         } else {
-          this.diagnoses = response.data.data.diagnose;
-          console.log("诊断列表", this.diagnoses);
+          this.diagnoses = response.data.data.diagnose
+          console.log('诊断列表', this.diagnoses)
         }
-      });
+      })
     },
     getDiagnosis(id) {
-      let ids = id.split(",");
-      var name = "";
+      let ids = id.split(',')
+      var name = ''
       for (let i = 0; i < ids.length; i++) {
         for (let b = 0; b < this.diagnoses.length; b++) {
           if (parseInt(ids[i]) == this.diagnoses[b].id) {
             if (name.length == 0) {
-              name = this.diagnoses[b].class_name;
+              name = this.diagnoses[b].class_name
             } else {
-              name = name + "," + this.diagnoses[b].class_name;
+              name = name + ',' + this.diagnoses[b].class_name
             }
           }
         }
       }
-      return name;
+      return name
     },
     handleSelectionChange(val) {
-      this.selecting_schs = val;
+      this.selecting_schs = val
     },
     batchPrint(type) {
-      this.printType = type;
+      this.printType = type
       if (this.selecting_schs.length === 0) {
-        this.$message.error("请至少选择一条需要打印的内容");
-        return false;
+        this.$message.error('请至少选择一条需要打印的内容')
+        return false
       } else {
-        var sch_ids = [];
+        var sch_ids = []
         for (let index = 0; index < this.selecting_schs.length; index++) {
-          sch_ids.push(this.selecting_schs[index].patient_id);
+          sch_ids.push(this.selecting_schs[index].patient_id)
         }
         let params = {
           record_date: this.record_date,
-          patient_ids: sch_ids.join(","),
-          type: type,
-        };
+          patient_ids: sch_ids.join(','),
+          type: type
+        }
         getBatchPrint(params).then((res) => {
-          let Arr = res.data.data.patients;
-          let new_patients = [];
+          let Arr = res.data.data.patients
+
+
+          let new_patients = []
           if (type != 3) {
             Arr.forEach((i) => {
               if (i.prescriptions.length != 0) {
-                new_patients.push(i);
+                new_patients.push(i)
               }
-            });
+            })
           } else {
             // 过滤检查单数据出来，筛选出有检查项目的单子，不显示没有检查项目的单子
             Arr.forEach((el) => {
               el.prescriptions.forEach((o) => {
                 o.project.forEach((i) => {
-                  if (i.team.project_team != "") {
-                    new_patients.push(el);
+                  if (i.team.project_team != '') {
+                    new_patients.push(el)
                   }
-                });
-              });
-            });
-            let projectPrint = [];
+                })
+              })
+            })
+            let projectPrint = []
             new_patients.forEach((el) => {
               el.prescriptions.map((item) => {
                 if (item.project.length > 0) {
                   item.project.map((it) => {
-                    projectPrint.push(it);
-                  });
+                    projectPrint.push(it)
+                  })
                 }
-              });
-            });
+              })
+            })
             // 数组去重
-            projectPrint = this.split_project(projectPrint);
+            projectPrint = this.split_project(projectPrint)
             // 配对
-            let data = [];
+            let data = []
             projectPrint.map((item) => {
               if (item.team.id == 0) {
-                data.push(item);
+                data.push(item)
               } else {
-                if (item.team.project_team != "") {
-                  new_patients.push(item);
+                if (item.team.project_team != '') {
+                  new_patients.push(item)
                 }
               }
-            });
+            })
             new_patients = this.split_project_1(new_patients)
           }
-          this.printData = new_patients;
-          console.log(this.printData,'this.printData')
-        });
+          this.printData = new_patients
+          console.log(this.printData, 'this.printData')
+        })
       }
-      this.innerVisible = true;
+      this.innerVisible = true
     },
     // 外层去重方
     split_project(Arr) {
-      let hash = {};
-      let new_Arr = [];
+      let hash = {}
+      let new_Arr = []
       new_Arr = Arr.reduce((preVal, curVal) => {
-        hash[curVal.id] ? "" : (hash[curVal.id] = true && preVal.push(curVal));
-        return preVal;
-      }, []);
+        hash[curVal.id] ? '' : (hash[curVal.id] = true && preVal.push(curVal))
+        return preVal
+      }, [])
       Arr = new_Arr.reduce((preVal, curVal) => {
         hash[curVal.team.project_team]
-          ? ""
-          : (hash[curVal.team.project_team] = true && preVal.push(curVal));
-        return preVal;
-      }, []);
-      return Arr;
+            ? ''
+            : (hash[curVal.team.project_team] = true && preVal.push(curVal))
+        return preVal
+      }, [])
+      return Arr
     },
 
     // 内层去重
     split_project_1(Arr) {
-      let hash = {};
-      let new_Arr = [];
+      let hash = {}
+      let new_Arr = []
       Arr = Arr.reduce((preVal, curVal) => {
-        hash[curVal.id] ? "" : (hash[curVal.id] = true && preVal.push(curVal));
-        return preVal;
-      }, []);
+        hash[curVal.id] ? '' : (hash[curVal.id] = true && preVal.push(curVal))
+        return preVal
+      }, [])
 
       Arr.forEach(el => {
-        if(el.name){
+        if (el.name) {
           new_Arr.push(el)
         }
       })
 
-      console.log(new_Arr, "Arr");
-      return new_Arr;
-    },
+      console.log(new_Arr, 'Arr')
+      return new_Arr
+    }
   },
   created() {
-    var nowDate = new Date();
-    var nowYear = nowDate.getFullYear();
-    var nowMonth = nowDate.getMonth() + 1;
-    var nowDay = nowDate.getDate();
+    var nowDate = new Date()
+    var nowYear = nowDate.getFullYear()
+    var nowMonth = nowDate.getMonth() + 1
+    var nowDay = nowDate.getDate()
     this.record_date =
-      nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay);
+        nowYear +
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
 
-    this.org_id = this.$store.getters.xt_user.template_info.org_id;
+    this.org_id = this.$store.getters.xt_user.template_info.org_id
 
-    this.getHisPrescriptionList();
-    this.getInitData();
-  },
-};
+    this.getHisPrescriptionList()
+    this.getInitData()
+  }
+}
 </script>

src/xt_pages/outpatientDoctorStation/print.vue

@@ -19,20 +19,9 @@
  -->
     <div class="dialysisPage" style="padding-top: 40px">
       <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243 && org_id != 4 && org_id !=0">
+
         <printOne v-if="org_id != 10088 && org_id != 10215" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
 
-        <!--        <printSix-->
-<!--          v-if="org_id != 10088 && org_id != 10215"-->
-<!--          v-bind:childResponse="childResponse"-->
-<!--          :advicePrint="advicePrint"-->
-<!--          :ids="ids"-->
-<!--          :patient="patient"-->
-<!--          :hisPatient="hisPatient"-->
-<!--          :doctorPorject="doctorPorject"-->
-<!--          :patient_id="patient_id"-->
-<!--          :record_date="record_date"-->
-<!--          :prescription_id="prescription_id"-->
-<!--        ></printSix>-->
         <printFour
           v-if="org_id == 10088"
           v-bind:childResponse="childResponse"
@@ -56,6 +45,7 @@
           :patient_id="patient_id"
           :record_date="record_date"
           :prescription_id="prescription_id"
+          :his_patient_id ="his_patient_id"
         ></printFive>
 
         <!-- <printSix v-if="org_id != 10088 && org_id != 10215" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printSix> -->
@@ -75,7 +65,6 @@
       </div>
       <div v-else>
         <printThree
-          v-bind:childResponse="childResponse"
           :advicePrint="advicePrint"
           :ids="ids"
           :patient="patient"
@@ -91,10 +80,7 @@
 </template>
 
 <script>
-import { parseTime } from "@/utils";
-import { getDialysisRecord } from "@/api/dialysis";
-import { getDataConfig } from "@/utils/data";
-import { jsGetAge, uParseTime } from "@/utils/tools";
+import {  uParseTime } from "@/utils/tools";
 
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import print from "print-js";
@@ -106,7 +92,6 @@ import printSix from "./template/printSix";
 import {
   getAllDoctorList,
   getAllHisPatientList,
-  getPrescriptionPrint,
 } from "@/api/project/project";
 export default {
   name: "dialysisPrintOrder",
@@ -136,6 +121,7 @@ export default {
       search_input: "",
       loading: false,
       patient_id: "",
+      his_patient_id:"",
       prescription_id: "",
       ids: "",
       paramsObj: {},
@@ -225,49 +211,21 @@ export default {
       this.patient_id = row.patient_id;
       this.record_date = this.record_date;
       this.prescription_id = this.prescription_id;
-      console.log("row", row);
-      // var params = {
-      //   patient_id:row.patient_id,
-      //   record_date:this.record_date,
-      //   prescription_id:this.prescription_id,
-      // }
-      // getPrescriptionPrint(params).then(response=>{
-      //     if(response.data.state == 1){
-      //       var advicePrint =  response.data.data.advicePrint
-      //       console.log("adviceprint",advicePrint)
-      //       this.advicePrint = advicePrint
-      //       var patient =  response.data.data.patient
-      //       console.log("patient",patient)
-      //       this.patient = patient
-      //       //  var hisPatient =  response.data.data.hisPatient
-      //       // console.log("hispatient",hisPatient)
-      //       // this.hisPatient = hisPatient
-      //       var doctorPorject = response.data.data.doctorPorject
-      //       console.log("doctorporject",doctorPorject)
-      //       this.doctorPorject = doctorPorject
-      //     }
-      // })
+      this.his_patient_id = row.his_patient_id
+
     },
     searchAction() {},
   },
 
   created() {
-    this.org_id = this.$store.getters.xt_user.org_id;
-    console.log(this.org_id,'机构id')
-    this.getAllDoctorList();
-    var record_date = this.paramsObj.record;
-    this.record_date = record_date;
-    console.log("record_date", record_date);
-    var prescription_id = this.paramsObj.prescription_id;
-    this.prescription_id = prescription_id;
+    this.record_date =  this.paramsObj.record;
+    this.prescription_id =  this.paramsObj.prescription_id;
     this.patient_id = this.paramsObj.patient_id;
     this.ids = this.paramsObj.ids;
-    // var record_date = this.$route.query.record
-    // this.record_date = record_date
-    // console.log("record_date",record_date)
-    // var prescription_id = this.$route.query.prescription_id
-    // this.prescription_id = prescription_id
-    this.getAllHisPatientList(record_date);
+    this.org_id = this.$store.getters.xt_user.org_id;
+    this.his_patient_id = this.paramsObj.his_patient_id;
+    this.getAllDoctorList();
+    this.getAllHisPatientList(this.record_date);
   },
   watch: {
     paramsObj: {
@@ -275,9 +233,9 @@ export default {
       handler(val, oldVal) {
         this.paramsObj = val;
         this.patient_id = this.paramsObj.patient_id;
+        this.his_patient_id = this.paramsObj.his_patient_id;
         var record_date = this.paramsObj.record;
         this.record_date = record_date;
-        console.log("record_date", record_date);
         var prescription_id = this.paramsObj.prescription_id;
         this.prescription_id = prescription_id;
         this.ids = this.paramsObj.ids;

src/xt_pages/outpatientDoctorStation/template/printThree.vue

@@ -98,7 +98,7 @@
             </div>
             <div style="margin-bottom: 10px; display: flex">
               临床诊断：{{
-                item.info.diagnosis ? getDiagnosis(item.info.diagnosis) : ""
+                hisPatient.diagnosis ? getDiagnosis(hisPatient.diagnosis) : ""
               }}
             </div>
             <div style="margin-bottom: 10px; display: flex">
@@ -256,6 +256,7 @@ export default {
     patient_id: Number,
     record_date: String,
     prescription_id: Number,
+    his_patient_id:Number,
     ids: String,
   },
   data() {
@@ -356,6 +357,7 @@ export default {
         patient_id: this.patient_id,
         record_date: this.record_date,
         prescription_id: this.prescription_id,
+        his_patient_id: this.his_patient_id,
         ids: this.ids,
         p_type: 2,
       };