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

src/router/modules/outpatientRecord.js

@@ -12,12 +12,12 @@ export default {
     isChild: true
   },
   children: [
-    // {
-    //     path: '/outpatientRecord/outpatientRecord',
-    //     component: () => import('@/xt_pages/outpatientRecord/outpatientRecord'),
-    //     name: 'outpatientSickRecord',
-    //     meta: { title: 'outpatientSickRecord', noCache: true }
-    // },
+    {
+        path: '/outpatientRecord/outpatientRecord',
+        component: () => import('@/xt_pages/outpatientRecord/outpatientRecord'),
+        name: 'outpatientSickRecord',
+        meta: { title: 'outpatientSickRecord', noCache: true }
+    },
     {
       path: '/outpatientRecord/index',
       component: () => import('@/xt_pages/hospitalStation/index'),

src/xt_pages/hospitalStation/summary.vue

@@ -113,6 +113,17 @@
             </el-button>
             <el-button size="mini" type="primary" @click="invoicePrint(scope.row)">打印发票</el-button>
 
+            <el-button size="mini" type="primary" @click="refundOne(scope.row)">
+              撤销出院
+            </el-button>
+
+            <el-button size="mini" type="primary" @click="refundTwo(scope.row)">
+              撤销明细
+            </el-button>
+
+            <el-button size="mini" type="primary" @click="refundThee(scope.row)">
+              撤销入院
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -236,6 +247,143 @@
       }
     },
     methods: {
+      refundOne(row){
+        var that = this;
+        this.$confirm('是否撤销出院', '撤销出院', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
+        }).then(() => {
+          let params = {
+            'id': row.his_hospital_patient.id,
+            'admin_user_id': this.$store.getters.xt_user.user.id,
+
+          };
+          axios.get('http://127.0.0.1:9532/zh/api/outhopitaluncheck/get', {
+            params: params
+          })
+            .then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.msg);
+                return false
+              } else {
+                if (response.data.data.failed_code == -10) {
+                  // that.$message.error(response.data.data.msg)
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
+                } else {
+                  that.$message({ message: '撤销出院成功', type: 'success', duration: 5000 })
+                }
+
+              }
+            })
+            .catch(function(error) {
+
+            })
+
+        }).catch(() => {
+
+        })
+
+
+
+      },refundThee(row){
+
+        var that = this;
+        this.$confirm('是否撤销入院', '撤销入院', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
+        }).then(() => {
+          let params = {
+            'id': row.his_hospital_patient.id,
+            'admin_user_id': this.$store.getters.xt_user.user.id,
+
+          };
+          axios.get('http://127.0.0.1:9532/zh/api/inthopitaluncheck/get', {
+            params: params
+          })
+            .then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.msg);
+                return false
+              } else {
+                if (response.data.data.failed_code == -10) {
+                  // that.$message.error(response.data.data.msg)
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
+                } else {
+                  that.changeRadioAndPatient(1);
+
+                  that.$message({ message: '撤销入院成功', type: 'success', duration: 5000 })
+                }
+
+              }
+            })
+            .catch(function(error) {
+
+            })
+
+        }).catch(() => {
+
+        })
+
+
+      },refundTwo(row){
+        var that = this;
+        this.$confirm('是否撤销明细', '撤销明细', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
+        }).then(() => {
+          let params = {
+            'order_id': row.id,
+            'admin_user_id': this.$store.getters.xt_user.user.id,
+          };
+          axios.get('http://127.0.0.1:9532/zh/api/refunddetail', {
+            params: params
+          })
+            .then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.msg);
+                that.loadingtwo = false;
+                return false
+              } else {
+                if (response.data.data.failed_code == -10) {
+                  // that.$message.error(response.data.data.msg)
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
+                } else {
+                  that.$message.success("撤销明细成功");
+
+                  that.changeRadioAndPatient(1);
+                }
+
+              }
+            })
+            .catch(function(error) {
+            })
+
+        }).catch(() => {
+        })
+
+
+      },
       uploadInfo(row) {
         var that = this;
         axios.get('http://127.0.0.1:9532/api/settlelist/get', {

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -794,7 +794,7 @@
                       for (let i = 0; i < that.patientTableData.length; i++) {
                         if (this.patientTableData[i].id == this.patientInfo.id) {
                           that.$refs.tab.setCurrentRow(that.patientTableData[i]);
-                          that.getPatientInformation(that.patientTableData[i].id, that.patientTableData[i].order.number)
+                          that.getPatientInformation(that.patientTableData[i].id, that.patientTableData[i].order.number,that.patientTableData[i].his_patient.id)
                         }
                       }
                       that.loadingone = false;
@@ -886,7 +886,7 @@
                       for (let i = 0; i < that.patientTableData.length; i++) {
                         if (this.patientTableData[i].id == this.patientInfo.id) {
                           that.$refs.tab.setCurrentRow(that.patientTableData[i]);
-                          that.getPatientInformation(that.patientTableData[i].id, that.patientTableData[i].order.number)
+                          that.getPatientInformation(that.patientTableData[i].id, that.patientTableData[i].order.number,that.patientTableData[i].his_patient.id)
                         }
                       }
                       that.$message({ message: '挂号成功', type: 'success' });
@@ -966,7 +966,7 @@
                       for (let i = 0; i < that.patientTableData.length; i++) {
                         if (this.patientTableData[i].id == this.patientInfo.id) {
                           that.$refs.tab.setCurrentRow(that.patientTableData[i]);
-                          that.getPatientInformation(that.patientTableData[i].id, that.patientTableData[i].order.number)
+                          that.getPatientInformation(that.patientTableData[i].id, that.patientTableData[i].order.number,that.patientTableData[i].his_patient.id)
                         }
                       }
                       var his_info = response.data.data.his_info;
@@ -1016,6 +1016,7 @@
           'patient_id': this.patientInfo.id,
           'type': this.radio,
           'p_type':2,
+          'his_patient_id':this.hisPatientInfo.id
         };
         getChargeHisPatientInfo(params).then(response => {
           if (response.data.state == 0) {
@@ -1196,7 +1197,7 @@
               for (let i = 0; i < this.patientTableData.length; i++) {
                 if (this.patientTableData[i].id == this.patientInfo.id) {
                   this.$refs.tab.setCurrentRow(this.patientTableData[i]);
-                  this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order.number)
+                  this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order.number,this.patientTableData[i].his_patient.id)
                 }
               }
             }
@@ -1281,7 +1282,7 @@
               for (let i = 0; i < this.patientTableData.length; i++) {
                 if (this.patientTableData[i].id == this.patientInfo.id) {
                   this.$refs.tab.setCurrentRow(this.patientTableData[i]);
-                  this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order.number)
+                  this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order.number,this.patientTableData[i].his_patient.id)
                 }
               }
             }
