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

src/xt_pages/dialysis/template/DialysisPrintOrderSeventyTwo.vue

@@ -67,25 +67,25 @@
           <div class="inline_block">
             病区：
             <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121||org_id == 10138||org_id == 10414 ||org_id == 10447 || org_id == 0 || org_id ==10460 || org_id ==10567">{{
+              <!-- <span v-if="org_id == 10121||org_id == 10138||org_id == 10414 ||org_id == 10447  || org_id ==10460 || org_id ==10567">{{
                 patientInfo.DialysisSchedule.device_zone.name
                   ? patientInfo.DialysisSchedule.device_zone.name
                   : ""
               }}</span>
-              <span v-else>{{ "/" }}</span>
+              <span v-else>{{ "/" }}</span> -->
             </div>
           </div>
           <div class="inline_block" >
             床号：
             <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675 || org_id == 0 || org_id ==10460 || org_id ==10515 || org_id == 10567">{{
+              <!-- <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675 || org_id == 0 || org_id ==10460 || org_id ==10515 || org_id == 10567">{{
                 dialysisOrder &&
                 dialysisOrder.DeviceNumber &&
                 dialysisOrder.DeviceNumber.number.length > 0
                   ? dialysisOrder.DeviceNumber.number
                   : patientInfo.DialysisSchedule.device_number.number
               }}</span>
-              <span v-else>{{ "/" }}</span>
+              <span v-else>{{ "/" }}</span> -->
             </div>
           </div>
           <div class="inline_block">
@@ -1087,7 +1087,7 @@
                   <div style="width: 100%;text-align: center;">
                     <div style="border-bottom: 1px solid black;">治疗记录</div>
                     <div style="display: flex;">
-                      <div style="flex: 0.8;border-right: 1px solid black;">时间</div>
+                      <div style="flex: 0.8;border-right: 1px solid black;"><span>时间</span></div>
                       <div style="flex: 0.8;border-right: 1px solid black;">血压<br/>(mmHg)</div>
                       <div style="flex: 0.9;border-right: 1px solid black;">脉搏<br/>(次/分)</div>
                       <div style="flex: 0.9;border-right: 1px solid black;">血流量<br />(ml/min)</div>
@@ -1096,8 +1096,7 @@
                       <div style="flex: 0.9;border-right: 1px solid black;">钠浓度<br/>(mmol/L)</div>
                       <div style="flex: 0.9;border-right: 1px solid black;">超滤量<br/>(ml)</div>
                       <div style="flex: 1;border-right: 1px solid black;" v-if="prescription.mode_id == 2">置换液速度<br/>(ml/h)</div>
-                      <div style="flex: 1.2;border-right: 1px solid black;" v-if="prescription.anticoagulant_name == 7 && 
-                        prescription.anticoagulant_name != ''">肝素剩余量度(ml)
+                      <div style="flex: 1.2;border-right: 1px solid black;" v-if="prescription.anticoagulant_name=='低分子肝素钠'">肝素剩余量度(ml)
                       </div>
                       <div style="flex: 2;">病情变化及处理</div>
                     </div>
@@ -1151,9 +1150,10 @@
                     <div style="flex: 1;border-right: 1px solid black;" v-if="prescription.mode_id == 2">
                       {{ monitor.replacement_speed ? monitor.replacement_speed : "" }}
                     </div>
-                    <div style="flex: 1.2;border-right: 1px solid black;" v-if="prescription.anticoagulant == 7 && prescription.anticoagulant_name != ''">
+                    <div style="flex: 1.2;border-right: 1px solid black;" v-if="prescription.anticoagulant_name=='低分子肝素钠'">
 
                     </div>
+                    <!-- v-if="prescription.anticoagulant == 7 && prescription.anticoagulant_name != ''" -->
                     <div style="flex: 2;">
                       <div style="min-height: 35px;
                           line-height: 35px; overflow: hidden; "

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1813,7 +1813,7 @@ export default {
             this.$refs.register9504.hide()
             this.loadingone = false
 
-            // this.CheckHISPatient()
+            this.CheckHISPatient()
 
           }
         })
@@ -1846,7 +1846,7 @@ export default {
                   that.changeRadio(1)
                   that.$refs.register9504.hide()
                   that.$message({ message: '挂号成功', type: 'success' })
-                  // that.CheckHISPatient()
+                  that.CheckHISPatient()
 
                 }
               }
