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

@@ -79,7 +79,7 @@
 
       <el-form-item label="处方类型：" prop="p_type" :validate-event="is_Name">
         <el-select style="margin-right:5px;width:100px;" v-model="form.p_type" placeholder=""
-                   >
+        >
           <el-option
             v-for="(item,index) in registers"
             :key="index"
@@ -155,7 +155,7 @@
         </div>
       </el-form-item>
 
-      <el-form-item label="挂号类型：" prop="register" :validate-event="is_Name">
+      <el-form-item label="挂号类型："  >
         <el-select v-model="form.register" placeholder="请选择" style="width:100%;">
           <el-option
             v-for="item in register"
@@ -166,7 +166,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="挂号费：">
-        <el-input  v-model="form.registration_fee"></el-input>
+        <el-input v-model="form.registration_fee"></el-input>
       </el-form-item>
       <el-form-item label="诊疗费：">
         <el-input v-model="form.medical_expenses"></el-input>
@@ -182,7 +182,7 @@
 </template>
 
 <script>
-  import {uParseTime,jsGetAge} from "@/utils/tools";
+  import {jsGetAge, uParseTime} from "@/utils/tools";
   import axios from 'axios'
   import {PostSearch} from '@/api/patient'
 
@@ -204,7 +204,7 @@
           {value: 16, label: "门诊慢性病"},
           {value: 21, label: "普通住院"},
         ],