@@ -2142,7 +2143,7 @@
             for (let i = 0; i < this.patientTableData.length; i++){
               if(this.patientInfo.id == this.patientTableData[i].id)
               this.$refs.tab.setCurrentRow(this.patientTableData[i]);
-              this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order.number)
+              this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order.number,this.patientTableData[0].his_patient.id)
             }
 
           }
@@ -2295,7 +2296,7 @@
 
             for (let i = 0; i < this.patientTableData.length; i++){
                 this.$refs.tab.setCurrentRow(this.patientTableData[0]);
-                this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order.number)
+                this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order.number,this.patientTableData[0].his_patient.id)
             }
 
           }
@@ -2389,7 +2390,7 @@
             this.cal_three = three_count;
             this.current_index = 0;
             this.$refs.tab.setCurrentRow(this.patientTableData[0]);
-            this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order.number)
+            this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order.number,this.patientTableData[0].his_patient.id)
 
           }
         })
@@ -2574,7 +2575,7 @@
         this.prescriptions = [];
         this.month_prescriptions = [];
 
-        this.getPatientInformation(val.id, val.order.number);
+        this.getPatientInformation(val.id, val.order.number,val.his_patient.id);
         this.patient_id = val.id;
 
         for (let i = 0; i < this.patientTableData.length; i++) {
@@ -2587,7 +2588,7 @@
       },
 
       //获取患者的基本信息
