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

src/api/his/his.js

@@ -410,9 +410,9 @@ export function GetHisHospitalChargePatientInfo (params) {
 
 
 
-export function GetHisHospitalPrescriptionList (params) {
+export function getHisHospitalPrescriptionList (params) {
   return request({
-    url: '/api/hospotalcharge/info',
+    url: '/api/hospitalprescription/list',
     method: 'get',
     params:params,
   })

src/api/project/project.js

@@ -437,7 +437,7 @@ export function getTodaySchedulePatient(params){
 }
 
 export function getHisPatientDetail(params){
-  console.log("params99999",params)
+  console.log("params99999",params);
   return request({
     url:"/api/hispatient/gethispatientdetail",
     method:"Get",
@@ -454,12 +454,11 @@ export function getAllDePartmentList(params){
   })
 }
 
-export function getPrescriptionList(id,params){
+export function getPrescriptionList(id,p_type){
 
   return request({
-    url:"/api/hispatient/getprescription?patient_id="+id,
+    url:"/api/hispatient/getprescription?patient_id="+id+"&p_type="+p_type,
     method:"Get",
-    params:params
   })
 }
 
@@ -527,7 +526,7 @@ export function getUnRegisterHisPatientList (params) {
 
 
 export function postProjectInformation(params){
-  
+
   return request({
     url:"/api/postprojectinformation",
     method:"post",
@@ -541,4 +540,4 @@ export function getInvoice(params){
     method:"get",
     params:params
   })
-}
+}

src/router/modules/outpatientRecord.js

@@ -41,6 +41,12 @@ export default {
       name: 'hospitalChargesManagement',
       meta: { title: 'hospitalChargesManagement', noCache: true }
     },
+    {
+      path: '/outpatientRecord/summary',
+      component: () => import('@/xt_pages/hospitalStation/summary'),
+      name: 'summary',
+      meta: { title: 'summary', noCache: true }
+    },
 
 
   ]

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -1934,7 +1934,7 @@
       },
 
       getPrescriptionList(id) {
-        getPrescriptionList(id).then(response => {
+        getPrescriptionList(id,1).then(response => {
           if (response.data.state == 1) {
             this.centerDialogVisible = true;
             var list = response.data.data.list;

src/xt_pages/hospitalStation/pastInquiries.vue

@@ -22,24 +22,24 @@
           <template slot-scope="scope">{{scope.row.patients?scope.row.patients.name:''}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="处方日期" width="200">
-          <template slot-scope="scope"> {{scope.row.info?getTimes(scope.row.info.ctime):''}}</template>
+          <template slot-scope="scope"> {{scope.row.ctime?getTimes(scope.row.ctime):''}}</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.info?scope.row.info.prescription_number:''}}</template>
+          <template slot-scope="scope">{{scope.row.prescription_number?scope.row.prescription_number:''}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="开立医生">
-          <template slot-scope="scope">{{scope.row.info?scope.row.info.doctor:''}}</template>
+          <template slot-scope="scope">{{scope.row.doctor?scope.row.doctor:''}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="诊断">
-          <template slot-scope="scope">{{getDiagnosis(scope.row.info.diagnosis)}}</template>
+          <template slot-scope="scope">{{getDiagnosis(scope.row.diagnosis)}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="状态" width="100">
           <template slot-scope="scope">
-            <div v-if=" scope.row.info && scope.row.info.id > 0">已就诊</div>
+            <div v-if="  scope.row.id > 0">已就诊</div>
             <div v-else>未就诊</div>
           </template>
         </el-table-column>
@@ -121,11 +121,11 @@
         return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
       },
       handerShowDetail(row) {
-        if(row.info.id == 0){
+        if(row.id == 0){
           this.$message.error("未就诊");
           return
         }
-        this.$refs.inquiriesDetail.show(row.info.id)
+        this.$refs.inquiriesDetail.show(row.id)
       }, getHisPrescriptionList() {
         let params = {
           record_date:this.record_date,
@@ -133,7 +133,7 @@
           limit: this.limit,
           keywords: this.keywords,
         };
-        getHisPrescriptionList(params).then(response => {
+        getHisHospitalPrescriptionList(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg);
             return false

src/xt_pages/hospitalStation/summary.vue

@@ -66,7 +66,7 @@
         >
         </el-table-column>
         <el-table-column align="center" prop="name" label="就诊号">
-          <template slot-scope="scope">{{ scope.row.his_patient.number }}</template>
+          <template slot-scope="scope">{{ scope.row.mdtrt_id }}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="患者名字">
           <template slot-scope="scope">{{ scope.row.patient.name }}</template>
@@ -104,7 +104,7 @@
               结算单
             </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  || $store.getters.xt_user.org_id== 9990)">
+                       v-if="(scope.row.order_status == 2 || $store.getters.xt_user.org_id== 9990)">
               退费
             </el-button>
             <el-button size="mini" type="primary" @click="uploadInfo(scope.row)"
@@ -294,11 +294,9 @@
           }).then(() => {
             let params = {
               'order_id': row.id,
-              'patient_id': row.patient_id,
-              'record_time': that.getTimes(row.settle_accounts_date),
-              'admin_user_id': that.$store.getters.xt_user.user.id,
+              'admin_user_id': this.$store.getters.xt_user.user.id,
             };
-            axios.get('http://127.0.0.1:9532/api/refund/post', {
+            axios.get('http://127.0.0.1:9532/zh/api/refund', {
               params: params
             })
               .then(function (response) {
@@ -377,7 +375,8 @@
       export_detail() {
         let params = {
           start_time: this.start_time,
-          end_time: this.end_time
+          end_time: this.end_time,
+          p_type: 1,
         };
         getExportConsumeDetailList(params).then(response => {
           if (response.data.state == 0) {
@@ -534,7 +533,8 @@
           keywords: this.keywords,
           start_time: this.start_time,
           end_time: this.end_time,
-          type: this.admin_user_id
+          type: this.admin_user_id,
+          p_type: 1,
         };
         getHisOrderList(params).then(response => {
           if (response.data.state == 0) {
@@ -564,7 +564,6 @@
         }
       },
       invoicePrint(obj){
-        console.log(obj);
         let paramsObj = {
           order_id: obj.id,
           patient_id: obj.patient_id,

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -83,17 +83,18 @@
       </tr>
       <tr>
         <td>住院号</td>
-        <td></td>
+        <td>{{info.number}}</td>
         <td>科别</td>
         <td width="100"></td>
         <td>床号</td>
         <td></td>
         <td>入院日期</td>
-        <td></td>
+        <td>{{info.begndate}}</td>
         <td>出院日期</td>
-        <td width="100"></td>
+        <td width="100">{{info.enddate}}</td>
         <td>住院天数</td>
-        <td></td>
+        <td>{{getDay(info.begndate,info.enddate)}}</td>
+
       </tr>
       <tr>
         <td>险种</td>
@@ -278,11 +279,11 @@
       </tr>
       <tr>
         <td>收款人:</td>
-        <td colspan="2">{{charge_admin.user_name}}</td>
+        <td colspan="2">{{info.charge_admin.user_name}}</td>
         <td>审核人:</td>
-        <td colspan="2"></td>
+        <td colspan="2">{{info.p_admin.user_name}}</td>
         <td>制单人:</td>
-        <td colspan="2">{{p_admin.user_name}}</td>
+        <td colspan="2">{{info.p_admin.user_name}}</td>
         <td>打印日期</td>
         <td colspan="2">{{getNowTime()}}</td>
       </tr>
@@ -321,19 +322,32 @@
         }
       }
     },methods:{
+      getDay(dateString1,dateString2){
+          var  startDate = Date.parse(dateString1);
+          var  endDate = Date.parse(dateString2);
+          if (startDate>endDate){
+            return 0;
+          }
+          if (startDate==endDate){
+            return 1;
+          }
+          var days=(endDate - startDate)/(1*24*60*60*1000);
+          return  days;
+
+        },
       getNowTime: function () {
-        let dateTime
-        let yy = new Date().getFullYear()
-        let mm = new Date().getMonth() + 1
-        let dd = new Date().getDate()
-        let hh = new Date().getHours()
+        let dateTime;
+        let yy = new Date().getFullYear();
+        let mm = new Date().getMonth() + 1;
+        let dd = new Date().getDate();
+        let hh = new Date().getHours();
         let mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes()
           :
-          new Date().getMinutes()
+          new Date().getMinutes();
         let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds()
           :
-          new Date().getSeconds()
-        dateTime = yy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf + ':' + ss
+          new Date().getSeconds();
+        dateTime = yy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf + ':' + ss;
         return dateTime
       },
 

src/xt_pages/outpatientCharges/summary.vue

@@ -104,7 +104,7 @@
                             结算单
                         </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) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9990)">
+                        <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>
@@ -248,7 +248,7 @@
 
       },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) {
-          var that = this
+          var that = this;
           this.$confirm('是否退费', '退费', {
             confirmButtonText: '确 定',
             cancelButtonText: '取 消',
@@ -259,13 +259,13 @@
               'patient_id': row.patient_id,
               'record_time': that.getTimes(row.settle_accounts_date),
               'admin_user_id': that.$store.getters.xt_user.user.id,
-            }
+            };
             axios.get('http://127.0.0.1:9532/api/refund/post', {
               params: params
             })
               .then(function(response) {
                 if (response.data.state == 0) {
-                  that.$message.error(response.data.msg)
+                  that.$message.error(response.data.msg);
                   return false
                 } else {
                   if (response.data.data.failed_code == -10) {
@@ -278,7 +278,7 @@
                     }).catch(() => {
                     })
                   } else {
-                    that.$message({ message: '退费成功', type: 'success', duration: 5000 })
+                    that.$message({ message: '退费成功', type: 'success', duration: 5000 });
                     that.getHisOrderList()
 
                   }
@@ -300,13 +300,13 @@
               'patient_id': this.patientInfo.id,
               'record_time': this.record_date
 
-            }
+            };
             Refund(params).then(response => {
               if (response.data.state == 0) {
-                this.$message.error(response.data.msg)
+                this.$message.error(response.data.msg);
                 return false
               } else {
-                this.$message({ message: '退费成功', type: 'success' })
+                this.$message({ message: '退费成功', type: 'success' });
                 this.getHisOrderList()
               }
             })
@@ -316,51 +316,52 @@
       },
       toPrint(row) {
         if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
-          this.statementVisible9504 = true
+          this.statementVisible9504 = true;
           let obj = {
             order_id: row.id,
             patient_id: row.patient_id,
             record_time: this.getTimes(row.settle_accounts_date),
             admin_user_id: this.$store.getters.xt_user.user.id
-          }
+          };
           this.orderObj9504 = obj
         } else {
-          this.statementVisible = true
+          this.statementVisible = true;
           let obj = {
             order_id: row.id
-          }
+          };
           this.orderObj = obj
         }
 
       },
       settlementPrint(row){
-        this.settlementVisible = true
+        this.settlementVisible = true;
         let obj = {
           order_id: row.id
-        }
+        };
         this.settlementObj = obj
       },
       export_detail() {
         let params = {
           start_time: this.start_time,
-          end_time: this.end_time
-        }
+          end_time: this.end_time,
+          p_type: 2,
+        };
         getExportConsumeDetailList(params).then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
+            this.$message.error(response.data.msg);
             return false
           } else {
 
-            let list = []
+            let list = [];
             for (let i = 0; i < response.data.data.order.length; i++) {
-              let order = response.data.data.order[i]
-              let number = ''
-              let name = ''
-              let department = ''
-              let doctor_name = ''
-              let balance_accounts = ''
+              let order = response.data.data.order[i];
+              let number = '';
+              let name = '';
+              let department = '';
+              let doctor_name = '';
+              let balance_accounts = '';
 
-              let order_status = ''
+              let order_status = '';
 
               if (order.his_patient != null && order.his_patient.number.length > 0) {
                 number = order.his_patient.number
@@ -421,13 +422,13 @@
                 '收费日期': '',
                 '收费状态': order_status,
                 '退费日期': ''
-              }
+              };
               list.push(obj)
             }
             import('@/vendor/Export2Excel').then(excel => {
-              const tHeader = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费日期', '收费状态', '退费日期']
-              const filterVal = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费日期', '收费状态', '退费日期']
-              const data = this.formatJson(filterVal, list)
+              const tHeader = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费日期', '收费状态', '退费日期'];
+              const filterVal = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费日期', '收费状态', '退费日期'];
+              const data = this.formatJson(filterVal, list);
               excel.export_json_to_excel({
                 header: tHeader,
                 data,
@@ -442,30 +443,30 @@
         return jsonData.map(v => filterVal.map(j => v[j]))
       },
       changeDoctor() {
-        this.page = 1
-        this.keywords = ''
+        this.page = 1;
+        this.keywords = '';
         this.getHisOrderList()
       },
       handleSizeChange(limit) {
-        this.limit = limit
+        this.limit = limit;
         this.getHisOrderList()
 
       }, handleCurrentChange(page) {
-        this.page = page
+        this.page = page;
         this.getHisOrderList()
 
       },
       handleStartTimeChange() {
-        this.page = 1
-        this.keywords = ''
+        this.page = 1;
+        this.keywords = '';
         this.getHisOrderList()
       }, handleEndTimeChange() {
-        this.page = 1
-        this.keywords = ''
+        this.page = 1;
+        this.keywords = '';
         this.getHisOrderList()
       },
       searchAction() {
-        this.page = 1
+        this.page = 1;
         this.getHisOrderList()
 
       },
@@ -486,14 +487,15 @@
           keywords: this.keywords,
           start_time: this.start_time,
           end_time: this.end_time,
-          type: this.admin_user_id
-        }
+          type: this.admin_user_id,
+          p_type: 2,
+        };
         getHisOrderList(params).then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
+            this.$message.error(response.data.msg);
             return false
           } else {
-            this.tableData = response.data.data.order
+            this.tableData = response.data.data.order;
             this.total = response.data.data.total
           }
         })
@@ -501,7 +503,7 @@
       }, getDoctorList() {
         getDoctorList().then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
+            this.$message.error(response.data.msg);
             return false
           } else {
             this.doctors = response.data.data.doctors
@@ -516,7 +518,7 @@
         }
       },
       invoicePrint(obj){
-        console.log(obj)
+        console.log(obj);
         let paramsObj = {
           order_id: obj.id,
           patient_id: obj.patient_id,
@@ -524,15 +526,15 @@
           age:obj.age,
           gend:obj.gend,
           setl_time:obj.setl_time
-        }
-        this.invoiceParams = paramsObj
+        };
+        this.invoiceParams = paramsObj;
         this.invoiceVisible = true
       }
     }, created() {
 
 
-      this.fetchAllAdminUsers()
-      this.getDoctorList()
+      this.fetchAllAdminUsers();
+      this.getDoctorList();
       this.getHisOrderList()
 
 

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1938,7 +1938,7 @@
       },
 
       getPrescriptionList(id) {
-        getPrescriptionList(id).then(response => {
+        getPrescriptionList(id,2).then(response => {
           if (response.data.state == 1) {
             this.centerDialogVisible = true;
             var list = response.data.data.list;