Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/api/his/his.js

@@ -143,10 +143,13 @@ export function getHisPrescriptionInfo(params){
 
 
 
-
-
-
-
+export function Refund(params) {
+  return request({
+    url: "/api/refund/post",
+    method: "post",
+    params:params,
+  });
+}
 
 
 

src/xt_pages/data/specialDictionary.vue

@@ -26,11 +26,21 @@
           <dealer></dealer>
         </el-tab-pane>
 
-        <el-tab-pane label="门诊大病" name="7">
+        <el-tab-pane label="疾病类型" name="7">
           <!--<manufacturer></manufacturer>-->
           <diagnosis></diagnosis>
         </el-tab-pane>
-        <el-tab-pane label="配置项字典" name="8">
+
+        <el-tab-pane label="医疗类别" name="8">
+          <!--<manufacturer></manufacturer>-->
+          <diagnosis></diagnosis>
+        </el-tab-pane>
+
+        <el-tab-pane label="附加收费配置" name="9">
+          <!--<manufacturer></manufacturer>-->
+          <diagnosis></diagnosis>
+        </el-tab-pane>
+        <el-tab-pane label="配置项字典" name="10">
           <configure></configure>
         </el-tab-pane>
       </el-tabs>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -6,15 +6,19 @@
     <div class="app-container" style="display:flex;flex: 1;padding: 20px 20px 0px 20px;">
       <div class="mainLeft">
         <div class="mainCell" style="justify-content: space-between;">
-        <p>未就诊：<span>1</span>人</p>
-        <p>已就诊：<span>0</span>人</p>
+          <p style="color: red">未收费：<span>{{cal_one}}</span>人</p>
+          <p style="color: red">已收费：<span>{{cal_two}}</span>人</p>
+          <p style="color: red">已退费：<span>{{cal_three}}</span>人</p>
+
         </div>
         <div class="mainCell">
-        <el-radio-group v-model="radio" @change="changeRadio">
-        <el-radio :label=1>未就诊</el-radio>
-        <el-radio :label=2>已就诊</el-radio>
-        <el-radio :label=3>全部</el-radio>
-        </el-radio-group>
+          <el-radio-group v-model="radio" @change="changeRadio">
+            <el-radio :label=1>未收费</el-radio>
+            <el-radio :label=2>已收费</el-radio>
+            <el-radio :label=3>已退费</el-radio>
+            <el-radio :label=4>全部</el-radio>
+
+          </el-radio-group>
         </div>
         <div class="mainCell" style="margin-bottom:10px;">
           <el-input size="small" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
@@ -23,7 +27,8 @@
           </el-button>
         </div>
         <div>
-          <el-table :data="patientTableData" :height="tableHeight" border style="width: 100%;" :row-style="{ color: '#303133' }"
+          <el-table :data="patientTableData" :height="tableHeight" border style="width: 100%;"
+                    :row-style="{ color: '#303133' }"
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                     highlight-current-row ref="tab"
                     @current-change="handleCurrentChange">
@@ -42,15 +47,18 @@
           <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">打印处置单</el-button>
           <el-button size="small" @click="open(2)" type="primary">打印治疗单</el-button>
           <el-button size="small" @click="open(3)" type="primary">打印</el-button>
-          <el-button v-loading="loadingone"  size="small"
+          <el-button v-loading="loadingone" size="small"
                      @click="open(6)"
+                     v-if="this.hisPatientInfo && this.hisPatientInfo.id == 0"
                      type="primary">挂号
           </el-button>
           <el-button v-loading="loadingtwo" v-if="this.info.prescription_status == 1" size="small"
                      @click="open(4)"
                      type="primary">收费
           </el-button>
-          <el-button size="small" @click="open(5)" type="primary" v-if="this.info && this.info.prescription_status == 3">退费</el-button>
+          <el-button size="small" @click="open(5)" type="primary"
+                     v-if="this.info && this.info.prescription_status == 3">退费
+          </el-button>
         </div>
 
         <div class="mainCenter">
@@ -211,7 +219,7 @@
   import prescriptionTable from './components/prescriptionTable'
   import additionalCharges from './components/additionalCharges'
   import { getPatientInformation, getPatientList } from '@/api/project/project'
-  import { getPatientInfo, getSchedulePatientList, register, upload } from '@/api/his/his'
+  import { getPatientInfo, getSchedulePatientList, register, upload,Refund } from '@/api/his/his'
 
   const moment = require('moment')
   export default {
@@ -229,7 +237,10 @@
           { path: false, name: '门诊收费' },
           { path: false, name: '门诊收费管理' }
         ],
-        tableHeight:'',
+        cal_one:'',
+        cal_two:'',
+        cal_three:'',
+        tableHeight: '',
         fullHeight: document.documentElement.clientHeight,
         activeName: 'first',
         info: {},
@@ -258,8 +269,10 @@
         radioStatus: 1,
         search_input: '',
         start_time: moment().locale('zh-cn').format('YYYY-MM-DD'),
-        patient_id:0,
-        prescription_id:0
+        patient_id: 0,
+        prescription_id: 0,
+        all_table_data:[],
+        order:{},
       }
     },
     created() {
@@ -365,7 +378,7 @@
 
       },
       tabclickEvent(val) {
-        console.log("val",val.name)
+        console.log('val', val.name)
         for (let i = 0; i < this.prescriptions.length; i++) {
           if (this.prescriptions[i].name == val.name) {
             this.curPrescriptions = {}
@@ -373,13 +386,10 @@
             this.curPrescriptions = temp
           }
         }
-        console.log("9999",this.curPrescriptions)
+        console.log('9999', this.curPrescriptions)
         this.prescription_id = this.curPrescriptions.id
         this.total = 0
         this.total = this.getTotalOne()
-       
-
-
 
       }, deepClone(source) {
         if (!source && typeof source !== 'object') {
@@ -394,33 +404,31 @@
           }
         })
         return targetObj