-      getPatientInformation(id, batch_number) {
+      getPatientInformation(id, batch_number,his_patient_id) {
 
         let params = {
           'record_date': this.record_date,
@@ -2597,6 +2598,8 @@
           'end_time': this.other_end_time,
           'type': this.radio,
           'p_type':2,
+          'his_patient_id':his_patient_id
+
 
 
         };

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -175,7 +175,8 @@ export default {
               console.log(response.data.data.info);
               that.info = response.data.data.info;
               console.log(that.info);
-
+              that.p_admin = response.data.data.printor_admin;
+              that.charge_admin = response.data.data.charge_admin;
 
               that.info['p_admin'] =  that.p_admin;
               that.info['charge_admin'] =  that.charge_admin;

src/xt_pages/outpatientCharges/summary.vue

@@ -1,191 +1,195 @@
 <template>
-    <div class="main-contain outpatientChargesManagement">
-        <div class="position">
-            <bread-crumb :crumbs='crumbs'></bread-crumb>
+  <div class="main-contain outpatientChargesManagement">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
+    <div class="app-container">
+      <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+        <div>
+          <el-input size="small" style="width:150px;" v-model="keywords"
+                    class="filter-item"/>
+          <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"
+                     @click="searchAction">
+            搜索
+          </el-button>
+          <el-select size="small" v-model="admin_user_id" placeholder="请选择"
+                     style="width:150px;margin-left:10px;" @change="changeDoctor">
+            <el-option
+              label="全部"
+              value="0">
+            </el-option>
+            <el-option
+              v-for="item,index in doctors"
+              :key="index"
+              :label="item.user_name"
+              :value="item.admin_user_id">
+            </el-option>
+          </el-select>
+          <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date"
+                          @change="handleStartTimeChange" :editable="false" :clearable="false"
+                          style="width: 196px;margin-right:10px;" type="date" placeholder="选择开始日期"
+                          format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd"
+                          align="right"></el-date-picker>
+
+          <el-date-picker size="small" v-model="end_time" prefix-icon="el-icon-date"
+                          @change="handleEndTimeChange" :editable="false" :clearable="false"
+                          style="width: 196px;margin-right:10px;" type="date" placeholder="选择结束日期"
+                          format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd"
+                          align="right"></el-date-picker>
+          <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
+          <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
         </div>
-        <div class="app-container">
-            <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
-                <div>
-                    <el-input size="small" style="width:150px;" v-model="keywords"
-                              class="filter-item"/>
-                    <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"
-                               @click="searchAction">
-                        搜索
-                    </el-button>
-                    <el-select size="small" v-model="admin_user_id" placeholder="请选择"
-                               style="width:150px;margin-left:10px;" @change="changeDoctor">
-                        <el-option
-                                label="全部"
-                                value="0">
-                        </el-option>
-                        <el-option
-                                v-for="item,index in doctors"
-                                :key="index"
-                                :label="item.user_name"
-                                :value="item.admin_user_id">
-                        </el-option>
-                    </el-select>
-                    <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date"
-                                    @change="handleStartTimeChange" :editable="false" :clearable="false"
-                                    style="width: 196px;margin-right:10px;" type="date" placeholder="选择开始日期"
-                                    format="yyyy-MM-dd"
-                                    value-format="yyyy-MM-dd"
-                                    align="right"></el-date-picker>
-
-                    <el-date-picker size="small" v-model="end_time" prefix-icon="el-icon-date"
-                                    @change="handleEndTimeChange" :editable="false" :clearable="false"
-                                    style="width: 196px;margin-right:10px;" type="date" placeholder="选择结束日期"
-                                    format="yyyy-MM-dd"
-                                    value-format="yyyy-MM-dd"
-                                    align="right"></el-date-picker>
-                    <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
-                    <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
-                </div>
-                <div>
-                    <!-- <el-popover
-                      placement="bottom"
-                      width="210"
-                      trigger="click">
-                      <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
-                      <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
-                      <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
-
-                    </el-popover> -->
-                    <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
-                </div>
-            </div>
-            <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }"
-                      :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
-                      highlight-current-row>
-                <el-table-column
-                        prop="date"
-                        label="序号"
-                        width="60"
-                        align="center"
-                        type="index"
-                >
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="就诊号">
-                    <template slot-scope="scope">{{ scope.row.his_patient.number }}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="患者名字">
-                    <template slot-scope="scope">{{ scope.row.patient.name }}</template>
-                </el-table-column>
-                <!--<el-table-column align="center" prop="name" label="患者类型">-->
-                <!--<template slot-scope="scope"></template>-->
-                <!--</el-table-column>-->
-                <el-table-column align="center" prop="name" label="应收金额">
-                    <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="实收金额">
-                    <template slot-scope="scope">{{scope.row.reality_price}}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="科室">
-                    <template slot-scope="scope">{{scope.row.department_name}}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="收费日期">
-                    <template slot-scope="scope"> {{scope.row.setl_time}}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="收费员">
-                    <template slot-scope="scope">{{ getName(scope.row.creator) }}</template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="状态">
-                    <template slot-scope="scope">
-                        <div v-if="scope.row.order_status == 1">待结算</div>
-                        <div v-if="scope.row.order_status == 2">已结算</div>
-                        <div v-if="scope.row.order_status == 3">已退费</div>
-                    </template>
-                </el-table-column>
-                <el-table-column align="center" prop="name" label="操作">
-                    <template slot-scope="scope">
-                        <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
-                        <el-button size="mini" type="primary" @click="toPrint(scope.row)"
-                                   v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9504) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9919) ||  ($store.getters.xt_user.org_id == 10106) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9990)">
-                            结算单
-                        </el-button>
-                        <el-button size="mini" type="primary" v-if="scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106" @click="settlementPrint(scope.row)">结算单</el-button>
-                        <el-button size="mini" type="primary" @click="toRefund(scope.row)" v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106)">
-                            退费
-                        </el-button>
-                        <el-button size="mini" type="primary" @click="invoicePrint(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"
-
-            >
-            </el-pagination>
+        <div>
+          <!-- <el-popover
+            placement="bottom"
+            width="210"
+            trigger="click">
+            <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
+            <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
+            <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
+
+          </el-popover> -->
+          <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
         </div>
