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/registerDialog9504.vue

                :close-on-press-escape="isClose">
 
         <el-form :model="form" :rules="rules" ref="formValue" label-width="100px">
-            <el-form-item label="患者姓名：" prop="name" :validate-event="is_Name">
+            <el-form-item label="患者姓名：" prop="name" >
                 <el-autocomplete
                         class="checkSearch"
                         popper-class="my-autocomplete"
                 </el-autocomplete>
             </el-form-item>
 
-            <el-form-item label="性别：" prop="gender" :validate-event="is_Name">
+            <el-form-item label="性别：" prop="gender" >
                 <el-select v-model="form.gender" placeholder="请选择" style="width:100%;">
                     <el-option
                             v-for="item in sex"
 
             </el-form-item>
 
-            <el-form-item label="年龄：" prop="age" :validate-event="is_Name">
+            <el-form-item label="年龄：" prop="age" >
                 <el-input v-model="form.age"></el-input>
             </el-form-item>
 
 
-            <el-form-item label="出生日期：" prop="birthday" :validate-event="is_Name">
+            <el-form-item label="出生日期：" prop="birthday" >
                 <el-date-picker v-model="form.birthday" type="date" format="yyyy-MM-dd"
                                 value-format="yyyy-MM-dd" placeholder="选择日期" style="width:100%;"></el-date-picker>
             </el-form-item>
             </el-form-item>
 
 
-            <el-form-item label="证件类型：" prop="certificates" :validate-event="is_Name">
+            <el-form-item label="证件类型：" prop="certificates" >
                 <el-select v-model="form.certificates" placeholder="请选择" style="width:100%;">
                     <el-option
                             v-for="item in certificates"
                 </el-select>
             </el-form-item>
 
-            <el-form-item label="证件号码：" prop="id_card" :validate-event="is_Name">
+            <el-form-item label="证件号码：" prop="id_card">
                 <el-input v-model="form.id_card"></el-input>
             </el-form-item>
 
             </el-form-item>
 
 
-            <el-form-item label="读卡类型：" prop="id_card_type" :validate-event="is_Name">
+            <el-form-item label="读卡类型：" prop="id_card_type">
                 <el-select v-model="form.id_card_type" placeholder="请选择">
                     <el-option
                             v-for="item in IDCardTypes"
                 </div>
             </el-form-item>
 
-            <el-form-item label="挂号类型：" prop="register" :validate-event="is_Name">
+            <el-form-item label="挂号类型：" prop="register" >
                 <el-select v-model="form.register" placeholder="请选择" style="width:100%;" @change="changeRegister">
                     <el-option
                             v-for="item in register"
             <el-form-item label="诊疗费：">
                 <el-input readonly v-model="form.medical_expenses"></el-input>
             </el-form-item>
+
+            <el-form-item label="医生：" prop="doctor" >
+                <el-select v-model="form.doctor" placeholder="请选择" @change="changeDoctor">
+                    <el-option
+                            v-for="(item,index) in doctors"
+                            :key="index"
+                            :label="item.user_name"
+                            :value="item.admin_user_id">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="科室：" prop="department" >
+                <el-select v-model="form.department" placeholder="请选择">
+                    <el-option
+                            v-for="(item,index) in departments"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.id">
+                    </el-option>
+                </el-select>
+            </el-form-item>
         </el-form>
 
         <span slot="footer" class="dialog-footer">
         ],
 
 