-      },getTotalOne(){
+      }, getTotalOne() {
         var total = 0
-          if(this.curPrescriptions.type == 1) {
-            if (this.curPrescriptions.advices != null) {
-              for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
-                console.log(this.curPrescriptions.advices[a].retail_price)
-                console.log(this.curPrescriptions.advices[a].prescribing_number)
+        if (this.curPrescriptions.type == 1) {
+          if (this.curPrescriptions.advices != null) {
+            for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
+              console.log(this.curPrescriptions.advices[a].retail_price)
+              console.log(this.curPrescriptions.advices[a].prescribing_number)
 
-                total = total + this.curPrescriptions.advices[a].retail_price * this.curPrescriptions.advices[a].prescribing_number
-              }
+              total = total + this.curPrescriptions.advices[a].retail_price * this.curPrescriptions.advices[a].prescribing_number
             }
-            return total
-
-          }else{
-            var total = 0
-            if (this.curPrescriptions.project != null) {
-              for (let b = 0; b < this.curPrescriptions.project.length; b++) {
-                console.log(this.curPrescriptions.project[b].price )
-                console.log(this.curPrescriptions.project[b].total )
-                total = total + this.curPrescriptions.project[b].price * this.curPrescriptions.project[b].total
-              }
+          }
+          return total
+
+        } else {
+          var total = 0
+          if (this.curPrescriptions.project != null) {
+            for (let b = 0; b < this.curPrescriptions.project.length; b++) {
+              console.log(this.curPrescriptions.project[b].price)
+              console.log(this.curPrescriptions.project[b].total)
+              total = total + this.curPrescriptions.project[b].price * this.curPrescriptions.project[b].total
             }
-            return total
-
           }
+          return total
 
-
+        }
 
       },
       getTotal() {
@@ -445,15 +453,15 @@
         }
       },
       open(index) {
-        console.log("index",index)
+        console.log('index', index)
         if (index == 1) {
 
         } else if (index == 2) {
-           
-           this.$router.push("/outpatientDoctorStation/printtwo?record="+this.record_date)
-        
-        } else if(index == 3){
-            this.$router.push("/outpatientCharges/treatPrint?record_date="+this.record_date+"&patient_id="+this.patient_id+"&prescription_id="+this.prescription_id)
+
+          this.$router.push('/outpatientDoctorStation/printtwo?record=' + this.record_date)
+
+        } else if (index == 3) {
+          this.$router.push('/outpatientCharges/treatPrint?record_date=' + this.record_date + '&patient_id=' + this.patient_id + '&prescription_id=' + this.prescription_id)
         } else if (index == 4) {
 
           let params = {
@@ -478,8 +486,8 @@
           this.$message({ message: '收费成功', type: 'success' })
         } else if (index == 5) {
           let params = {
-            'id': this.patientInfo.id,
-            'record_time': this.record_date
+            'order_id': this.order.id,
+            'number': this.order.number,
           }
           Refund(params).then(response => {
             if (response.data.state == 0) {
@@ -494,9 +502,6 @@
             }
           })
 
-
-
-
           this.$message({ message: '退费成功', type: 'success' })
         } else if (index == 6) {
 
@@ -531,9 +536,52 @@
         this.getPatientList()
       },
       changeRadio(id) {
-        console.log(id)
-        this.radioStatus = id
-        this.getPatientList()
+        // console.log(id)
+        // this.radioStatus = id
+        // this.getPatientList()
+
+        switch (id) {
+          case 1:
+                this.patientTableData = []
+
+            for (let i = 0; i < this.all_table_data.length; i++){
+              if(this.all_table_data[i].info.prescription_status == 0 || this.all_table_data[i].info.prescription_status == 1 || this.all_table_data[i].info.prescription_status == 2 ){
+                this.patientTableData.push(this.all_table_data[i])
+              }
+
+            }
+            break
+          case 2:
+            this.patientTableData = []
+            for (let i = 0; i < this.all_table_data.length; i++){
+              if(this.all_table_data[i].info.prescription_status == 3){
+                this.patientTableData.push(this.all_table_data[i])
+              }
+
+
+            }
+            break
+          case 3:
+            this.patientTableData = []
+
+            for (let i = 0; i < this.all_table_data.length; i++){
+
+              if(this.all_table_data[i].info.prescription_status == 4){
+                this.patientTableData.push(this.all_table_data[i])
+              }
+
+            }
+            break
+          case 4:
+            this.patientTableData = []
+            this.patientTableData = this.all_table_data
+            break
+
+        }
+
+
+
+
       },
 
       //患者列表
@@ -547,12 +595,45 @@
             return false
           } else {
             this.patientTableData = []
+            this.all_table_data = []
+            let one_count = 0
+            let two_count = 0
+            let three_count = 0
             for (let i = 0; i < response.data.data.list.length; i++) {
-               console.log("99999999",response.data.data.list)
+              // console.log('99999999', response.data.data.list)
+
+              if(response.data.data.list[i].info.prescription_status == 0 || response.data.data.list[i].info.prescription_status == 1 ||response.data.data.list[i].info.prescription_status == 2 ){
+                if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
+                  one_count = one_count + 1
+                  this.patientTableData.push(response.data.data.list[i])
+                }
+              }
+
+              if(response.data.data.list[i].info.prescription_status == 3){
+                if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
+
+                  two_count = two_count + 1
+                }
+              }
+
+              if(response.data.data.list[i].info.prescription_status == 4){
+                if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
+                  three_count = three_count + 1
+                }
+              }
+
               if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