-
-        <el-dialog
-                class="centerDialog"
-                width="1200px"
-                title="打印"
-                :visible.sync="statementVisible">
-            <!--<statementPrint ref="print" :paramsObj='orderObj'></statementPrint>-->
-            <new-statement-print ref="print" :paramsObj='orderObj'></new-statement-print>
-        </el-dialog>
-        <el-dialog
-                class="centerDialog"
-                width="900px"
-                title="打印"
-                :visible.sync="listVisible">
-            <listPrint></listPrint>
-        </el-dialog>
-        <el-dialog
-                class="centerDialog"
-                width="900px"
-                title="打印"
-                :visible.sync="allListVisible">
-            <allListPrint :paramsObj='paramsObj'></allListPrint>
-        </el-dialog>
-
-        <el-dialog
-                class="centerDialog"
-                width="1200px"
-                title="打印"
-                :visible.sync="statementVisible9504">
-            <!--<statementPrint ref="print" :paramsObj='orderObj'></statementPrint>-->
-            <!--<new-statement-print ref="print" :paramsObj='orderObj9504'></new-statement-print>-->
-            <new-statement-print-two ref="print" :paramsObj='orderObj9504'></new-statement-print-two>
-        </el-dialog>
-
-        <el-dialog
-                class="centerDialog"
-                width="1200px"
-                title="打印"
-                :visible.sync="invoiceVisible">
-            <invoice-print ref="print" :invoiceParams='invoiceParams'></invoice-print>
-        </el-dialog>
-        <el-dialog
-                class="centerDialog"
-                width="1200px"
-                title="打印"
-                :visible.sync="settlementVisible">
-            <settlement-print ref="print" :paramsObj='settlementObj'></settlement-print>
-        </el-dialog>
-
+      </div>
+      <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }"
+                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                highlight-current-row>
+        <el-table-column
+          prop="date"
+          label="序号"
+          width="60"
+          align="center"
+          type="index"
+        >
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="就诊号">
+          <template slot-scope="scope">{{ scope.row.his_patient.number }}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="患者名字">
+          <template slot-scope="scope">{{ scope.row.patient.name }}</template>
+        </el-table-column>
+        <!--<el-table-column align="center" prop="name" label="患者类型">-->
+        <!--<template slot-scope="scope"></template>-->
+        <!--</el-table-column>-->
+
+        <el-table-column align="center" prop="name" label="应收金额">
+          <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="实收金额">
+          <template slot-scope="scope">{{scope.row.reality_price}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="科室">
+          <template slot-scope="scope">{{scope.row.department_name}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="收费日期">
+          <template slot-scope="scope"> {{scope.row.setl_time?scope.row.setl_time:getTimes(scope.row.settle_accounts_date)}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="收费员">
+          <template slot-scope="scope">{{ getName(scope.row.creator) }}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="状态">
+          <template slot-scope="scope">
+            <div v-if="scope.row.order_status == 1">待结算</div>
+            <div v-if="scope.row.order_status == 2">已结算</div>
+            <div v-if="scope.row.order_status == 3">已退费</div>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="操作">
+          <template slot-scope="scope">
+            <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
+            <el-button size="mini" type="primary" @click="toPrint(scope.row)"
+                       v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9504) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9919) ||  ($store.getters.xt_user.org_id == 10106) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9990)">
+              结算单
+            </el-button>
+            <el-button size="mini" type="primary"
+                       v-if="scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106"
+                       @click="settlementPrint(scope.row)">结算单
+            </el-button>
+            <el-button size="mini" type="primary" @click="toRefund(scope.row)">
+              退费
+            </el-button>
+            <el-button size="mini" type="primary" @click="invoicePrint(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"
+
+      >
+      </el-pagination>
     </div>
