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

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -182,7 +182,7 @@
 </template>
 
 <script>
-  import {uParseTime} from "@/utils/tools";
+  import {uParseTime,jsGetAge} from "@/utils/tools";
   import axios from 'axios'
   import {PostSearch} from '@/api/patient'
 
@@ -394,10 +394,23 @@
         this.form.id = val.id
         this.form.name = val.name
         this.form.gender = val.gender
-        this.form.age = val.age
         this.form.birthday = uParseTime(val.birthday, '{y}-{m}-{d}')
         this.form.phone = val.phone
         this.form.id_card = val.id_card_no
+        var thisLen =  this.form.id_card.length;
+        var birth = "";
+        if (thisLen == 15) {
+          birth = "19" + this.form.id_card.substr(6, 6);
+        } else {
+          birth = this.form.id_card.substr(6, 8);
+        }
+        var births =
+                birth.substr(0, 4) +
+                "-" +
+                birth.substr(4, 2) +
+                "-" +
+                birth.substr(6, 2);
+        this.form.age = jsGetAge(births, "-");
       },
       querySearchAsync(keyword, cb) {
         let key = ''
@@ -468,6 +481,10 @@
       },
       show: function () {
         this.form = Object.assign({}, this.resetForm)
+        this.form.p_type = 14
+        this.form.sick_type = this.sick[0].id
+        this.form.diagnosis = this.diagnoses[0].id
+
         // this.form.name = patientInfo.name
         // this.form.gender = patientInfo.gender
         // this.form.age = patientInfo.age
@@ -479,7 +496,6 @@
         // this.form.id_card_type = 1
         // if( this.form.social_type == 0){
         //   this.form.social_type = ""
-        //
         // }
         this.visibility = true
 

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -65,10 +65,10 @@
                         </el-button>
 
                         <el-button
-                                   v-if="(this.hisPatientInfo.id > 0 && this.order.id == 0) || this.order.order_status == 1"
-                                   size="small"
-                                   @click="sz_open(3)"
-                                   type="primary">收费
+                                v-if="(this.hisPatientInfo.id > 0 && this.order.id == 0) || this.order.order_status == 1"
+                                size="small"
+                                @click="sz_open(3)"
+                                type="primary">收费
                         </el-button>
 
                         <el-button size="small" @click="sz_open(11)" type="primary"
@@ -86,7 +86,7 @@
                         <el-button size="small" @click="sz_open(10)" type="primary">打印</el-button>
 
                         <!--<el-button-->
-                                <!--size="small" @click="sz_open(7)" type="primary"-->
+                        <!--size="small" @click="sz_open(7)" type="primary"-->
                         <!--&gt;撤销明细-->
                         <!--</el-button>-->
                     </div>
@@ -103,13 +103,10 @@
                     <!--</el-button>-->
 
 
-
-
                     <!-- <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> -->
 
 
-
                     <div v-if="this.$store.getters.xt_user.org_id != 9504 && this.$store.getters.xt_user.org_id != 10028">
                         <el-button size="small" @click="open(3)" type="primary">打印</el-button>
                         <el-button v-loading="loadingone" size="small"
@@ -142,8 +139,8 @@
                         </el-button>
 
                         <!--<el-button-->
-                                <!--v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919  || this.$store.getters.xt_user.org_id == 9671  || this.$store.getters.xt_user.org_id == 10106"-->
-                                <!--size="small" @click="open(11)" type="primary"-->
+                        <!--v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919  || this.$store.getters.xt_user.org_id == 9671  || this.$store.getters.xt_user.org_id == 10106"-->
+                        <!--size="small" @click="open(11)" type="primary"-->
                         <!--&gt;撤销明细-->
                         <!--</el-button>-->
 
@@ -340,7 +337,8 @@
         <register-dialog ref='register' :doctors="doctors" :department="department" :sick="sick" :diagnoses="diagnoses"
                          v-on:confirm="confirm" v-on:cancel="cancel"></register-dialog>
 
-        <register-dialog9504 ref='register9504' :doctors="doctors" :departments="department" :sick="sick" :diagnoses="diagnoses"
+        <register-dialog9504 ref='register9504' :doctors="doctors" :departments="department" :sick="sick"
+                             :diagnoses="diagnoses"
                              v-on:confirm="registerConfirm" v-on:cancel="registerCancel"></register-dialog9504>
 
         <charge-dialog ref='charge' v-on:confirm="chargeConfirm" v-on:cancel="chargeCancel"></charge-dialog>
@@ -496,7 +494,7 @@
         treatVisible: false,
         orderObj: {},
         paramsObj: {},
-        newOrderObj:{},
+        newOrderObj: {},
         statementVisible: false,
         newStatementVisible: false,
 
@@ -527,7 +525,7 @@
     },
     methods: {
       query() {
-        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 == 10106 ) {
+        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 == 10106) {
           var that = this
           axios.get('http://127.0.0.1:9532/api/org/info', {
             params: {}
@@ -633,7 +631,7 @@
                   that.radio = 2
                   that.$refs.charge.hide()
                   that.state = '已收费'
-                  that.$message({ message: '收费成功', type: 'success'})
+                  that.$message({ message: '收费成功', type: 'success' })
                   that.loadingtwo = false
                   that.cal_one = this.cal_one - 1
                   that.cal_two = this.cal_two + 1
@@ -645,7 +643,7 @@
 
             })
 
-        } else 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) {
+        } else 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
           axios.get('http://127.0.0.1:9532/api/upload/get', {
             params: form,
@@ -660,17 +658,23 @@
                 that.$refs.charge.hide()
                 return false
               } else {
-                that.changeRadio(2)
-                that.radio = 2
+                if (response.data.data.failed_code == -10) {
 
-                that.$refs.charge.hide()
-                that.loadingtwo = false
-                that.state = '已收费'
-                that.$message({ message: '收费成功', type: 'success',duration:5000 })
-                that.loadingtwo = false
-                that.cal_one = this.cal_one - 1
-                that.cal_two = this.cal_two + 1
-                that.patientTableData.splice(this.current_index, 1)
+                  that.$message.error(response.data.data.msg)
+
+                } else {
+                  that.changeRadio(2)
+                  that.radio = 2
+
+                  that.$refs.charge.hide()
+                  that.loadingtwo = false
+                  that.state = '已收费'
+                  that.$message({ message: '收费成功', type: 'success', duration: 5000 })
+                  that.loadingtwo = false
+                  that.cal_one = this.cal_one - 1
+                  that.cal_two = this.cal_two + 1
+                  that.patientTableData.splice(this.current_index, 1)
+                }
               }
             })
             .catch(function(error) {
@@ -698,11 +702,10 @@
         }
       }, chargeCancel() {
         this.$refs.charge.hide()
-      },registerCancel(){
+      }, registerCancel() {
         this.$refs.register9504.hide()
 
-
-      },registerConfirm(forms){
+      }, registerConfirm(forms) {
         forms['record_time'] = this.record_date
         forms['admin_user_id'] = this.$store.getters.xt_user.user.id
         forms['org_id'] = this.$store.getters.xt_user.org_id
@@ -710,7 +713,7 @@
         this.loadingone = true
 
         var that = this
-        if ( this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
+        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
           axios.get('http://127.0.0.1:9532/sz/api/register/get', {
             params: forms,
             headers: {
@@ -794,7 +797,7 @@
 
         var that = this
 
-        if ( this.$store.getters.xt_user.org_id == 10028 ||  this.$store.getters.xt_user.org_id == 9504 ) {
+        if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504) {
 
           axios.get('http://127.0.0.1:9532/sz/api/register/get', {
             params: forms,
@@ -867,7 +870,7 @@
 
             })
 
-        } else 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) {
+        } else 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) {
 
           axios.get('http://127.0.0.1:9532/api/register/get', {
             params: forms,
@@ -882,50 +885,58 @@
                 that.$refs.register.hide()
                 return false
               } else {
-                that.$refs.register.hide()
-                let params = {
-                  'record_date': that.record_date
-                }
-                getChargeHisPatientList(params).then(response => {
-                  if (response.data.state == 0) {
-                    that.$message.error(response.data.msg)
-                    return false
-                  } else {
-                    that.loadingone = false
-                    that.$message({ message: '挂号成功', type: 'success' })
-
-                    that.patientTableData = []
-                    that.all_table_data = []
-                    that.hisPatientDatas = []
-                    let one_count = 0
-                    let two_count = 0
-                    let three_count = 0
-                    for (let i = 0; i < response.data.data.list.length; i++) {
-                      that.all_table_data.push(response.data.data.list[i])
-                      if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
-                        one_count = one_count + 1
-                        that.patientTableData.push(response.data.data.list[i])
-                      }
-                      if (response.data.data.list[i].order.order_status == 2) {
-                        two_count = two_count + 1
-                        that.patientTableData.push(response.data.data.list[i])
+                if (response.data.data.failed_code == -10) {
+                  that.$message.error(response.data.data.msg)
+                  return
+                } else {
+                  that.$refs.register.hide()
+                  let params = {
+                    'record_date': that.record_date
+                  }
+                  getChargeHisPatientList(params).then(response => {
+                    if (response.data.state == 0) {
+                      that.$message.error(response.data.msg)
+                      return false
+                    } else {
+
+                      that.loadingone = false
+                      that.$message({ message: '挂号成功', type: 'success' })
+
+                      that.patientTableData = []
+                      that.all_table_data = []
+                      that.hisPatientDatas = []
+                      let one_count = 0
+                      let two_count = 0
+                      let three_count = 0
+                      for (let i = 0; i < response.data.data.list.length; i++) {
+                        that.all_table_data.push(response.data.data.list[i])
+                        if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
+                          one_count = one_count + 1
+                          that.patientTableData.push(response.data.data.list[i])
+                        }
+                        if (response.data.data.list[i].order.order_status == 2) {
+                          two_count = two_count + 1
+                          that.patientTableData.push(response.data.data.list[i])
+                        }
                       }
-                    }
-                    that.hisPatientDatas = response.data.data.list_two
-                    that.cal_one = one_count
-                    that.cal_two = two_count
-                    that.cal_three = three_count
-                    that.current_index = 0
-                    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.hisPatientDatas = response.data.data.list_two
+                      that.cal_one = one_count
+                      that.cal_two = two_count
+                      that.cal_three = three_count
+                      that.current_index = 0
+                      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)
+                        }
                       }
+                      var his_info = response.data.data.his_info
+                      that.hisPatientInfo = his_info
+
                     }
-                    var his_info = response.data.data.his_info
-                    that.hisPatientInfo = his_info
-                  }
-                })
+
+                  })
+                }
               }
             })
             .catch(function(error) {
@@ -940,7 +951,7 @@
               return false
             } else {
               this.getPatientList()
-              this.$message({ message: '挂号成功', type: 'success',duration:5000 })
+              this.$message({ message: '挂号成功', type: 'success', duration: 5000 })
               this.$refs.register.hide()
               this.loadingone = false
               var his_info = response.data.data.his_info
@@ -1484,7 +1495,7 @@
           }
 
         } else if (index == 5) {
-          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) {
+          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
             this.$confirm('是否退费', '退费', {
@@ -1510,9 +1521,13 @@
                     that.loadingtwo = false
                     return false
                   } else {
-                    that.changeRadio(1)
-                    that.$message({ message: '退费成功', type: 'success',duration:5000 })
-                    that.loadingtwo = false
+                    if (response.data.data.failed_code == -10) {
+                      that.$message.error(response.data.data.msg)
+                    } else {
+                      that.changeRadio(1)
+                      that.$message({ message: '退费成功', type: 'success', duration: 5000 })
+                      that.loadingtwo = false
+                    }
 
                   }
                 })