-
-
         form: {
           id: '',
           settlement_value: '',
       }
     },
     props: {
-
+      departments:{
+        type: Array,
+      },
+      doctors:{
+        type: Array,
+      },
       titles: {
         type: String,
         default: ''
       diagnoses: Array,
     },
     methods: {
+      changeDoctor() {
+        for (let i = 0; i < this.doctors.length; i++) {
+          if (this.doctors[i].admin_user_id == this.form.doctor) {
+            console.log(this.doctors[i].department_id)
+            this.form.department = this.doctors[i].department_id
+            if(this.form.department == 0){
+
+              this.form.department = ""
+            }
+          }
+        }
+      },
       changeRegister(value){
         if (value != 4){
           this.form.registration_fee = 10

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

         <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" :department="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>

src/xt_pages/outpatientRegistration/index.vue

         <div class="position">
             <bread-crumb :crumbs='crumbs'></bread-crumb>
         </div>
-        <div class="app-container">
+        <div v-if="this.$store.getters.xt_user.org_id == 9504" class="app-container">
+            <div class="nameTitle">患者基本信息:</div>
+            <div class="formMain">
+                <el-form class="basicForm" :model="form" :rules="rules2" ref="form" label-width="100px">
+
+                    <el-form-item label="患者姓名：" prop="name" :validate-event="is_Name">
+                        <el-autocomplete
+                                class="checkSearch"
+                                popper-class="my-autocomplete"
+                                v-model="form.name"
+                                :fetch-suggestions="querySearchAsync"
+                                :trigger-on-focus="false"
+                                placeholder="请输入病人名字"
+                                @select="handleSelect"
+                                style="width:160px;"
+                        >
+                            <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                            <template slot-scope="{ item }">
+                                <div class="name">{{ item.name }}</div>
+                            </template>
+                        </el-autocomplete>
+                    </el-form-item>
+
+
+                    <el-form-item label="性别：" prop="sex" :validate-event="is_Name">
+                        <el-select v-model="form.sex" placeholder="请选择">
+                            <el-option
+                                    v-for="item in sex"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item label="年龄：" prop="age" :validate-event="is_Name">
+                        <el-input v-model="form.age"></el-input>
+                    </el-form-item>
+
+
+                    <el-form-item label="出生日期：" prop="birthday" :validate-event="is_Name">
+                        <el-date-picker v-model="form.birthday" type="date" @change="getBirthday"
+                                        placeholder="选择日期"></el-date-picker>
+                    </el-form-item>
+
+                    <el-form-item label="手机号码：" prop="phone">
+                        <el-input v-model="form.phone"></el-input>
+                    </el-form-item>
+
+
+                    <el-form-item label="证件类型：" prop="certificates" :validate-event="is_Name">
+                        <el-select v-model="form.certificates" placeholder="请选择">
+                            <el-option
+                                    v-for="item in certificates"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item label="证件号码：" prop="idCard" :validate-event="is_Name">
+                        <el-input v-model="form.idCard"></el-input>
+                    </el-form-item>
+
+
+                    <el-form-item label="结算类型：">
+                        <el-select v-model="form.settlementValue" placeholder="请选择">
+                            <el-option
+                                    v-for="item in settlement"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+
+                    <el-form-item label="社保类型：">
+                        <el-select v-model="form.social_type" placeholder="请选择">
+                            <!-- <el-option
+                            v-for="(item,index) in getDictionaryDataConfig('system','social_type')"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.id">
+                            </el-option> -->
+                            <el-option
+                                    v-for="item in medicalCare"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+
+                    <el-form-item label="读卡类型：" prop="id_card_type" :validate-event="is_Name">
+                        <el-select v-model="form.id_card_type" placeholder="请选择">
+                            <el-option
+                                    v-for="item in IDCardTypes"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item class="specialFormItem" label="医保卡号：">
+                        <div style="display:flex;">
+                            <el-input v-model="form.medicalInsuranceCard"></el-input>
+                            <el-button style="margin-left:10px;" type="primary" @click="reading">读卡</el-button>
+                        </div>
+                    </el-form-item>
+
+                </el-form>
+            </div>
+            <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-select v-model="form.register" placeholder="请选择">
+                            <el-option
+                                    v-for="item in register"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+
+
+                    <el-form-item label="医疗类别：">
+                        <el-select v-model="form.medicalCare" placeholder="请选择">
+                            <el-option
+                                    v-for="(item,index) in medical_care"
+                                    :key="index"
+                                    :label="item.label"
+                                    :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item label="医生：" prop="doctor" :validate-event="is_Name">
+                        <el-select v-model="form.doctor" placeholder="请选择" @change="changeDoctor">
+                            <el-option
+                                    v-for="item in doctorList"
+                                    :key="item.admin_user_id"
+                                    :label="item.user_name"
+                                    :value="item.admin_user_id">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="科室：" prop="department" :validate-event="is_Name">
+                        <el-select v-model="form.department" placeholder="请选择">
+                            <el-option
+                                    v-for="item in departmentList"
+                                    :key="item.id"
+                                    :label="item.name"
+                                    :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item label="挂号费：">
+                        <el-input v-model.number="form.registrationFee"></el-input>
+                    </el-form-item>
+                    <el-form-item label="诊疗费：">
+                        <el-input v-model.number="form.medicalExpenses"></el-input>
+                    </el-form-item>
+                    <el-form-item label="合计：">
+                        <el-input v-model.number="total" readonly></el-input>
+                    </el-form-item>
+                </el-form>
+                <el-button style="float:right" @click="saveHisPatient9504('form')" type="primary">挂号</el-button>
+            </div>
+
+        </div>
+
+        <div v-else class="app-container">
             <div class="nameTitle">患者基本信息:</div>
             <div class="formMain">
                 <el-form class="basicForm" :model="form" :rules="rules" ref="form" label-width="100px">
           psn_cert_type: '01',
           psn_name: '杨美英',
           age: 60.7
+        },
+        rules2: {
+          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' }],
+          birthday: [{ required: true, message: '患者出生日期不能为空', trigger: 'blur' }],
+          certificates: [{ required: true, message: '证件类型不能为空', trigger: 'change' }],
+          id_card_type: [{ required: true, message: '读卡类型不能为空', trigger: 'change' }],
+
+
         },
         rules: {
           name: [{ required: true, message: '患者姓名不能为空', trigger: 'blur' }],
             this.departmentList = department
           }
         })
+      },saveHisPatient9504(formName){
+        if (this.form.name == '') {
+          this.$message.error('患者姓名不能为空')
+          this.is_Name = true
+          return
+        }
+
+        if (this.form.sex == '') {
+          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
+          return
+        }
+
+        if (this.form.department == '') {
+          this.$message.error('科室不能为空')
+          this.is_Name = true
+          return
+        }
+        if (this.form.age == '') {
+          this.$message.error('患者年龄不能为空')
+          this.is_Name = true
+          return
+        }
+        if (this.form.birthday == '') {
+          this.$message.error('出生日期不能为空')
+          this.is_Name = true
+          return
+        }
+        if (this.form.id_card_type == '') {
+          this.$message.error('读卡类型不能为空')
+          this.is_Name = true
+          return
+        }
+
+        if (this.form.idCard == '') {
+          this.$message.error('证件号码不能为空')
+          this.is_Name = true
+          return
+        }
+
+        if (this.form.p_type == '') {
+          this.$message.error('处方类型不能为空')
+          this.is_Name = true
+          return
+        }
+
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            var params = {
+              id: this.form.id,
+              settlement_value: this.form.settlementValue,
+              medical_insurance_card: this.form.medicalInsuranceCard,
+              name: this.form.name,
+              sex: this.form.sex,
+              id_card_type: this.form.id_card_type,
+              certificates: this.form.certificates,
+              medical_care: this.form.medicalCare,
+              birthday: moment(new Date(this.form.birthday)).format('YYYY-MM-DD'),
+              age: parseInt(this.form.age),
+              id_card: this.form.idCard,
+              register: this.form.register,
+              doctor: this.form.doctor,
+              department: this.form.department,
+              costChecked: this.check,
+              registration_fee: this.form.registrationFee,
+              medical_expenses: this.form.medicalExpenses,
+              cost: this.form.cost,
+              total: this.total,
+              phone: this.form.phone,
+              social_type: this.form.social_type,
+              p_type: this.form.p_type,
+              diagnosis: this.form.diagnosis,
+              sick_type: this.form.sick_type
+            }
+            params['record_time'] = this.record_date,
+              params['admin_user_id'] = this.$store.getters.xt_user.user.id
+            this.loadingone = true
+
+            if (this.$store.getters.xt_user.org_id == 9504) {
+              var that = this
+              axios.get('http://127.0.0.1:9532/sz/api/register/get', {
+                params: params
+              })
+                .then(function(response) {
+                  if (response.data.state == 0) {
+                    that.$message.error(response.data.msg)
+                    that.loadingone = false
+                    that.$refs.register.hide()
+                    return false
+                  } else {
+                    if (response.data.data.failed_code == -10){
+                      that.$message.error(response.data.data.msg)
+                    }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
+                    }
+                  }
+                })
+                .catch(function(error) {
+
+                })
+            } else if (this.$store.getters.xt_user.org_id == 9919) {
+              var that = this
+
+              axios.get('http://127.0.0.1:9532/api/register/get', {
+                params: params
+              })
+                .then(function(response) {
+                  if (response.data.state == 0) {
+                    that.$message.error(response.data.msg)
+                    that.loadingone = false
+                    that.$refs.register.hide()
+                    return false
+                  } 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
+                  }
+                })
+                .catch(function(error) {
+
+                })
+            } else {
+              saveHisPatient(params).then(response => {
+                if (response.data.state == 1) {
+                  var patient = response.data.data.patient
+                  this.getTodaySchedulePatient()
+                  this.$message.success('保存成功')
+                  this.form.settlementValue = '',
+                    this.form.medicalInsuranceCard = '',
+                    this.form.name = '',
+                    this.form.sex = '',
+                    this.form.certificates = '',
+                    this.form.medicalCare = '',
+                    this.form.birthday = '',
+                    this.form.age = '',
+                    this.form.idCard = '',
+                    this.form.register = '',
+                    this.form.doctor = '',
+                    this.form.department = '',
+                    this.form.costChecked = false,
+                    this.form.registrationFee = '',
+                    this.form.medicalExpenses = '',
+                    this.form.cost = '',
+                    this.form.total = '' ,
+                    this.form.phone = '',
+                    this.form.social_type = ''
+                } else {
+                  this.$message.error('今日患者已挂号!')
+                }
+              })
+
+            }
+
+          }
+        })
+
+
+
+
       },
       saveHisPatient(formName) {
         if (this.form.name == '') {