+
+    <el-dialog
+      class="centerDialog"
+      width="1200px"
+      title="打印"
+      :visible.sync="statementVisible">
+      <!--<statementPrint ref="print" :paramsObj='orderObj'></statementPrint>-->
+      <new-statement-print ref="print" :paramsObj='orderObj'></new-statement-print>
+    </el-dialog>
+    <el-dialog
+      class="centerDialog"
+      width="900px"
+      title="打印"
+      :visible.sync="listVisible">
+      <listPrint></listPrint>
+    </el-dialog>
+    <el-dialog
+      class="centerDialog"
+      width="900px"
+      title="打印"
+      :visible.sync="allListVisible">
+      <allListPrint :paramsObj='paramsObj'></allListPrint>
+    </el-dialog>
+
+    <el-dialog
+      class="centerDialog"
+      width="1200px"
+      title="打印"
+      :visible.sync="statementVisible9504">
+      <!--<statementPrint ref="print" :paramsObj='orderObj'></statementPrint>-->
+      <!--<new-statement-print ref="print" :paramsObj='orderObj9504'></new-statement-print>-->
+      <new-statement-print-two ref="print" :paramsObj='orderObj9504'></new-statement-print-two>
+    </el-dialog>
+
+    <el-dialog
+      class="centerDialog"
+      width="1200px"
+      title="打印"
+      :visible.sync="invoiceVisible">
+      <invoice-print ref="print" :invoiceParams='invoiceParams'></invoice-print>
+    </el-dialog>
+    <el-dialog
+      class="centerDialog"
+      width="1200px"
+      title="打印"
+      :visible.sync="settlementVisible">
+      <settlement-print ref="print" :paramsObj='settlementObj'></settlement-print>
+    </el-dialog>
+
+  </div>
 </template>
 
 
 <script>
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { getDoctorList, getExportConsumeDetailList, getHisOrderList, Refund} from '@/api/his/his'
-  import { uParseTime } from '@/utils/tools'
+  import {getDoctorList, getExportConsumeDetailList, getHisOrderList, Refund} from '@/api/his/his'
+  import {uParseTime} from '@/utils/tools'
   import NewStatementPrint from './newStatementPrint'
   import listPrint from './listPrint'
   import allListPrint from './allListPrint'
   import NewStatementPrintTwo from './newStatementPrintTwo'