@@ -1639,7 +1654,7 @@
               'patient_id': this.patientInfo.id,
               'record_time': this.record_date,
               'org_id': this.$store.getters.xt_user.org_id,
-              'admin_user_id': this.$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/refundnumber/post', {
               params: params
@@ -1649,9 +1664,13 @@
                   that.$message.error(response.data.msg)
                   return false
                 } else {
-                  that.radio = 1
-                  that.changeRadio(1)
-                  that.$message({ message: '退号成功', type: 'success',duration:5000 })
+                  if (response.data.data.failed_code == -10) {
+                    that.$message.error(response.data.data.msg)
+                  } else {
+                    that.radio = 1
+                    that.changeRadio(1)
+                    that.$message({ message: '退号成功', type: 'success', duration: 5000 })
+                  }
 
                 }
               })
@@ -1677,7 +1696,7 @@
                 return false
               } else {
                 // that.$message({ message: '退号成功', type: 'success' })
-                that.$message({ message: '退明细成功', type: 'success',duration:5000 })
+                that.$message({ message: '退明细成功', type: 'success', duration: 5000 })
                 that.loadingtwo = false
               }
             })
@@ -1726,7 +1745,7 @@
             })
         } else if (index == 15) {
           var that = this
-          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 == 10106) {
+          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 == 10106) {
 
             if (this.diagnosis.length || this.diagnosis == 0) {
               that.$message.error('诊断不能为空,请选择诊断内容')
@@ -1835,7 +1854,7 @@
 
           }
           this.loadingtwo = true
-          if (this.$store.getters.xt_user.org_id == 9919||this.$store.getters.xt_user.org_id == 10106) {
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106) {
             var that = this
             axios.get('http://127.0.0.1:9532/api/pre_upload/get', {
               params: form
@@ -2535,7 +2554,7 @@
             axios.get('http://127.0.0.1:9532/sz/api/upload/get', {
               params: params,
               headers: {
-                'Permission': 5,
+                'Permission': 5
               }
             })
               .then(function(response) {
@@ -2647,8 +2666,7 @@
 
                   } else {
 
-                      that.$message({ message: '明细撤销成功', type: 'success' })
-
+                    that.$message({ message: '明细撤销成功', type: 'success' })
 
                   }
                 }
@@ -2664,7 +2682,7 @@
               patient_id: this.patient_id,
               prescription_id: this.prescription_id,
               order_id: this.order.id,
-              admin_user_id: this.$store.getters.xt_user.user.id,
+              admin_user_id: this.$store.getters.xt_user.user.id
 
             }
             this.newOrderObj = obj

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -150,7 +150,7 @@ export default {
 
     },
     getInfo(order_id) {
-      if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 10106) {
+      if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 10106  ||  this.$store.getters.xt_user.org_id == 4) {
 
         var that = this
 

src/xt_pages/outpatientCharges/summary.vue

@@ -96,7 +96,7 @@
         <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) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106)">结算单</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) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4)">结算单</el-button>
           </template>
         </el-table-column>
       </el-table>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1584,6 +1584,11 @@
             this.allDrugs = response.data.data.drugs
             this.advices_template = response.data.data.advices_template
             this.doctors = response.data.data.doctors
+            for (let i = 0; i < this.doctors.length; i++){
+              if(this.doctors[i].user_type == 1){
+                this.doctors.splice(i,1)
+              }
+            }
             this.department = response.data.data.department
             this.sick = response.data.data.sick
             this.diagnoses = response.data.data.diagnose
@@ -1699,6 +1704,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)
+          }
+        }
 
         this.curMonthPrescriptions = {}
         this.curPrescriptions = {}

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -748,6 +748,11 @@
             this.doctors = response.data.data.doctors
             this.department = response.data.data.department
 