-                this.patientTableData.push(response.data.data.list[i])
+                this.all_table_data.push(response.data.data.list[i])
               }
             }
+
+            this.cal_one = one_count
+            this.cal_two = two_count
+            this.cal_three = three_count
+
+            this.$refs.tab.setCurrentRow(this.patientTableData[0])
+            this.getPatientInformation(this.patientTableData[0].patients.id,"")
+
           }
         })
       },
@@ -563,15 +644,16 @@
       },
       handleCurrentChange(val) {
         console.log('val', val)
-        this.getPatientInformation(val.patients.id)
+        this.getPatientInformation(val.patients.id, val.info.batch_number)
         this.patient_id = val.patients.id
       },
 
       //获取患者的基本信息
-      getPatientInformation(id) {
+      getPatientInformation(id,batch_number) {
         let params = {
           'record_date': this.record_date,
-          'patient_id': id
+          'patient_id': id,
+          'number':batch_number,
         }
         getPatientInfo(params).then(response => {
           if (response.data.state == 0) {
@@ -581,6 +663,8 @@
             this.patientInfo = response.data.data.xt_info
             this.hisPatientInfo = response.data.data.his_info
             this.info = response.data.data.info
+            this.order = response.data.data.order
+
             this.prescriptions = []
             for (let i = 0; i < response.data.data.prescription.length; i++) {
               var prescription = response.data.data.prescription[i]
@@ -631,7 +715,7 @@
                 name: '处方' + index,
                 advices: tempAdvice,
                 project: tempProject,
-                order_status:response.data.data.prescription[i].order_status,
+                order_status: response.data.data.prescription[i].order_status,
                 type: response.data.data.prescription[i].type
               }
               this.prescriptions.push(obj)
@@ -640,13 +724,12 @@
               this.total = this.getTotalOne()
               console.log(this.total)
 
-
             }
           }
         })
       }
     },