-  import { fetchAllAdminUsers } from '@/api/doctor'
+  import {fetchAllAdminUsers} from '@/api/doctor'
   import axios from 'axios'
   import invoicePrint from './invoicePrint'
   import settlementPrint from './settlementPrint'
@@ -207,8 +211,8 @@
         statementVisible9504: false,
         orderObj9504: {},
         crumbs: [
-          { path: false, name: '门诊收费' },
-          { path: false, name: '项目消费明细汇总' }
+          {path: false, name: '门诊收费'},
+          {path: false, name: '项目消费明细汇总'}
         ],
         tableData: [],
         limit: 10,
@@ -221,12 +225,12 @@
         admin_user_id: '',
         listVisible: false,
         allListVisible: false,
-        adminUserOptions:[],
-        invoiceVisible:false,
-        paramsObj:{},
-        invoiceParams:{},
-        settlementVisible:false,
-        settlementObj:{}
+        adminUserOptions: [],
+        invoiceVisible: false,
+        paramsObj: {},
+        invoiceParams: {},
+        settlementVisible: false,
+        settlementObj: {}
 
       }
     },
@@ -246,8 +250,8 @@
           }
         }
 
-      },toRefund(row){
-        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106) {
+      }, toRefund(row) {
+        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990) {
           var that = this;
           this.$confirm('是否退费', '退费', {
             confirmButtonText: '确 定',
@@ -263,7 +267,7 @@
             axios.get('http://127.0.0.1:9532/api/refund/post', {
               params: params
             })
-              .then(function(response) {
+              .then(function (response) {
                 if (response.data.state == 0) {
                   that.$message.error(response.data.msg);
                   return false
@@ -278,13 +282,13 @@
                     }).catch(() => {
                     })
                   } else {
-                    that.$message({ message: '退费成功', type: 'success', duration: 5000 });
+                    that.$message({message: '退费成功', type: 'success', duration: 5000});
                     that.getHisOrderList()
 
                   }
                 }
               })
-              .catch(function(error) {
+              .catch(function (error) {
               })
           }).catch(() => {
           })
@@ -306,7 +310,7 @@
                 this.$message.error(response.data.msg);
                 return false
               } else {
-                this.$message({ message: '退费成功', type: 'success' });
+                this.$message({message: '退费成功', type: 'success'});
                 this.getHisOrderList()
               }
             })
@@ -333,7 +337,7 @@
         }
 
       },