+            for (let i = 0; i < this.doctors.length; i++){
+              if(this.doctors[i].user_type == 1){
+                this.doctors.splice(i,1)
+              }
+            }
 
             var month_prescriptions = response.data.data.month_prescriptions
             this.setMonthPrescription(month_prescriptions)
@@ -898,7 +903,7 @@
       },
 
       choosePatient(val) {
-        
+
         var nowDate = new Date()
         var nowYear = nowDate.getFullYear()
         var nowMonth = nowDate.getMonth() + 1

src/xt_pages/outpatientRegistration/index.vue

@@ -427,7 +427,7 @@
     saveHisPatient
   } from '@/api/project/project'
   import { getDictionaryDataConfig } from '@/utils/data'
-  import { uParseTime } from '@/utils/tools'
+  import { uParseTime,jsGetAge } from '@/utils/tools'
   import { getInitData } from '@/api/his/his'
   import axios from 'axios'
 
@@ -655,6 +655,21 @@
         this.form.birthday = uParseTime(val.birthday, '{y}-{m}-{d}')
         this.form.phone = val.phone
         this.form.idCard = val.id_card_no
+
+        var thisLen =  this.form.idCard.length;
+        var birth = "";
+        if (thisLen == 15) {
+          birth = "19" + this.form.idCard.substr(6, 6);
+        } else {
+          birth = this.form.idCard.substr(6, 8);
+        }
+        var births =
+          birth.substr(0, 4) +
+          "-" +
+          birth.substr(4, 2) +
+          "-" +
+          birth.substr(6, 2);
+        this.form.age = jsGetAge(births, "-");
       },
       querySearchAsync(keyword, cb) {
         let key = ''
@@ -900,11 +915,6 @@
           return
         }
 