-        medical_care:[
+        medical_care: [
           {value: 11, label: "普通门诊"},
           {value: 12, label: '家庭通道'},
           {value: 13, label: "门诊大病"},
@@ -218,8 +218,6 @@
         ],
 
 
-
-
         form: {
           id: '',
           settlement_value: '',
@@ -227,9 +225,9 @@
           name: '',
           gender: '',
           certificates: 1,
-          p_type:'',
-          sick_type:'',
-          diagnosis:'',
+          p_type: '',
+          sick_type: '',
+          diagnosis: '',
           medical_care: '',
           birthday: '',
           age: '',
@@ -238,8 +236,8 @@
           doctor: '',
           id_card_type: 1,
           department: '',
-          registration_fee: '',
-          medical_expenses: '',
+          registration_fee: 0,
+          medical_expenses: 0,
           cost: '',
           phone: '',
           social_type: '',
@@ -307,9 +305,9 @@
           value: 6,
           label: "城乡居民大病医疗保险"
         }, {
-            value: 7,
-            label: "生育保险"
-          }],
+          value: 7,
+          label: "生育保险"
+        }],
         register: [{
           value: 1,
           label: '普通'
@@ -391,13 +389,13 @@
     },
     methods: {
       handleSelect(val) {
-        this.form.id = val.id
-        this.form.name = val.name
-        this.form.gender = val.gender
-        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;
+        this.form.id = val.id;
+        this.form.name = val.name;
+        this.form.gender = val.gender;
+        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);
@@ -405,22 +403,22 @@
           birth = this.form.id_card.substr(6, 8);
         }
         var births =
-                birth.substr(0, 4) +
-                "-" +
-                birth.substr(4, 2) +
-                "-" +
-                birth.substr(6, 2);
+          birth.substr(0, 4) +
+          "-" +
+          birth.substr(4, 2) +
+          "-" +
+          birth.substr(6, 2);
         this.form.age = jsGetAge(births, "-");
       },
       querySearchAsync(keyword, cb) {
-        let key = ''
+        let key = '';
         if (keyword != undefined) {
           key = keyword
         }
-        let searchArray = []
+        let searchArray = [];
         PostSearch(key).then(response => {
           if (response.data.state == 1) {
-            searchArray = response.data.data.patient
+            searchArray = response.data.data.patient;
             cb(searchArray)
           } else {
             cb([])
@@ -428,43 +426,43 @@
         })
       },
       reading(medicalInsuranceCard) {
-        var that = this
+        var that = this;
         if (this.form.id_card_type.length == 0 || this.form.id_card_type == 0) {
-          this.$message.error("请先选择读卡类型")
+          this.$message.error("请先选择读卡类型");
           return
         }
         let params = {
           'id_card_type': this.form.id_card_type,
-          '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/sscard', {
           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 {
-              var patient = response.data.data.patient
+              var patient = response.data.data.patient;
 
               if (that.form.id_card_type == 1) {
-                this.form.id = patient.id
-                that.form.name = patient.name
-                that.form.sex = patient.gender
-                that.form.age = patient.age
-                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
-                that.form.phone = patient.phone
-                that.form.idCard = patient.id_card_no
+                this.form.id = patient.id;
+                that.form.name = patient.name;
+                that.form.sex = patient.gender;
+                that.form.age = patient.age;
+                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}');
+                that.form.phone = patient.phone;
+                that.form.idCard = patient.id_card_no;
                 that.form.medicalInsuranceCard = response.data.data.number
 
               } else if (that.form.id_card_type == 2) {
-                this.form.id = patient.id
-                that.form.name = patient.name
-                that.form.sex = patient.gender
-                that.form.age = patient.age
-                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
-                that.form.phone = patient.phone
+                this.form.id = patient.id;
+                that.form.name = patient.name;
+                that.form.sex = patient.gender;
+                that.form.age = patient.age;
+                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}');
+                that.form.phone = patient.phone;
                 that.form.idCard = patient.id_card_no
               }
               that.$message({message: '读卡成功', type: 'success'})
@@ -479,33 +477,33 @@
       getDictionaryDataConfig(module, filed_name) {
         return getDictionaryDataConfig(module, filed_name)
       },
-    show: function() {
-        this.visibility = true
+      show: function () {
+        this.visibility = true;
         // this.form = Object.assign({}, this.resetForm)
-        this.form.id = 0
-        this.form.settlement_value = ''
-        this.form.medical_insurance_card = ''
-        this.form.name = ''
-        this.form.gender = ''
-        this.form.medical_care = ''
-        this.form.birthda = ''
-        this.form.age = ''
-        this.form.id_card = ''
-        this.form.register = ''
-        this.form.doctor = ''
-        this.form.department = ''
-        this.form.registration_fee = ''
-        this.form.medical_expenses = ''
-        this.form.cost = ''
-        this.form.phone = ''
-        this.form.social_type = ''
-
-        this.form.p_type = 14
-        this.form.sick_type = this.sick[0].id
-        this.form.diagnosis = this.diagnoses[0].id
-        this.form.id_card_type = 2
-        this.form.certificates = 1
-
+        this.form.id = 0;
+        this.form.settlement_value = '';
+        this.form.medical_insurance_card = '';
+        this.form.name = '';
+        this.form.gender = '';
+        this.form.medical_care = '';
+        this.form.birthda = '';
+        this.form.age = '';
+        this.form.id_card = '';
+        this.form.register = '';
+        this.form.doctor = '';
+        this.form.department = '';
+        this.form.registration_fee = 0;
+        this.form.medical_expenses = 0;
+        this.form.cost = '';
+        this.form.phone = '';
+        this.form.social_type = '';
+
+        this.form.p_type = 14;
+        this.form.sick_type = this.sick[0].id;
+        this.form.diagnosis = this.diagnoses[0].id;
+        this.form.id_card_type = 2;
+        this.form.certificates = 1;
+        this.form.settlement_value = 1
         // this.form.name = patientInfo.name
         // this.form.gender = patientInfo.gender
         // this.form.age = patientInfo.age
@@ -519,26 +517,26 @@
         // }
 
       },
-      
+
       hide: function () {
-        this.visibility = false
+        this.visibility = false;
         this.$refs['formValue'].resetFields()
       }, cancel: function (formName) {
-        this.$emit('cancel', this.getValue())
+        this.$emit('cancel', this.getValue());
         this.$refs['formValue'].resetFields()
       },
       confirm: function (formName) {
         this.$refs['formValue'].validate((valid) => {
           if (valid) {
-            let value = {}
-            value = this.getValue()
+            let value = {};
+            value = this.getValue();
             this.$emit('confirm', value)
           }
         })
       },
       getValue: function () {
-        let form = {}
-        form = this.form
+        let form = {};
+        form = this.form;
         return form
       }
     }

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -204,7 +204,7 @@
                                     <ul class="basicUl">
                                         <li style="width:50%;">姓名：{{patientInfo.name}}</li>
                                         <li style="width:50%;">性别：{{patientInfo.gender == 1 ? '男' : '女' }}</li>
-                                        <li style="width:50%;">年龄：{{patientInfo.age }}</li>
+                                        <li style="width:50%;">年龄：{{getAge(patientInfo.id_card_no)}}</li>
                                         <li style="width:50%;">电话：{{patientInfo.phone}}</li>
 
                                         <!--<span>过敏病史:</span>-->
@@ -372,7 +372,7 @@
 
 <script>
   import axios from 'axios'
-
+  import { jsGetAge, uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import noCharge from './components/noCharge'
   import charged from './components/charged'
@@ -524,6 +524,32 @@
       this.getPatientList()
     },
     methods: {
+      getAge(id_card_no){
+        if (id_card_no){
+
+          var thisLen = id_card_no.length;
+          var birth = '';
+          if (thisLen == 15) {
+            birth = '19' + id_card_no.substr(6, 6)
+          } else {
+            birth = id_card_no.substr(6, 8)
+          }
+          var births =
+            birth.substr(0, 4) +
+            '-' +
+            birth.substr(4, 2) +
+            '-' +
+            birth.substr(6, 2);
+          return jsGetAge(births, '-')
+
+        }else{
+
+          return 0
+
+        }
+
+
+      },
       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 || this.$store.getters.xt_user.org_id == 9990 ) {
           var that = this;

src/xt_pages/outpatientRegistration/index.vue

@@ -315,7 +315,7 @@
             <div class="nameTitle">患者挂号信息:</div>
             <div class="formMain">
                 <el-form class="basicForm" :model="form" :rules="rules" ref="form" label-width="100px">
-                    <el-form-item label="挂号类型：" prop="register" :validate-event="is_Name">
+                    <el-form-item label="挂号类型：" >
                         <el-select v-model="form.register" placeholder="请选择">
                             <el-option
                                     v-for="item in his_registers"
@@ -611,7 +611,6 @@
           name: [{ required: true, message: '患者姓名不能为空', trigger: 'blur' }],
           sex: [{ required: true, message: '患者性别不能为空', trigger: 'blur' }],
           idCard: [{ required: true, message: '证件号码不能为空', trigger: 'blur' }],
-          register: [{ required: true, message: '请选择挂号类型', trigger: 'blur' }],
           doctor: [{ required: true, message: '请选择医生', trigger: 'blur' }],
           department: [{ required: true, message: '请填写科室', trigger: 'blur' }],
           age: [{ required: true, message: '患者年龄不能为空', trigger: 'blur' }],
@@ -1121,12 +1120,6 @@
           this.$message.error('患者性别不能为空')
         }
 
-        if (this.form.register == '') {
-          this.$message.error('挂号类型不能为空');
-          this.is_Name = true;
-          return
-        }
-
         if (this.form.doctor == '') {
           this.$message.error('医生不能为空');
           this.is_Name = true;
@@ -1461,7 +1454,9 @@
         this.form.certificates = 2;
         this.form.id_card_type = 1
       }else{
+        this.form.settlementValue = 1;
         this.form.registrationFee = 0;
+        this.form.medicalExpenses = 0;
         this.form.certificates = 1;
         this.form.id_card_type = 2
       }