-      settlementPrint(row){
+      settlementPrint(row) {
         this.settlementVisible = true;
         let obj = {
           order_id: row.id
@@ -360,14 +364,18 @@
               let department = '';
               let doctor_name = '';
               let balance_accounts = '';
-
               let order_status = '';
+              let charge_name = '';
 
+              let insutypeName = "";
+
+              let time = "";
               if (order.his_patient != null && order.his_patient.number.length > 0) {
                 number = order.his_patient.number
 
               }
 
+
               if (order.his_patient != null) {
                 if (order.his_patient.balance_accounts_type == 1) {
                   balance_accounts = '自费'
@@ -392,6 +400,19 @@
                 doctor_name = order.p_info.doctor
               }
 
+              if (order.creator != null) {
+                charge_name = this.getName(order.creator)
+              }
+              if (order.insutype == '390') {
+
+                insutypeName = "城乡居民基本医疗保险"
+              } else if (order.insutype == '310') {
+                insutypeName = "职工基本医疗保险"
+
+
+              }
+
+
               if (order.order_status == 1) {
                 order_status = '待结算'
               }
@@ -404,30 +425,47 @@
                 order_status = '已退费'
               }
 
+              if (order.settle_type == 2) {
+                time = this.getTimes(order.settle_start_time)
+              } else {
+                time = this.getTimes(order.settle_accounts_date)
+              }
+
+
               let obj = {
-                '就诊号': number,
+                '就诊号': order.mdtrt_id,
                 '患者姓名': name,
+                '开处时间': time,
+                '险种类型': insutypeName,
                 '应收金额': order.medfee_sumamt,
                 '实收金额': order.medfee_sumamt,
+                '医保统筹金额': order.fund_pay_sumamt,
+                '大额基金金额': order.hifob_pay,
+                '大病基金金额': order.hifmi_pay,
+                '补充保险基金金额': order.hifes_pay,
+                '医疗救助基金金额': order.maf_pay,
+                '公务员基金': order.cvlserv_pay,
+                '个人支付基金': order.psn_cash_pay,
+                '个人账户支付金额': order.acct_pay,
                 '科室': department,
                 '医生姓名': doctor_name,
                 '收费类别': balance_accounts,
-                '收费者姓名': doctor_name,
+                '收费者姓名': charge_name,
                 '总金额': order.medfee_sumamt,
                 '现金支付': '',
                 '账户支付': '',
                 '支付宝支付': '',
                 '微信支付': '',
                 '其他支付': '',
-                '收费日期': '',
+                '收费时间': order.setl_time,
                 '收费状态': order_status,
                 '退费日期': ''
               };
               list.push(obj)
             }
             import('@/vendor/Export2Excel').then(excel => {
-              const tHeader = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费日期', '收费状态', '退费日期'];
-              const filterVal = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费日期', '收费状态', '退费日期'];
+              const tHeader = ['就诊号', '患者姓名', '开处时间','险种类型', '应收金额', '实收金额', '医保统筹金额', '大额基金金额', '大病基金金额', '补充保险基金金额', '医疗救助基金金额', '公务员基金', '个人支付基金', '个人账户支付金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费时间', '收费状态', '退费日期'];
+              const filterVal = ['就诊号', '患者姓名','开处时间','险种类型', '应收金额', '实收金额', '医保统筹金额', '大额基金金额', '大病基金金额', '补充保险基金金额', '医疗救助基金金额', '公务员基金', '个人支付基金', '个人账户支付金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费时间', '收费状态', '退费日期'];
               const data = this.formatJson(filterVal, list);
               excel.export_json_to_excel({
                 header: tHeader,
@@ -517,15 +555,15 @@
           this.allListVisible = true
         }
       },
-      invoicePrint(obj){
+      invoicePrint(obj) {
         console.log(obj);
         let paramsObj = {
           order_id: obj.id,
           patient_id: obj.patient_id,
-          name:obj.patient.name,
-          age:obj.age,
-          gend:obj.gend,
-          setl_time:obj.setl_time
+          name: obj.patient.name,
+          age: obj.age,
+          gend: obj.gend,
+          setl_time: obj.setl_time
         };
         this.invoiceParams = paramsObj;
         this.invoiceVisible = true
@@ -538,7 +576,6 @@
       this.getHisOrderList()
 
 
-
     }
   }
 </script>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -515,7 +515,6 @@
         departmentOptions: [],
         departmentValue: '',
         total: 0,
-        state1: 1,
         request_record_date: '',
         state2: '',
         customTabIndex: 1,
@@ -551,6 +550,7 @@
         sick: [],
         diagnoses: [],
         diagnose: 1,
+        state1: 1,
         curTotal: 0,
         prescription_id: 0,
         tempDrugs: [],
@@ -1711,6 +1711,11 @@
 
       },
       setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data) {
+
+
+
+
+
         for (let i = 0; i < doctors.length; i++){
           if(doctors[i].user_type == 1){
             doctors.splice(i,1)
@@ -1745,7 +1750,10 @@
 
         this.diagnose = info.diagnosis;
         if (this.diagnose == 0) {
-          this.diagnose = ''
+          for(let i = 0; i < this.diagnoses.length;i++){
+            this.diagnose = this.diagnoses[0].id
+          }
+
         }
         if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
           this.curStatus = 1;
@@ -1765,7 +1773,11 @@
 
         this.state1 = info.sick_type;
         if (this.state1 == 0) {
-          this.state1 = ''
+          this.state1 = '';
+          for(let i = 0; i < this.sick.length;i++){
+            this.state1 = this.sick[0].id
+          }
+
         }
         this.state2 = info.sick_history;
         if (this.state2 == 0) {
@@ -1822,7 +1834,9 @@
           }
         }
         if (info.register_type == 0) {
-          this.register_type = ''
+          for(let i = 0; i < this.register.length;i++){
+            this.register_type = this.register[0].value
+          }
         } else {
           this.register_type = info.register_type
         }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -9,6 +9,14 @@
           <p style="font-size:14px;">未就诊：<span>{{cal_one}}</span>人</p>
           <p style="font-size:14px;">已就诊：<span>{{cal_two}}</span>人</p>
         </div>
+        <div class="mainCell">
+          <el-radio-group v-model="schedule_type" @change="changeScheduleType">
+            <el-radio :label="1">上午</el-radio>
+            <el-radio :label="2">下午</el-radio>
+            <el-radio :label="3">晚上</el-radio>
+            <el-radio :label="0">全部</el-radio>
+          </el-radio-group>
+        </div>
         <div class="mainCell">
           <el-radio-group v-model="radio" @change="change">
             <el-radio :label="1">未就诊</el-radio>
@@ -195,6 +203,7 @@
         cal_one: 0,
         cal_two: 0,
         radio: 1,
+        schedule_type:0,
         record_date: '',
         crumbs: [
           {path: false, name: '门诊医生站'},
@@ -236,7 +245,9 @@
         this.radio = 2;
         let params = {
           'record_date': this.record_date,
-          'type': this.radio
+          'type': this.radio,
+          'sch_type':this.schedule_type,
+
         };
         this.patientTableData = [];
 
@@ -325,10 +336,46 @@
       //   })
       //
       // },
+      changeScheduleType() {
+        let params = {
+          'record_date': this.record_date,
+          'type': this.radio,
+          'sch_type':this.schedule_type,
+        };
+        this.patientTableData = [];
+
+        getSchedulePatientList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg);
+            return false
+          } else {
+            this.patientTableData = response.data.data.list;
+            this.patientTableDataTwo = response.data.data.list;
+            this.cal_one = response.data.data.total_one;
+            this.cal_two = response.data.data.total_two;
+            this.admin_info = response.data.data.info;
+
+            if (this.patientTableData.length > 0) {
+              this.$refs.tab.setCurrentRow(this.patientTableData[0]);
+              this.oldCurrentRow = this.patientTableData[0];
+
+              this.getPatientInfo(this.patientTableData[0])
+            }
+
+            this.prescriptionList = response.data.data.list.prescription
+
+            // this.patientid = this.patientTableData[0].patient_id
+
+          }
+        })
+      },
+
       change() {
         let params = {
           'record_date': this.record_date,
-          'type': this.radio
+          'type': this.radio,
+          'sch_type':this.schedule_type,
+
         };
         this.patientTableData = [];
 
@@ -703,7 +750,9 @@
       getList() {
         let params = {
           'record_date': this.record_date,
-          'type': this.radio
+          'type': this.radio,
+          'sch_type':this.schedule_type,
+
         };
         this.patientTableData = [];
         getSchedulePatientList(params).then(response => {

src/xt_pages/outpatientRegistration/index.vue

@@ -642,7 +642,6 @@
     },
     methods: {
       changeReg() {
-        console.log(this.form.register);
         if (this.form.register != 4) {
           this.form.registrationFee = 10
         } else {
@@ -1444,6 +1443,9 @@
             this.sick = response.data.data.sick;
             this.diagnoses = response.data.data.diagnose;
 
+            for(let i = 0; i < this.department.length;i++){
+              this.form.department = this.department[0].id
+            }
             this.form.p_type = 14;
             this.form.sick_type = this.sick[0].id;
             this.form.diagnosis = this.diagnoses[0].id
@@ -1455,11 +1457,11 @@
 
     },
     created() {
-
       if(this.$store.getters.xt_user.org_id == 9504 ||  this.$store.getters.xt_user.org_id == 10028){
         this.form.certificates = 2;
         this.form.id_card_type = 1
       }else{
+        this.form.registrationFee = 0;
         this.form.certificates = 1;
         this.form.id_card_type = 2
       }