-        // if (this.form.p_type == '') {
-        //   this.$message.error('处方类型不能为空')
-        //   this.is_Name = true
-        //   return
-        // }
 
         this.$refs[formName].validate((valid) => {
           if (valid) {
@@ -981,11 +991,15 @@
                     that.$refs.register.hide()
                     return false
                   } else {
-                    that.$refs.register.hide()
-                    that.getPatientList()
-                    that.$message({ message: '挂号成功', type: 'success' })
-                    that.loadingone = false
-
+                    if (response.data.data.failed_code == -10) {
+                      that.$message.error(response.data.data.msg)
+                      return
+                    } else {
+                      that.$refs.register.hide()
+                      that.getPatientList()
+                      that.$message({ message: '挂号成功', type: 'success' })
+                      that.loadingone = false
+                    }
                     // var his_info = response.data.data.his_info
                     // that.hisPatientInfo = his_info
                   }
@@ -1302,6 +1316,10 @@
             this.sick = response.data.data.sick
             this.diagnoses = response.data.data.diagnose
 
+            this.form.p_type = 14
+            this.form.sick_type = this.sick[0].id
+            this.form.diagnosis = this.diagnoses[0].id
+
           }
         })
 

src/xt_pages/user/patients.vue

@@ -453,21 +453,6 @@
               ></el-button>
             </el-tooltip>
 
-            <el-tooltip
-                    class="item"
-                    effect="dark"
-                    content="备案"
-                    placement="top"
-            >
-              <el-button
-                      type="danger"
-                      icon="el-icon-tickets"
-                      size="small"
-                      @click="
-                  putOnRecord(1,scope.row)
-                "
-              ></el-button>
-            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>