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

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -280,14 +280,21 @@
       ref="patientprint"
       :visibility="isVisibility"
       :propsTable="propsTable"
+      
     >
     </patient-print>
+    <patientPrintTwo ref="patientprintTwo"
+      :visibility="isVisibilityTwo"
+      :propsTable="propsTable"
+    >
+    </patientPrintTwo>
   </div>
 </template>
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import patientPrint from "./print/patientPrint.vue";
+import patientPrintTwo from './print/patientPrintTwo'
 import { getPharmacyConfig, SaveSetting } from "@/api/his/advice";
 import {
   waitingdrug,
@@ -303,6 +310,7 @@ export default {
   components: {
     BreadCrumb,
     patientPrint,
+    patientPrintTwo
   },
   data() {
     return {
@@ -313,6 +321,7 @@ export default {
       ],
       tableHeight: 400,
       start_time: moment(new Date()).add("year", 0).format("YYYY-MM-DD"),
+      start_time2: moment(new Date()).add("year", 0).format("YYYY-MM-DD hh:mm"),
       state: 1, //1待发药，2已发药
       waitmount: 0, //待发药人数
       waitmount_data: [],
@@ -323,6 +332,7 @@ export default {
       propsTable: [],
       tableData_list: [],
       isVisibility: false,
+      isVisibilityTwo:false,
       currentRow: null,
       dialogVisible: false,
       is_open: "2",
@@ -337,6 +347,9 @@ export default {
       partition: 0, //分区
       drugList:[],
       baseList:[],
+      org_id:'',
+      patients:{},
+      doctors:[]
     };
   },
   watch: {},
@@ -345,6 +358,7 @@ export default {
     this.gettodaynumber();
     this.fun3();
     this.getgetpartitionlist();
+    this.org_id = this.$store.getters.xt_user.org.id
     // this.getwaitmount();//fun3
     // this.selectedbydefault();
   },
@@ -462,12 +476,12 @@ export default {
     },
     //获取当天发药的人数
     gettodaynumber() {
-      console.log("aaa");
       var params = {
         time: this.start_time,
       };
       todaynumber(params).then((res) => {
         if (res.data.state == 1) {
+          console.log('3333333',res.data.data);
           this.waitmount = res.data.data.itotal;
           this.alreadmount = res.data.data.wtotal;
           this.drugList = res.data.data.drug
@@ -547,9 +561,17 @@ export default {
       getpharmacycontent(params).then((res) => {
         if (res.data.state == 1) {
            var list = res.data.data.list;
-           console.log("hhhhawoowowow",list)
+           console.log("hhhhawoowowow",res.data.data)
            this.baseList =[]
           this.baseList = res.data.data.baseList
+          this.doctors = res.data.data.doctors
+          const obj={
+            age:res.data.data.patients.age,
+            gender: res.data.data.patients.gender,
+            diagnose:res.data.data.patients.diagnose,
+            zhixing:res.data.data.patients.created_time      
+          }
+          this.patients =obj
           if(this.$store.getters.xt_user.org.id == 10188 || this.$store.getters.xt_user.org.id == 10217 || this.$store.getters.xt_user.org.id == 10387 ||  this.$store.getters.xt_user.org.id == 0  ||  this.$store.getters.xt_user.org.id == 10480  ){
             this.tableData = []
             if(list!=null && list.length >0){
@@ -576,13 +598,29 @@ export default {
       if (this.tableData == null) {
         this.$message.error("未选择任何数据");
         return;
+      }else{
+        if(this.org_id != 10653 && this.org_id !=0){
+          this.$refs.patientprint.show(
+            this.tableData,
+            this.currentRow,
+            this.state,
+            this.start_time
+          );
+        }else{
+          this.$refs.patientprintTwo.show(
+            this.tableData,
+            this.currentRow,
+            this.state,
+            this.start_time2,
+            this.baseList,
+            this.patients,
+            this.doctors
+          )
+        }
       }
-      this.$refs.patientprint.show(
-        this.tableData,
-        this.currentRow,
-        this.state,
-        this.start_time
-      );
+
+      
+      
     },
     toExport() {
       import("@/vendor/Export2Excel").then((excel) => {

src/xt_pages/Pharmacy/print/patientPrintTwo.vue

@@ -0,0 +1,332 @@
+<template>
+  <el-dialog
+    title="打印"
+    :visible.sync="visibility"
+    :close-on-click-modal="isClose"
+    :close-on-press-escape="isClose"
+  >
+    <el-button type="primary" @click="print" class="print_style"
+      >打印23</el-button
+    >
+    <div id="dialysis-print-box-1" class="dialysis-print-box-1">
+      <div class="list_title" style="border-bottom:none;">
+        <div style="width:100%;text-align:center;font-size:16px;font-weight:bold;">
+          {{org_name}} <span v-if="state=='待发药'">发药单</span> <span v-if="state=='已发药'">领药单</span>
+        </div>
+      </div>
+      <div style="display: flex;">
+        <div style="margin-right: 20px;">日期：{{times}}</div>
+        <div>单据号:00013756</div>
+      </div>
+      <div style="margin: 10px 0;">
+        <!-- <span>床号:{{  }}</span>&nbsp;&nbsp;
+        <span>住院号:{{DialysisNo}}</span>&nbsp;&nbsp; -->
+        <span>姓名:{{name}}</span>&nbsp;&nbsp;
+        <span>性别:{{ patients.gender==1 ?'男':'女'}}</span>&nbsp;&nbsp;
+        <span>年龄:{{patients.age}}</span>&nbsp;&nbsp;
+        <span>住院科室:肾内科</span>&nbsp;&nbsp;
+        <span>入院诊断:{{patients.diagnose}}</span>
+      </div>
+      <div>
+        <table class="table" border="1" 
+          style="border-collapse: collapse;border-left: none;border-right: none;width: 100%;text-align: center;">
+          <tr>
+            <td>药品名称</td>
+            <td>规格</td>
+            <td>用量</td>
+            <td>用法</td>
+            <td>总量</td>
+            <td>金额</td>
+            <td>执行时间</td>
+          </tr>
+          <tr v-for="item in tableData" >
+            <td>{{item.Name}}</td>
+            <td>{{getSpecaiName(item.DrugId)}}</td>
+            <td>{{item.SingleDosage}}</td>
+            <td>{{item.Frequency}}</td>
+            <td>{{ item.Usage }}<span>{{item.Total}}</span></td>
+            <!-- <td>{{item.Usage}}</td>
+            <td>{{item.Total}}</td> -->
+            <td>{{item.Price}}</td>
+            <td>{{getTime(item.ExecutionTime) }}</td>
+          </tr>
+        </table>
+      </div>
+      <div style="display: flex;margin: 10px 0;">
+        <div style="flex: 1;">发药药房:药房</div>
+        <div style="flex: 1;">开单医生:{{Doctor}}</div>
+        <div style="flex: 1;">金额合计:{{ Price_zong }}</div>
+      </div>
+      <div style="display: flex;">
+        <div style="flex: 1;">调配人:{{getdoctors(tableData[0].ExecutionStaff) }}</div>
+        <div style="flex: 1;">取药人:{{getdoctors(tableData[0].ExecutionStaff) }}</div>
+      </div>
+      <!-- <div>
+        <div style="display: flex;">
+          <div style="width: 30%;"></div>
+          <div style="width: 30%;"></div>
+          <div style="width: 30%;"></div>
+          <div style="width: 30%;"></div>
+          <div style="width: 30%;"></div>
+          <div style="width: 30%;"></div>
+        </div>
+      </div> -->
+      <!-- <div class="list_title">
+        <div>患者名称：{{name}}</div>
+        <div>发药状态：{{state}}</div>
+        <div>日期：{{times}}</div>
+      </div> -->
+    </div>
+  </el-dialog>
+</template>
+<script>
+import Vue from "vue";
+import print from "print-js";
+import printutils from "./print.js";
+import{todaynumber} from '@/api/pharmacy'
+const moment = require("moment");
+import { uParseTime } from "@/utils/tools";
+export default {
+  data() {
+    return {
+      visibility: false,
+      tableData: [],
+      isClose:false,
+      name:"",
+      DialysisNo:'',
+      state:null,
+      times:"",
+      start_time:moment(new Date()).add("year", 0).format("YYYY-MM-DD"),
+      org_name: this.$store.getters.xt_user.org.org_name,
+      baseList:[],
+      Doctor:'',
+      patients:{},
+      doctors:[],
+      Price_zong:0
+    };
+  },
+  props: {
+    propForm: {
+      type: Object,
+    },
+  },
+  created(){
+    this.init();
+  },
+  methods: {
+    // isClose() {
+    //   this.visibility = false;
+    // },
+    init(){
+      // let year = new Date().getFullYear();
+      // let month = new Date().getMonth() +1;
+      // let day = new Date().getDate();
+      // let hour = new Date().getHours();
+      // let minute = new Date().getMinutes();
+      // this.times = year + "年" + month + "月" + day + "日" + hour + "时" + minute + "分"
+      // console.log("times:",this.times)
+    },
+
+    hide: function () {
+      this.visibility = false;
+      for (let i = 0; i < this.propForm.goods.length; i++) {
+        for (let key in this.propForm.goods[i]) {
+          if (key != "index") {
+            this.propForm.goods[i][key].isSelected = false;
+          }
+        }
+      }
+    },
+    show: function (val,data,state,times,base,patients,doctors) {
+      this.times = times
+      this.visibility = true;
+      console.log("val",val)
+      this.tableData = val
+      this.Doctor = val[0].Doctor
+      this.name = data.Name
+      this.DialysisNo = data.DialysisNo
+      this.baseList = base
+      this.patients = patients
+      this.doctors = doctors
+      if (state == 1){
+        this.state = "待发药"
+      }
+      if (state == 2){
+        this.state = "已发药"
+      }
+      for(let i in this.tableData){
+        if(this.tableData[i].Price !=''){
+         this.Price_zong = this.Price_zong + this.tableData[i].Price
+        }
+      }
+    },
+
+    comfirm: function (formName) {
+      this.goodInfo = [];
+      this.goodInfoTableData = [];
+      this.$emit("dialog-comfirm", this.getValue());
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.table.setCurrentRow(null);
+    },
+    getValue() {},
+
+    // 打印
+    print() {
+      console.log(this.org_name,'this.org_name')
+      Vue.prototype.printJson = printutils.printJson;
+        const style =
+          '@media print {.list_title{width:940px;border-bottom:1px solid;display:flex;margin:20px auto} .table tr td{border:1px solid black;padding: 5px 0;border-left: none;border-right: none;}}';
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style,
+          scanStyles: false,
+        });
+      // this.printJson({
+      //   title: `
+      //   <div>
+      //   <div style="width: 940px;text-align:center;font-size:16px;font-weight:bold;">${this.org_name} 发药单</div>
+      //   <div style="width: 940px;border-bottom: 1px solid;display: flex;margin: 30px auto;font-size:14px;">
+      //   <div style="width: 310px;padding: 10px 0;">患者名称：${this.name}</div>
+      //   <div style="width: 320px;padding: 10px 0;">发药状态：${this.state}</div>
+      //   <div style="width: 310px;padding: 10px 0;">日期：${this.times}</div>
+      //   </div></div>`, // 打印出来的标题
+      //   data: this.tableData, // 需要打印的数据
+      //   serial: true, // 是否需要打印序列号
+      //   fields: [
+      //     // 需要打印的字段
+
+      //     "Name",
+      //     "SingleDosage",
+      //     "Usage",
+      //     "Frequency",
+      //     "Days",
+      //     "Total",
+      //     "DataSources",
+      //     "Remarks",
+      //   ],
+      //   properties: [
+      //     // 需要打印的字段对应的表头名
+
+      //     {
+      //       field: "Name",
+      //       displayName: "名称",
+      //     },
+      //     {
+      //       field: "SingleDosage",
+      //       displayName: "单次用量",
+      //     },
+      //     {
+      //       field: "Usage",
+      //       displayName: "用法",
+      //     },
+      //     {
+      //       field: "Frequency",
+      //       displayName: "频率",
+      //     },
+      //     {
+      //       field: "Days",
+      //       displayName: "天数",
+      //     },
+      //     {
+      //       field: "Total",
+      //       displayName: "总量",
+      //     },
+      //     {
+      //       field: "DataSources",
+      //       displayName: "数据来源",
+      //     },
+      //     {
+      //       field: "Remarks",
+      //       displayName: "备注",
+      //     },
+      //   ],
+      // });
+    },
+    getSpecaiName(drug_id){
+       var spc =""
+       for(let i=0;i<this.baseList.length;i++){
+         if(drug_id == this.baseList[i].id){
+           spc = this.baseList[i].dose + this.baseList[i].dose_unit +"*"+this.baseList[i].min_number+this.baseList[i].min_unit+"/"+this.baseList[i].max_unit
+         }
+       }
+       return spc
+    },
+    getTime(val) {
+        if(val < 0){
+          return ""
+        }
+        if(val == ""){
+        return ""
+        }else {
+        return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
+        }
+    }, 
+    getdoctors(id){
+      for(let i in this.doctors){
+        if(this.doctors[i].id == id){
+          return this.doctors[i].user_name
+        }
+      }
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+/deep/ .el-dialog{
+  width: 60%;
+}
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+.print_style {
+  position: absolute;
+  right: 65px;
+  top: 50px;
+}
+
+.list_title {
+  width: 940px;
+  border-bottom: 1px solid;
+  display: flex;
+  // margin: 30px auto;
+
+  // div {
+  //   width: 320px;
+  //   padding: 10px 0;
+  // }
+}
+.table tr td{
+ border:1px solid black;
+ padding: 5px 0;
+//  border-left: none;
+//  border-right: none;
+}
+</style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+
+.count {
+  color: #bd2c00;
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+</style>

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyNine.vue

@@ -145,7 +145,7 @@
                     text-align: center;
                     font-weight: 520;
                     font-size: 16px;
-                    padding: 6px 8px;
+                    padding: 0px 8px;
                     line-height: 30px;
                   "
                 >
@@ -1133,7 +1133,7 @@
                             text-align: center;
                             font-weight: 520;
                             font-size: 16px;
-                            padding: 6px 8px;
+                            padding: 0px 8px;
                             line-height: 30px;
                           "
                         >
@@ -1405,7 +1405,7 @@
                             text-align: center;
                             font-weight: 520;
                             font-size: 16px;
-                            padding: 6px 8px;
+                            padding: 0px 8px;
                             line-height: 30px;
                           "
                         >
@@ -1439,14 +1439,14 @@
                         v-for="(advice, advice_index) in doctor_advices"
                         :key="advice_index"
                       >
-                        <td height="32px">
+                        <td height="25px">
                           <span v-if="advice.start_time">
                             {{ getTime(advice.start_time, "{h}:{i}") }}
                           </span>
                           <!-- <span v-else>&nbsp;<br/>&nbsp;</span> -->
                         </td>
                         <td
-                          height="32px"
+                          height="25px"
                           colspan="2"
                           class="advice-name"
                           style="padding-left: 7px"
@@ -1484,7 +1484,7 @@
                       <span v-if="advice.remark.length > 0">({{advice.remark}})</span>
                     </td> -->
                         <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
-                        <td height="32px">
+                        <td height="25px">
                           <span
                             v-if="setAdminUserES(advice.advice_doctor) == ''"
                             >{{ getAdminUser(advice.advice_doctor) }}</span
@@ -1497,7 +1497,7 @@
                             v-else
                           />
                         </td>
-                        <td height="35px">
+                        <td height="25px">
                           <span v-if="setAdminUserES(advice.checker) == ''">{{
                             getAdminUser(advice.checker)
                           }}</span>
@@ -1509,30 +1509,30 @@
                             v-else
                           />
                         </td>
-                        <td height="32px">
+                        <td height="25px">
                           <span
                             v-if="setAdminUserES(advice.execution_staff) == ''"
                             >{{ getAdminUser(advice.execution_staff) }}</span
                           >
                           <img
-                            style="height: 30px"
+                            style="height: 25px"
                             :src="setAdminUserES(advice.execution_staff)"
                             alt=""
                             srcset=""
                             v-else
                           />
                         </td>
-                        <td height="32px">
+                        <td height="25px">
                           <span v-if="advice.execution_time">{{
                             getTime(advice.execution_time, "{h}:{i}")
                           }}</span>
                         </td>
-                        <td height="32px" v-if="org_id == 10223">
+                        <td height="25px" v-if="org_id == 10223">
                           <span v-if="setAdminUserES(advice.checker) == ''">{{
                             getAdminUser(advice.checker)
                           }}</span>
                           <img
-                            style="height: 30px"
+                            style="height: 25px"
                             :src="setAdminUserES(advice.checker)"
                             alt=""
                             srcset=""
@@ -1711,7 +1711,7 @@
                       text-align: center;
                       font-weight: 520;
                       font-size: 16px;
-                      padding: 6px 8px;
+                      padding: 0px 8px;
                       line-height: 30px;
                     "
                   >
@@ -1744,14 +1744,14 @@
                   v-for="(advice, advice_index) in doctor_advices_2"
                   :key="advice_index"
                 >
-                  <td height="32px">
+                  <td height="25px">
                     <span v-if="advice.start_time">
                       {{ getTime(advice.start_time, "{h}:{i}") }}
                     </span>
                     <!-- <span v-else>&nbsp;<br/>&nbsp;</span> -->
                   </td>
                   <td
-                    height="32px"
+                    height="25px"
                     colspan="2"
                     class="advice-name"
                     style="padding-left: 7px"
@@ -1792,53 +1792,53 @@
                   <span v-if="advice.remark.length > 0">({{advice.remark}})</span>
                 </td> -->
                   <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
-                  <td height="32px">
+                  <td height="25px">
                     <span v-if="setAdminUserES(advice.advice_doctor) == ''">{{
                       getAdminUser(advice.advice_doctor)
                     }}</span>
                     <img
-                      style="height: 30px"
+                      style="height: 25px"
                       :src="setAdminUserES(advice.advice_doctor)"
                       alt=""
                       srcset=""
                       v-else
                     />
                   </td>
-                  <td height="35px">
+                  <td height="25px">
                     <span v-if="setAdminUserES(advice.checker) == ''">{{
                       getAdminUser(advice.checker)
                     }}</span>
                     <img
-                      style="height: 20px"
+                      style="height: 25px"
                       :src="setAdminUserES(advice.checker)"
                       alt=""
                       srcset=""
                       v-else
                     />
                   </td>
-                  <td height="32px">
+                  <td height="25px">
                     <span v-if="setAdminUserES(advice.execution_staff) == ''">{{
                       getAdminUser(advice.execution_staff)
                     }}</span>
                     <img
-                      style="height: 30px"
+                      style="height: 25px"
                       :src="setAdminUserES(advice.execution_staff)"
                       alt=""
                       srcset=""
                       v-else
                     />
                   </td>
-                  <td height="32px">
+                  <td height="25px">
                     <span v-if="advice.execution_time">{{
                       getTime(advice.execution_time, "{h}:{i}")
                     }}</span>
                   </td>
-                  <td height="32px" v-if="org_id == 10223">
+                  <td height="25px" v-if="org_id == 10223">
                     <span v-if="setAdminUserES(advice.checker) == ''">{{
                       getAdminUser(advice.checker)
                     }}</span>
                     <img
-                      style="height: 30px"
+                      style="height: 25px"
                       :src="setAdminUserES(advice.checker)"
                       alt=""
                       srcset=""
@@ -3424,7 +3424,7 @@ export default {
   border: 1px solid;
   text-align: center;
   font-size: 14px;
-  padding: 6px 5px;
+  padding: 0px 5px;
   line-height: 16px;
 }
 

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

@@ -1227,6 +1227,7 @@
             <td>医嘱</td>
             <td width='80'>执行时间</td>
             <td width='80'>执行者签名</td>
+            <td width='80'>核对人签名</td>
           </tr>
           <tr v-for="(advice, advice_index) in tableAdvice" :key="advice_index" >
             <td>{{ getTime(advice.start_time, "{y}-{m}-{d}") }}</td>
@@ -1259,6 +1260,14 @@
                 <img style="height:30px;" :src="setAdminUserES(advice.execution_staff)" alt srcset />
               </span>
             </td>
+            <td>
+              <span v-if="setAdminUserES(advice.checker) == ''">
+                {{ getAdminUser(advice.checker) }}
+              </span>
+              <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
+                <img style="height:30px;" :src="setAdminUserES(advice.checker)" alt srcset />
+              </span>
+            </td>
           </tr>
         </table>
       </div>

src/xt_pages/hospitalStation/invoiceTemplate/printfour.vue

@@ -24,7 +24,7 @@
           <div style="width: 300px;"></div>
       </div>
       <div style="display:flex;margin-top: 30px;">
-        <div style="width: 150px;">床位费 {{ list.bedCostTotal ? list.bedCostTotal :'0' }}</div>
+        <div style="width: 150px;">床位费 {{ list.bedCostTotal}}</div>
         <div style="width: 150px;margin:0 30px;">治疗费 {{ list.treatCostTotal ? list.treatCostTotal :'0'}}</div>
         <div style="width: 150px;margin:0 30px;">西药费 {{ list.westernMedicineCostTotal }}</div>
         <div style="width: 150px;margin:0 30px;">
@@ -55,7 +55,7 @@
           </div>
           <div style="width: 230px;margin-left: 20px;">
             自费费用:
-            {{ list.order.psn_cash_pay?list.order.psn_cash_pay:'0' }}
+            {{ list.order.fulamt_ownpay_amt?list.order.fulamt_ownpay_amt:'0' }}
           </div>
           <div style="width: 230px;margin-left: 20px;">医院优惠: 0</div>
         </div>
@@ -180,7 +180,7 @@ export default {
         }
         return "";
       },
-      
+
       getDay(dateString1,dateString2){
         var  startDate = Date.parse(dateString1);
         var  endDate = Date.parse(dateString2);

src/xt_pages/outpatientCharges/allListPrint.vue

@@ -13,7 +13,7 @@
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne  v-if="org_id != 10215 && org_id !=0 && org_id !=9671&&org_id !=9675&& org_id !=10515" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printOne>
+      <printOne  v-if="org_id != 10215  && org_id !=9671&&org_id !=9675&& org_id !=10515" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printOne>
       <summary-print v-if="org_id == 10215|| org_id ==9671 ||org_id ==9675" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></summary-print>
       <printTwo v-if="org_id==10515 || org_id==0" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printTwo>
 <!--      <list-print-two :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></list-print-two>-->
@@ -58,7 +58,8 @@
     methods: {
       getTimes(time) {
         return uParseTime(time, '{y}-{m}-{d} {h}:{i}')
-      }, getInfo(order_id) {
+      }, 
+      getInfo(order_id) {
         let params = {
           id: order_id
         }
@@ -79,13 +80,13 @@
             this.order['laboratoryCostTotal'] = response.data.data.laboratoryCostTotal
             this.order['treatCostTotal'] = response.data.data.treatCostTotal
 
-            console.log("~~~~~")
+            console.log("~~~~~",response.data.data)
             this.patient = response.data.data.patient
             this.admin = response.data.data.admin_info
             this.his_hospital = response.data.data.his_hospital
             var order_info = response.data.data.order_info
 
-            if(this.$store.getters.xt_user.org_id == 10215 || this.$store.getters.xt_user.org_id == 0){
+            if(this.$store.getters.xt_user.org_id == 10215){
               //获取所有项目类型进行去重
               let med_chrgitm_types = []
               for (let i = 0; i < order_info.length; i++) {
@@ -111,14 +112,14 @@
                     tempDetails.push(order_info[b])
                   }
                 }
-                console.log("～～～～～～～～")
-                console.log(tempDetails)
+                // console.log("～～～～～～～～")
+                // console.log(tempDetails)
 
-                console.log("1111="+tempDetails)
+                // console.log("1111="+tempDetails)
                 obj.details = this.setNewData(tempDetails)
-                console.log("22222="+obj.details)
+                // console.log("22222="+obj.details)
                 this.list =  this.list.concat(obj.details)
-                console.log("222233332="+ this.list)
+                console.log("222233332=",this.list)
               }
               let newobj = {}
               newobj['total'] = this.order.medfee_sumamt
@@ -127,7 +128,43 @@
             }else{
               //获取所有项目类型进行去重
               let med_chrgitm_types = []
+              let chrgitm_lvs = []
+              let advice = []
+              let good = []
+              let project = []
               for (let i = 0; i < order_info.length; i++) {
+                if(order_info[i].advice.advice_name !=''){
+                  const adv={
+                    advice_name:order_info[i].advice.advice_name,
+                    // good_name:order_info[i].project.good_info.good_name,
+                    // project_name:order_info[i].project.project.project_name,
+                    chrgitm_lv:order_info[i].chrgitm_lv,
+                  }
+                  advice.push(adv)
+                }
+               
+                if(order_info[i].project.good_info.good_name !=''){
+                  const god={
+                    // advice_name:order_info[i].advice.advice_name,
+                    good_name:order_info[i].project.good_info.good_name,
+                    // project_name:order_info[i].project.project.project_name,
+                    chrgitm_lv:order_info[i].chrgitm_lv,
+                  }
+                  good.push(god)
+                }
+
+                if(order_info[i].project.project.project_name !=''){
+                  const pro={
+                    // advice_name:order_info[i].advice.advice_name,
+                    // good_name:order_info[i].project.good_info.good_name,
+                    project_name:order_info[i].project.project.project_name,
+                    chrgitm_lv:order_info[i].chrgitm_lv,
+                  }
+                  project.push(pro)
+                }
+
+                // chrgitm_lvs.push(arr)
+                // chrgitm_lvs.push(order_info[i].chrgitm_lv)
                 med_chrgitm_types.push(order_info[i].med_chrgitm_type)
               }
               const obj = {}
@@ -153,13 +190,68 @@
                   total: obj.total,
                   is_total: 1,
                 })
-                console.log("23323223323232332323322332",obj.details)
+                // console.log("23323223323232332323322332",obj.details)
                 this.list =  this.list.concat(obj.details)
+                // console.log("23323223323232332323322332",this.list)
+              }
+              for(let i=0;i<advice.length;i++){
+                for(let j=i+1;j<advice.length;j++){
+                  if(advice[i].advice_name == advice[j].advice_name){
+                    advice.splice(j,1)
+                    j--
+                  }
+                }
               }
+              for(let i=0;i<good.length;i++){
+                for(let j=i+1;j<good.length;j++){
+                  if(good[i].good_name == good[j].good_name){
+                    good.splice(j,1)
+                    j--
+                  }
+                }
+              }
+              for(let i=0;i<project.length;i++){
+                for(let j=i+1;j<project.length;j++){
+                  if(project[i].project_name == project[j].project_name){
+                    project.splice(j,1)
+                    j--
+                  }
+                }
+              }
+
+              chrgitm_lvs = [...advice,...good,...project]
+              
+              console.log('yyyyyyyyyyyy',chrgitm_lvs);
+              for(let i in this.list){
+                for(let j in chrgitm_lvs){
+                  if(this.list[i].is_total ==2){
+                    if(this.list[i].name == chrgitm_lvs[j].advice_name ||
+                        this.list[i].name == chrgitm_lvs[j].good_name ||
+                        this.list[i].name == chrgitm_lvs[j].project_name
+                    ){
+                      this.list[i]['chrgitm_lv'] = chrgitm_lvs[j].chrgitm_lv
+                    }
+                  }
+                }
+              }
+              console.log('tttttttttttt',this.list);
             }
           }
         })
-      }, getTotal:function(items){
+        
+      }, 
+      getquchong(arr){
+        for(let i=0;i<arr.length;i++){
+          for(let j=i+1;j<arr.length;j++){
+            if(arr[i] == arr[j]){
+              arr.splice(j,1)
+              j--
+            }
+          }
+        }
+        return arr
+      },
+      getTotal:function(items){
         let total = 0
         for(let i = 0; i < items.length; i++){
           total = Number(total) + Number((parseFloat(items[i].count) * parseFloat(items[i].price)).toFixed(2))

src/xt_pages/outpatientCharges/allListTemplate/printOne.vue

@@ -16,8 +16,9 @@
       <table class="allListTable" border="1">
         <tr>
           <td style="width:10%">类别</td>
-          <td style="width:50%">项目名称</td>
+          <td style="width:40%">项目名称</td>
           <td style="width:10%">规格</td>
+          <td style="width:10%" v-if="org_id==10489">报销等级</td>
           <td style="width:10%">单价(元)</td>
           <td style="width:10%">数量</td>
           <td style="width:10%">金额(元)</td>
@@ -25,8 +26,9 @@
         <template v-for='item in list.slice(index * 13,(index * 13) + pageArr[index])'>
           <tr v-if="item.is_total == 2">
             <td style="width:10%">{{ item.med_chrgitm_type }}</td>
-            <td style="width:50%">{{ item.name }}</td>
+            <td style="width:40%">{{ item.name }}</td>
             <td style="width:10%">{{ item.spec }}</td>
+            <td style="width:10%" v-if="org_id==10489">{{ getMedicineInsuranceType(item.chrgitm_lv) }}</td>
             <td style="width:10%">{{ (item.price).toFixed(2) }}</td>
             <td style="width:10%">{{ item.count }}{{ item.unit }}</td>
             <td style="width:10%">{{ (item.price * item.count).toFixed(2) }}</td>
@@ -81,7 +83,8 @@ export default {
   data() {
     return {
       page: 1,
-      pageArr: []
+      pageArr: [],
+      org_id:'',
     }
   },
   methods: {
@@ -111,6 +114,7 @@ export default {
 
     },
     getPage() {
+      console.log('kkkkkk',this.list);
       if (this.list.length <= 13) {
         this.page = 1
         this.pageArr.push(this.list.length)
@@ -124,9 +128,28 @@ export default {
           this.pageArr.push(num)
         }
       }
-    }
+    },
+    getMedicineInsuranceType(type) {
+      switch (type) {
+        case "01":
+          return '甲类'
+          break
+        case "02":
+          return '乙类'
+
+          break
+        case "03":
+          return '自费'
+          break
+
+      }
+
+    },
 
   },
+  created(){
+    this.org_id = this.$store.getters.xt_user.org_id
+  },
   watch: {
     list: {
       handler(newVal) {

src/xt_pages/outpatientCharges/listPrint.vue

@@ -577,7 +577,7 @@
 
       printThisPage() {
         if(this.org_id != 10106){
-          if(this.org_id == 10215 || this.org_id == 9675 || this.org_id == 0 || this.org_id == 10485){
+          if(this.org_id == 10215 || this.org_id == 9675  || this.org_id == 10485){
             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;} .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;} .allListTable{border: none;width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;} .allListTable tr{page-break-inside:avoid;} .allListTable tr td {padding: 0 5px;border: 1px solid #000;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
             printJS({

src/xt_pages/outpatientCharges/listTemplate/printOne.vue

@@ -1,6 +1,6 @@
 <template>
     <div id="list-print" class="list-print">
-        <div v-for='(i,index) in pageArr.length' :key="index">
+        <div v-for='(i,index) in pageArr.length' :key="index" style="page-break-after: always;">
         <div class="listTitle">{{$store.getters.xt_user.org.org_name}}费用清单</div>
         <div class="listInfo">
 
@@ -29,7 +29,7 @@
 
 
             </tr>
-            <tr v-for="item in list.slice(index * 15,(index * 15) + pageArr[index])">
+            <tr v-for="item in list.slice(index * 16,(index * 16) + pageArr[index])">
                 <td style="width:15%">{{item.p_time}}</td>
                 <td style="width:10%">{{item.med_chrgitm_type}}</td>
                 <td style="width:10%">{{item.code}}</td>
@@ -39,7 +39,6 @@
                 <td style="width:6%">{{item.count}}{{item.unit}}</td>
                 <td style="width:10%">{{(item.price * item.count).toFixed(2)}}</td>
               <td v-if="$store.getters.xt_user.org_id == 10318 || $store.getters.xt_user.org_id == 0 " style="width:10%">{{getMedicineInsuranceKind(item.type)}}</td>
-
             </tr>
         </table>
         <div class="tableBottom">
@@ -125,6 +124,7 @@
         return uParseTime(time, '{y}-{m}-{d}')
       },
       getPage(){
+
         if(this.list.length <= 16){
             this.page = 1
             this.pageArr.push(this.list.length)
@@ -138,6 +138,8 @@
                 this.pageArr.push(num)
             }
         }
+        console.log('this.list',this.list);
+        console.log('this.pageArr',this.pageArr);
       }
 
     },

src/xt_pages/outpatientDoctorStation/template/printFour.vue

@@ -124,7 +124,7 @@
               
           </div>
           <div class="doctorBox">
-            <p v-if="org_id!=10598 && org_id!=0 ">
+            <p v-if="org_id!=10598">
             医师：
             <span
                 style="width: 100px; display: inline-block"
@@ -146,14 +146,14 @@
                 v-else
               />
             </p>
-            <p v-if="org_id==10598 || org_id==0">
+            <p v-if="org_id==10598">
             医师：
-            <!-- <span
+              <span
                 style="width: 100px; display: inline-block"
                 v-if="item.creator == ''"
               >
                 {{ item.doctor ? item.doctor : "" }}
-              </span> -->
+              </span>
               <!-- <span
                 style="width: 100px; display: inline-block"
                 v-else-if="doc_name != ''"
@@ -165,7 +165,7 @@
                 :src="setAdminUserES(item.creator,item.doctor)"
                 alt=""
                 srcset=""
-                
+                v-else
               />
             </p>
               <p>日期：{{getTime(item.ctime)?getTime(item.ctime):""}}</p>