-    mounted(){
+    mounted() {
       const that = this
       window.onresize = () => {
         return (() => {
@@ -656,16 +739,16 @@
       }
     },
     watch: {
-      fullHeight (val) {
-        if(!this.timer) {
+      fullHeight(val) {
+        if (!this.timer) {
           this.fullHeight = val
           let tableHeight = val - 263
           this.tableHeight = tableHeight
           this.timer = true
           let that = this
-          setTimeout(function (){
+          setTimeout(function() {
             that.timer = false
-          },400)
+          }, 400)
         }
       }
     }

src/xt_pages/outpatientCharges/summary.vue

@@ -66,9 +66,7 @@
           <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>
-            <div v-if="scope.row.order_status == 4">已退费</div>
-
+            <div v-if="scope.row.order_status == 3">已退费</div>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="操作">

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -22,16 +22,6 @@
           <!--<el-input v-model="hisPatientInfo.register_type" placeholder="" readonly></el-input>-->
           <!--</el-form-item>-->
           <el-form-item label="挂号类型: " prop="name">
-            <el-select style="margin-right:5px;" v-model="register_type" placeholder="">
-              <el-option
-                v-for="(item,index) in this.register_types"
-                :key="index"
-                :label="item.name"
-                :value="item.name">
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="医疗类型: " prop="name">
             <el-select style="margin-right:5px;" v-model="register_type" placeholder="">
               <el-option
                 v-for="(item,index) in getDictionaryDataConfig('system','register_type')"
@@ -41,6 +31,16 @@
               </el-option>
             </el-select>
           </el-form-item>
+          <!--<el-form-item label="医疗类型: " prop="name">-->
+            <!--<el-select style="margin-right:5px;" v-model="register_type" placeholder="">-->
+              <!--<el-option-->
+                <!--v-for="(item,index) in getDictionaryDataConfig('system','register_type')"-->
+                <!--:key="index"-->
+                <!--:label="item.name"-->
+                <!--:value="item.name">-->
+              <!--</el-option>-->
+            <!--</el-select>-->
+          <!--</el-form-item>-->
           <el-form-item label="诊断:" prop="name">
 
             <el-select style="margin-right:5px;" v-model="state1" placeholder="">

src/xt_pages/outpatientRegistration/index.vue

@@ -65,7 +65,7 @@
                     <el-form-item label="证件号码：" prop="idCard"  :validate-event="is_Name">
                         <el-input v-model="form.idCard"></el-input>
                     </el-form-item>
-   
+
                 </el-form>
             </div>
             <div class="nameTitle">患者挂号信息:</div>
@@ -122,7 +122,7 @@
                 </el-form>
                 <el-button style="float:right" @click="saveHisPatient('form')" type="primary">挂号</el-button>
             </div>
-            
+
         </div>
     </div>
 </template>
@@ -130,7 +130,7 @@
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { basename } from 'path'
-import { getAllDoctorList,saveHisPatient,getTodaySchedulePatient } from "@/api/project/project"
+import { getAllDoctorList,saveHisPatient } from "@/api/project/project"
 const moment = require('moment')
 export default {
     components:{
@@ -159,7 +159,7 @@ export default {
                 registrationFee:'',
                 medicalExpenses:'',
                 cost:'',
-                total: '' 
+                total: ''
             },
             settlement: [{
                 value: 1,
@@ -260,7 +260,7 @@ export default {
     computed:{
         total(){
             if(this.form.registrationFee || this.form.medicalExpenses || this.form.cost){
-                return parseFloat(this.form.registrationFee ? this.form.registrationFee : 0) + parseFloat(this.form.medicalExpenses ? this.form.medicalExpenses : 0) + parseFloat(this.form.cost ? this.form.cost : 0) 
+                return parseFloat(this.form.registrationFee ? this.form.registrationFee : 0) + parseFloat(this.form.medicalExpenses ? this.form.medicalExpenses : 0) + parseFloat(this.form.cost ? this.form.cost : 0)
             }
         }
     },
@@ -278,7 +278,7 @@ export default {
             console.log(date)
             let curTime = moment(new Date(date)).format('YYYY-MM-DD')
             console.log("curTime22222",curTime)
-           
+
             console.log(this.jsGetAge(curTime))
 
             this.form.age = this.jsGetAge(curTime)
@@ -346,7 +346,7 @@ export default {
                 this.$message({message: '添加成功',type: 'success'});
             }
         },
-        
+
         getAllDoctorList(){
            getAllDoctorList().then(response=>{
              if(response.data.state == 1){
@@ -356,9 +356,9 @@ export default {
                console.log("department",department)
                this.departmentList = department
              }
-           })   
+           })
         },
-        saveHisPatient(formName){   
+        saveHisPatient(formName){
            if(this.form.name == ""){
              this.$message.error("患者姓名不能为空")
              this.is_Name = true
@@ -394,7 +394,7 @@ export default {
                 }
                 if(this.form.costChecked == false){
                 this.check = 2
-                } 
+                }
                 if(this.form.idCard == ""){
                    this.show = true
                 }
@@ -403,7 +403,7 @@ export default {
                     medicalInsuranceCard:this.form.medicalInsuranceCard,
                     name:this.form.name,
                     sex:this.form.sex,
-                    certificates:this.form.certificates, 
+                    certificates:this.form.certificates,
                     medicalCare:this.form.medicalCare,
                     birthDay:moment(new Date(this.form.birthday)).format('YYYY-MM-DD'),
                     age:parseInt(this.form.age),
@@ -439,10 +439,10 @@ export default {
                      this.form.registrationFee = "",
                      this.form.medicalExpenses = "",
                      this.form.cost="",
-                     this.form.total= "" 
-                   } 
+                     this.form.total= ""
+                   }
                 })
-             } 
+             }
           })
         },
        getTodaySchedulePatient(){
@@ -451,12 +451,12 @@ export default {
                var patient =  response.data.data.patient
                console.log("今日排班患者",patient)
              }
-          }) 
+          })
        }
     },
     created(){
       //获取当前机构有人员信息
-      this.getAllDoctorList()   
+      this.getAllDoctorList()
       //获取今日排班的患者
       this.getTodaySchedulePatient()
     }
@@ -474,7 +474,7 @@ export default {
     margin: 0 auto;
 }
 .basicForm{
-    
+
     display: flex;
     flex-wrap: wrap;
     justify-content: space-between;