@@ -1877,7 +1877,7 @@ export default {
             this.$refs.register.hide()
             this.loadingone = false
 
-            // this.CheckHISPatient(this.record_date,this.patientInfo.id)
+            this.CheckHISPatient(this.record_date,this.patientInfo.id)
 
           }
         })
@@ -3520,7 +3520,6 @@ export default {
         }
         var ids_str = ids.join(',')
         this.temp_ids = ids_str
-        this.newLoading = true
         var that = this
         let form = {}
         form['id'] = this.patientInfo.id
@@ -3574,10 +3573,8 @@ export default {
                   type: 'warning'
                 }).then(() => {
                   that.changeRadioAndPatient(1)
-                  that.newLoading = false
                 }).catch(() => {
                   that.changeRadioAndPatient(1)
-                  that.newLoading = false
                 })
               } else {
                 that.$message({ message: '上传成功', type: 'success', duration: 5000 })

src/xt_pages/outpatientCharges/summary.vue

@@ -145,7 +145,8 @@
           <!--          </el-button-->
           <!--          >-->
 
-                     <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>
+<!--          <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>-->
+          <el-button size="small" type="primary" @click="accounts_click = !accounts_click">门诊结账</el-button>
           <!-- <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
           <!-- <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
           <!--           <el-button size="small" type="primary" @click="export_detail_six">诊疗下载</el-button>-->
@@ -186,6 +187,35 @@
           align="right"
         ></el-date-picker>
       </div>
+
+      <div style="margin-bottom: 10px;">
+        <el-date-picker
+          size="small"
+          v-model="pay_time"
+          prefix-icon="el-icon-date"
+          :editable="false"
+          :clearable="false"
+          style="width:250px; "
+          type="datetime"
+          placeholder="选择缴费日期"
+          format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          align="right"
+        ></el-date-picker>
+      </div>
+
+      <div style="margin-bottom: 10px;">
+        <el-select size="small" v-model="staff" placeholder="请选择缴费人员"
+                   style="width:150px;margin-left:10px;" >
+          <el-option
+            v-for="item,index in admins"
+            :key="index"
+            :label="item.user_name"
+            :value="item.user_name">
+          </el-option>
+        </el-select>
+      </div>
+
       <el-table
         :data="tableData"
         border
@@ -380,8 +410,7 @@
               type="primary"
               @click="invoicePrint(scope.row)"
             >打印发票
-            </el-button
-            >
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -497,7 +526,111 @@
         :paramsObj="settlementObj"
       ></settlement-print>
     </el-dialog>
+    <!-- 门诊结账 -->
+    <el-dialog
+      class="centerDialog"
+      width="70%"
+      title="打印"
+      :visible.sync="accounts_click"
+    >
+      <div>
+        <div id="accounts_print">
+          <div style="text-align: center;font-size: 18px;margin-bottom:20px ;">门诊结账</div>
+          <div style="margin: auto;">
+            <div style="margin-bottom: 20px;">
+              <table class="table" border="1" style="border-collapse: collapse;text-align: center;width: 100%;">
+                <tr>
+                  <td>起始日期:</td>
+                  <td>{{start_time}}</td>
+                  <td>终止日期:</td>
+                  <td>{{end_time}}</td>
+                  <td>缴款日期:</td>
+                  <td>{{pay_time}}</td>
+                </tr>
+                <tr>
+                  <td>起始单号:</td>
+                  <td>{{tableData2[0].number}}</td>
+                  <td>终止单号:</td>
+                  <td>{{tableData2[tableData2.length-1].number}}</td>
+                  <td>缴款人员:</td>
+                  <td>{{staff}}</td>
+                </tr>
+                <tr>
+                  <td>收费张数:</td>
+                  <td>{{tableData2.length}}</td>
+                  <td>作废张数:</td>
+                  <td>0</td>
+                  <td>退费张数:</td>
+                  <td>0</td>
+                </tr>
+                <tr>
+                  <td>收费金额:</td>
+                  <td>{{getTotal()}}</td>
+                  <td>作废金额:</td>
+                  <td>0</td>
+                  <td>退费金额:</td>
+                  <td>0</td>
+                </tr>
+                <tr>
+                  <td>合计张数:</td>
+                  <td>{{tableData2.length}}</td>
+                  <td>合计金额:</td>
+                  <td colspan="3">{{getTotal()}}</td>
+                </tr>
+              </table>
+            </div>
+            <div style="margin-bottom: 20px;">
+              <table class="table" border="1" style="border-collapse: collapse;text-align: center;width: 50%;">
+                <tr>
+                  <td>医保</td>
+                  <td>微信</td>
+                  <td>现金</td>
+                  <td>门诊预存</td>
+                  <td>合计</td>
+                </tr>
+                <tr>
+                  <td>{{getYibao()}}</td>
+                  <td>0</td>
+                  <td>{{getPsnCash()}}</td>
+                  <td>0</td>
+                  <td>{{getTotal()}}</td>
+                </tr>
+              </table>
+            </div>
+            <div>
+              <table class="table" border="1" style="border-collapse: collapse;text-align: center;width: 100%;">
+                <tr>
+                  <td>单号</td>
+                  <td>卡号</td>
+                  <td>姓名</td>
+                  <td>年龄</td>
+                  <td>性别</td>
+                  <td>收费金额</td>
+                  <td>收费时间</td>
+                  <td>类型</td>
+                </tr>
+                <tr v-for="item in tableData2">
+                  <td>{{item.number}}</td>
+                  <td>{{item.certno}}</td>
+                  <td>{{item.psn_name}}</td>
+                  <td>{{item.age}}</td>
+                  <td v-if="item.gend == 1">男</td>
+                  <td v-if="item.gend != 1">女</td>
+                  <td>{{item.medfee_sumamt}}</td>
+                  <td>{{item.setl_time}}</td>
+                  <td></td>
+                </tr>
+              </table>
+            </div>
+          </div>
 
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="accounts_click = false">取 消</el-button>
+        <el-button type="primary" @click="accounts_sum">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -506,6 +639,7 @@
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { getDoctorList, getExportConsumeDetailList, getHisOrderList, Refund } from '@/api/his/his'
 // import NewStatementPrint from './newStatementPrint'
+import { adminMainView} from "@/api/role/admin";
 import NewStatementPrint from './statementPrint.vue'
 import listPrint from './listPrint'
 import allListPrint from './allListPrint'
@@ -547,6 +681,8 @@ export default {
   },
   data() {
     return {
+      staff:"",
+      admins:[],
       orderObj: {},
       batchOrderObj: {},
       med_options: [
@@ -567,6 +703,7 @@ export default {
         { path: false, name: '项目消费明细汇总' }
       ],
       tableData: [],
+      tableData2:[],
       selecting_schs: [],
       limit: 10,
       page: 1,
@@ -576,6 +713,7 @@ export default {
       medTypeVal: 0,
       start_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
       end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
+      pay_time:"",
       total: '',
       doctors: [],
       sort_type: 1,
@@ -591,7 +729,8 @@ export default {
       paramsObj: {},
       invoiceParams: {},
       settlementVisible: false,
-      settlementObj: {}
+      settlementObj: {},
+      accounts_click:false,
     }
   },
 
@@ -633,9 +772,60 @@ export default {
     this.fetchAllAdminUsers()
     this.getDoctorList()
     this.getHisOrderList()
+    this.getAllstaff()
   },
 
   methods: {
+    getPsnCash(){
+      let result = 0
+      for(let i = 0;i < this.tableData2.length; i++){
+        result = result + this.tableData2[i].psn_cash_pay
+      }
+      return result.toFixed(2)
+    },
+    getYibao(){
+      let result = 0
+      for(let i = 0;i < this.tableData2.length; i++){
+        result = result + this.tableData2[i].fund_pay_sumamt
+      }
+      return result.toFixed(2)
+    },
+    getTotal(){
+     let result = 0
+      for(let i = 0;i < this.tableData2.length; i++){
+        result = result + this.tableData2[i].medfee_sumamt
+      }
+      return result.toFixed(2)
+    },
+    getAllstaff(){
+      adminMainView()
+        .then(rs => {
+
+          var resp = rs.data;
+          if (resp.state === 1) {
+            var adminData = resp.data.admins
+            this.admins.push(...adminData);
+          } else {
+            this.$message.error(resp.msg);
+          }
+        })
+        .catch(err => {
+          this.$message.error(err);
+        });
+
+
+    },
+    // 门诊结账
+    accounts_sum(){
+      const style = '@media print {#accounts_print{font-size:15px} .table tr td{padding:5px 0;}}'
+      printJS({
+        printable: "accounts_print",
+        type: "html",
+        style: style,
+        scanStyles: false
+      });
+
+    },
     handleSelectionChange(val) {
       this.selecting_schs = val
     },
@@ -3682,6 +3872,7 @@ export default {
           return false
         } else {
           this.tableData = response.data.data.order
+          this.tableData2 =  response.data.data.order2
           this.total = response.data.data.total
         }
       })
@@ -3737,3 +3928,10 @@ export default {
   }
 }
 </script>
+<style lang="scss">
+  .table{
+    tr td{
+      padding:5px 0;
+    }
+  }
+</style>

src/xt_pages/outpatientDoctorStation/checkTemplate/printThree.vue

@@ -261,7 +261,7 @@ export default {
           console.log("列表", this.projectPrint);
           this.total = total.toFixed(2);
           this.pre_time = this.advicePrint[0].pre_time;
-          this.doctor = this.advicePrint[0].doctor;
+          this.doctor = this.advicePrint[0].creator;
 
           this.singleProjectPrint = data2;
 

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -277,7 +277,7 @@
                                   <el-input style="width:50%;" @input="searchAction"
                                             @keyup.enter.native='searchAction'
                                             v-model.trim="search_keyword"
-                                            placeholder="请输入药品名字"></el-input>
+                                            placeholder="请输入药品名字" :clearable="true"></el-input>
                                   <el-select style="margin-left:5px;width:50%;" v-model="value" placeholder=""
                                              @change="changeKind">
                                       <el-option
@@ -393,7 +393,7 @@
                                   <el-input style="width:50%;" @input="searchProjectAction"
                                             @keyup.enter.native='searchProjectAction'
                                             v-model.trim="search_project_keyword"
-                                            placeholder="请输入项目名称"></el-input>
+                                            placeholder="请输入项目名称" :clearable="true"></el-input>
 
                                   <el-select style="float: right;width: 49%;" v-model="value" placeholder=""
                                              @change="changeClass">
@@ -1752,23 +1752,34 @@ export default {
       }
       this.$refs.additionalCharges.hide()
 
-    }, searchProjectAction() {
+    }, 
+    // 项目
+    searchProjectAction() {
       console.log('~~~~',this.search_project_keyword)
-      console.log('5555',this.tabProject)
-      console.log('6666',this.allProject)
-      // console.log('4444',this.tabProject[1].first_letter.indexOf(this.search_project_keyword) != -1)
+      const tabProjects = this.allProject
+      console.log('4444',tabProjects)
       if (this.search_project_keyword.length == 0) {
         this.tabProject = this.allProject
       } else {
         let arr = []
-        for (let i = 0; i < this.tabProject.length; i++) {
+
+        for (let i = 0; i < tabProjects.length; i++) {
             // console.log('4444',this.tabProject[i].first_letter.indexOf(this.search_project_keyword) != -1)
-            if (this.tabProject[i].project_name.indexOf(this.search_project_keyword) != -1 ||
-            this.tabProject[i].first_letter.indexOf(this.search_project_keyword) !=-1) {
-              arr = arr.concat(this.tabProject[i])
+            if (tabProjects[i].project_name.indexOf(this.search_project_keyword) != -1 ||
+                tabProjects[i].first_letter.indexOf(this.search_project_keyword) !=-1) {
+              arr = arr.concat(tabProjects[i])
             }
 
         }
+
+        // for (let i = 0; i < this.tabProject.length; i++) {
+        //     // console.log('4444',this.tabProject[i].first_letter.indexOf(this.search_project_keyword) != -1)
+        //     if (this.tabProject[i].project_name.indexOf(this.search_project_keyword) != -1 ||
+        //     this.tabProject[i].first_letter.indexOf(this.search_project_keyword) !=-1) {
+        //       arr = arr.concat(this.tabProject[i])
+        //     }
+
+        // }
         this.tabProject = arr
         console.log('kkkk',this.tabProject);
       }
@@ -1788,22 +1799,34 @@ export default {
       }
 
     },
+    // 药品
     searchAction() {
+      const drug2 =this.allDrugs
+      console.log('this.allDrugs',drug2);
       if (this.search_keyword.length == 0) {
         this.drugs = this.allDrugs
       } else {
+       
         let arr = []
-        for (let i = 0; i < this.drugs.length; i++) {
-          if (this.drugs[i].drug_name.indexOf(this.search_keyword) != -1 ||
-           this.drugs[i].wubi.indexOf(this.search_keyword) != -1 ||
-           this.drugs[i].pinyin.indexOf(this.search_keyword) != -1 ||
-           this.drugs[i].first_letter.indexOf(this.search_keyword) != -1
+        for (let i = 0; i < drug2.length; i++) {
+          if (drug2[i].drug_name.indexOf(this.search_keyword) != -1 ||
+            drug2[i].wubi.indexOf(this.search_keyword) != -1 ||
+            drug2[i].pinyin.indexOf(this.search_keyword) != -1 ||
+            drug2[i].first_letter.indexOf(this.search_keyword) != -1
            ) {
-            arr = arr.concat(this.drugs[i])
+            arr = arr.concat(drug2[i])
           }
         }
+        // for (let i = 0; i < this.drugs.length; i++) {
+        //   if (this.drugs[i].drug_name.indexOf(this.search_keyword) != -1 ||
+        //    this.drugs[i].wubi.indexOf(this.search_keyword) != -1 ||
+        //    this.drugs[i].pinyin.indexOf(this.search_keyword) != -1 ||
+        //    this.drugs[i].first_letter.indexOf(this.search_keyword) != -1
+        //    ) {
+        //     arr = arr.concat(this.drugs[i])
+        //   }
+        // }
         this.drugs = arr
-
       }
 
     },
@@ -3877,6 +3900,8 @@ export default {
       getHisProject().then(response => {
         if (response.data.state == 1) {
           var project = response.data.data.project
+          // this.tabProject = project
+          console.log('zzzzzzzzzz',project);
           for (let i = 0; i < project.length; i++) {
             let obj = {
               id: project[i].id,
@@ -3899,7 +3924,6 @@ export default {
               bbx01:project[i].bbx01,
               zuobiao_stock_num:0,
               number:""
-
             }
             this.tabProject.push(obj)
           }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -6,7 +6,6 @@
     <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
       <div class="mainLeft">
 
-
         <el-date-picker
           v-model="record_date"
           prefix-icon="el-icon-date"
@@ -313,7 +312,17 @@
           <checkPrint ref="checkPrint" v-if="selecting_schs3.length > 0" :paramsObj='paramsObj3'
                       :newHisPatient="hisPatientInfo"></checkPrint>
         </div>
-
+        <template>
+          <el-button
+            style="float:right;"
+            size="small"
+            icon="el-icon-printer"
+            @click="printThisPage"
+            type="primary"
+          >打印
+          </el-button
+          >
+        </template>
       </el-dialog>
       <span slot="footer" class="dialog-footer">
         <el-button @click="centerDialogVisible = false">取 消</el-button>
@@ -510,7 +519,6 @@
           </div>
         </div>
       </div>
-
       <span slot="footer" class="dialog-footer">
         <el-button @click="startVisibility = false">取 消</el-button>
       </span>
@@ -733,7 +741,9 @@ export default {
       // })
     },
     changeOther(patient_id) {
-      this.radio = 2
+      if(this.radio != 0) {
+        this.radio = 2
+      }
       let params = {
         'record_date': this.record_date,
         'type': this.radio,
@@ -981,7 +991,7 @@ export default {
 
           //排班
           for (let i = 0; i < response.data.data.list_two.length; i++) {
-            console.log('hahhahahahahahahah', response.data.data.list_two)
+            // console.log('hahhahahahahahahah', response.data.data.list_two)
             //未就诊
             if (response.data.data.list_two[i].prescription.length == 0 && response.data.data.list_two[i].his_patient.id == 0) {
               let obj = {

src/xt_pages/outpatientDoctorStation/template/prinSeven.vue

@@ -136,7 +136,7 @@
                         &nbsp;&nbsp;<span>
                           {{ it.execution_frequency }}&nbsp;{{
                             it.delivery_way
-                          }}&nbsp;</span>&nbsp;&nbsp;<span>{{ it.advice_desc}}</span>
+                          }}&nbsp;共{{ it.day}}天</span>&nbsp;&nbsp;<span>{{ it.advice_desc}}</span>
                       </template>
                     </div>
 
@@ -195,7 +195,7 @@
                         &nbsp;&nbsp;<span>
                           {{ it.execution_frequency }}&nbsp;{{
                             it.delivery_way
-                          }}&nbsp;</span>&nbsp;&nbsp;<span>{{ it.advice_desc}}</span>
+                          }}&nbsp;共{{ it.day}}天</span><span>{{ it.advice_desc}} </span>
                       </template>
                     </div>
 
@@ -222,7 +222,7 @@
                       </div> -->
                   </template>
                 </div>
-                
+
                 <!-------------------------------------------------------------------------->
                 <!-- <template>
                   <div v-for="(ite,indexs) in item.arr" :key="indexs">
@@ -279,7 +279,7 @@
                         <div style="display: inline-block;position: absolute;left:85%;top:0px;margin-left: 5px;" v-if="item.arr.length>0&&item.arr[0][0].groupno==it.groupno">
                           &nbsp;共{{ it.single_dose }}{{ it.single_dose_unit }}
                         </div>
-                  
+
                     </template>
                   </div>
 
@@ -558,20 +558,17 @@ export default{
     },
     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);
+          console.log("response.data.data", response.data.data);
           this.advicePrint = advicePrint;
           this.prescriptions = advicePrint;
 
@@ -588,7 +585,7 @@ export default{
               }
             }
           }
-          
+
         //   this.advicePrint[i]['advices'][0]['arr'] = arr
         //  this.advicePrint[i]["arr"]    = arr
         //  console.log('55555',arr);
@@ -601,11 +598,11 @@ export default{
             }
           }
         }
-        
-          console.log('4444444',this.advicePrint);
+
+          // console.log('4444444',this.advicePrint);
         //  console.log('55555555',this.arr);
 
-          console.log(this.doctorList_1, "医生列表");
+          // console.log(this.doctorList_1, "医生列表");
           if (this.doctorList_1.length > 0) {
             var operatorsLen = this.doctorList_1.length;
             for (var index = 0; index < operatorsLen; index++) {
@@ -617,12 +614,12 @@ export default{
             }
           }
 
-          console.log("处方222222", this.prescriptions);
+          // console.log("处方222222", this.prescriptions);
           var hisPatient = response.data.data.hisPatient;
-          console.log("hisPatient", hisPatient);
+          // console.log("hisPatient", hisPatient);
           this.hisPatient = hisPatient;
           var projectlist = response.data.data.projectlist;
-          console.log("所有项目列表", projectlist);
+          // console.log("所有项目列表", projectlist);
           this.projectList = projectlist;
         }
       });
@@ -658,7 +655,7 @@ export default{
       return name;
     },
     getTotalOne(id) {
-      console.log('999999999',this.prescriptions);
+      // console.log('999999999',this.prescriptions);
       var total = 0;
       var addtotal = 0;
       var zimuyao = 0;

src/xt_pages/outpatientDoctorStation/treatPrint.vue

@@ -16,8 +16,8 @@
         <!-- 此下条为本地开发下页面 -->
         <!-- <printTwo v-if="org_id == 4" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo> -->
         <!-- org_id != 10138 && org_id != 10278 && org_id !=4&& org_id !=0 -->
-        <printOne v-if="org_id != 10138 && org_id != 10278 && org_id !=4 && org_id != 10375" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
-        <printThree v-if=" org_id == 10375 " v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printThree>
+        <printOne v-if="org_id != 10138 && org_id != 10278 && org_id !=4 && org_id != 10375 && org_id != 0" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
+        <printThree v-if=" org_id == 10375 ||  org_id == 0 " v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printThree>
         <printTwo v-if="org_id == 10138 || org_id == 10278 || org_id ==4" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printTwo>
       </div>
   </div>

src/xt_pages/outpatientDoctorStation/treatTemplate/printThree.vue

@@ -77,7 +77,7 @@
           </div>
 
           <div style="display: flex; margin-top: 10px; line-height: 24px;padding: 0 10px;">
-              <div style="width: 300px;">开单医生：{{item.doctor?item.doctor:''}}</div>
+              <div style="width: 300px;">开单医生：{{item.creator?item.creator:''}}</div>
               <div style="width: 300px;">签章：</div>
               <div style="width: 300px;">费用：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):''}}元</div>
           </div>
@@ -493,7 +493,7 @@ export default {
 
   .prescriptionBox {
       padding: 0 10px;
-      
+
   }
 
   .Rp {

src/xt_pages/outpatientTool/org_export_data.vue

@@ -26,7 +26,7 @@
 
         </div>
 
-        <div v-if="this.$store.getters.xt_user.org_id == 0">
+        <div>
 
           <el-button size="small" type="primary"
                      @click="export_detail_9919('1')">职工月结数据导出