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

src/xt_pages/hospitalStation/components/dayPrescriptionTable.vue

         })
 
       },deleteDrug:function(index, row){
-        if(this.prescription.order_status == 2){
-          this.$message.error('该处方已经结算，无法删除');
+        if(this.prescription.order_status == 2 || this.prescription.order_status == 4){
+          this.$message.error('该处方已经结算或者已经上传医保系统，无法删除');
           return
         }
         this.$confirm("药品删除后不可恢复，是否确认删除", "删除", {
         return name
       },
       deleteProject(row,i){
-        if(this.prescription.order_status == 2){
-          this.$message.error('该处方已经结算，无法删除');
+        if(this.prescription.order_status == 2 || this.prescription.order_status == 4){
+          this.$message.error('该处方已经结算或者已经上传医保系统，无法删除');
           return
         }
         this.$confirm("项目删除后不可恢复，是否确认删除", "删除", {

src/xt_pages/hospitalStation/components/deskPrescription.vue

         }
 
         if (this.dayorMonth == 'day') {
-          if (this.curPrescriptions.order_status == 2) {
-            this.$message.error('当前处方已经结算,无法保存')
+          if (this.curPrescriptions.order_status == 2 ||this.curPrescriptions.order_status == 4 ) {
+            this.$message.error('当前处方已经结算或者已经上传医保系统,无法保存')
             return
           }
           if (this.doctorValue.length <= 0) {
 
       },
       removeTab(targetName) {
-        if (this.curPrescriptions.order_status == 2) {
-          this.$message.error('该处方已经结算，无法删除')
+        if (this.curPrescriptions.order_status == 2 || this.curPrescriptions.order_status == 4) {
+          this.$message.error('该处方已经结算或者已经上传医保系统，无法删除')
           return
         }
         if (targetName == '处方1') {
       clearSelection() {
         this.$refs.tabProjectTeam.clearSelection()
       }
-    }, 
+    },
     mounted() {
-     
+
       this.request_record_date = this.record_date
       // this.getInitData()
       //获取所有项目

src/xt_pages/hospitalStation/doctorDesk.vue

         // })
       },
       changeOther(patient_id) {
-        this.radio = 2
-        let params = {
-          'record_date': this.record_date,
-          'type': this.radio,
-          'sch_type': this.schedule_type
+        if (this.radio == 2){
+          if (this.patientTableData.length > 0) {
+            for(let i = 0; i < this.patientTableData.length; i++){
+              if(this.patientTableData[i].id == patient_id){
+                this.$refs.tab.setCurrentRow(this.patientTableData[i])
+                this.oldCurrentRow = this.patientTableData[i]
+                this.getPatientInfo(this.patientTableData[i])
+              }
+            }
+          }
+        }else{
 
-        }
-        this.patientTableData = []
+          this.radio = 2
+          let params = {
+            'record_date': this.record_date,
+            'type': this.radio,
+            'sch_type': this.schedule_type
 
-        this.un_cure_data = []
-        this.cure_data = []
-        this.all_data = []
-        getHospitalPatientList(params).then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
-            return false
-          } else {
-            this.patientTableData = response.data.data.list
-            this.all_data = this.patientTableData
+          }
+          this.patientTableData = []
 
-            this.patientTableDataTwo = response.data.data.list
-            this.cal_one = response.data.data.total_one
-            this.cal_two = response.data.data.total_two
-            this.admin_info = response.data.data.info
+          this.un_cure_data = []
+          this.cure_data = []
+          this.all_data = []
 
-            if (this.patientTableData.length > 0) {
-              for(let i = 0; i < this.patientTableData.length; i++){
-                if(this.patientTableData[i].id == patient_id){
-                  this.$refs.tab.setCurrentRow(this.patientTableData[i])
-                  this.oldCurrentRow = this.patientTableData[i]
-                  this.getPatientInfo(this.patientTableData[i])
 
+          getHospitalPatientList(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.patientTableData = response.data.data.list
+              this.all_data = this.patientTableData
+
+              this.patientTableDataTwo = response.data.data.list
+              this.cal_one = response.data.data.total_one
+              this.cal_two = response.data.data.total_two
+              this.admin_info = response.data.data.info
+
+              if (this.patientTableData.length > 0) {
+                for(let i = 0; i < this.patientTableData.length; i++){
+                  if(this.patientTableData[i].id == patient_id){
+                    this.$refs.tab.setCurrentRow(this.patientTableData[i])
+                    this.oldCurrentRow = this.patientTableData[i]
+                    this.getPatientInfo(this.patientTableData[i])
+
+
+                  }
 
                 }
 
               }
-
             }
-          }
 
-        })
+          })
+
+
+        }
+
 
         // getSchedulePatientList(params).then(response => {
         //   if (response.data.state == 0) {
       let tableHeight = document.body.clientHeight - 323
       this.tableHeight = tableHeight
       this.org_id = this.$store.getters.xt_user.template_info.org_id
-     
+
     },
 
     mounted() {

src/xt_pages/hospitalStation/index.vue

                     </el-form-item>
 
 
+                    <el-form-item label="社保类型：">
+                        <el-select v-model="form.social_type" placeholder="请选择" style="width:100%;">
+                            <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="人员类别：">
+                        <el-select v-model="form.psn_type" placeholder="请选择" style="width:100%;">
+                            <el-option
+                                    v-for="item in PsnTypes"
+                                    :key="item.value"
+                                    :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-->
     },
     data() {
       return {
+        PsnTypes:[
+          { value: 11, label: '在职' },
+          { value: 21, label: '退休' },
+          { value: 31, label: '离休' },
+          { value: 32, label: '老红军' },
+          { value: 33, label: '一至六级残废军人' },
+          { value: 34, label: '医疗照顾人员' },
+          { value: 41, label: '学龄前儿童' },
+          { value: 42, label: '中小学生' },
+          { value: 43, label: '大学生' },
+          { value: 50, label: '成年居民（非从业）' },
+          { value: 60, label: '老年居民' },
+          { value: 91, label: '其他人员' },
+
+
+
+        ],
         settlement: [
           { value: 1, label: '医保' },
           { value: 2, label: '自费' },
           { value: 11, label: '普通门诊' },
           // {value: 12, label: '门诊挂号'},
           // {value: 13, label: '急诊'},
-          { value: 14, label: '门诊特殊病' }
+          { value: 14, label: '门诊慢性病' }
           // {value: 15, label: '门诊统筹'},
           // {value: 16, label: '门诊慢性病'},
           // {value: 21, label: '普通住院'}
 
         ],
+        medicalCare: [{
+          value: 390,
+          label: '城乡居民基本医疗保险'
+        }, {
+          value: 310,
+          label: '职工基本医疗保险'
+        }],
         sick: [],
         diagnoses: [],
         crumbs: [
           { path: false, name: '住院登记' }
         ],
         form: {
+          social_type:'',
+          psn_type:'',
           start_time: '',
           id: 0,
           sick_type: '',
           '-' +
           birth.substr(6, 2)
         this.form.age = jsGetAge(births, '-')
+
+        var that = this
+        let params={
+          id_card_no: this.form.id_card_no,
+          admin_user_id:this.$store.getters.xt_user.user.id,
+
+        }
+        axios.get('http://127.0.0.1:9532/zh/api/patient/info', {
+          params: params,
+          headers: {
+            'Permission': 5
+          }
+        })
+        that.then(function(response) {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              that.loadingone = false
+              return false
+            } else {
+              that.loadingone = false
+              if (response.data.data.failed_code == -10) {
+                // that.$message.error(response.data.data.msg)
+                that.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+
+                  this.form.psn_type = parseNumber(response.data.data.info.output.insuinfo.psn_type)
+                  this.form.social_type = parseNumber(response.data.data.insutype)
+
+                }).catch(() => {
+                })
+              } else {
+
+
+              }
+            }
+          })
+          .catch(function(error) {
+
+          })
       },
       querySearchAsync(keyword, cb) {
         let key = ''
               diagnosis: this.form.diagnosis,
               sick_type: this.form.sick_type,
               start_time: this.form.start_time,
+              social_type: this.form.social_type,
+              psn_type: this.form.psn_type,
               balance_accounts_type: this.form.settlement_value
+
             }
             params['record_time'] = this.record_date
             params['admin_user_id'] = this.$store.getters.xt_user.user.id
         this.form.id_card_type = 2
       }
 
+      if(this.$store.getters.xt_user.org_id == 10215) {
+        this.form.med_type = 14
+        this.form.sick_type = 421
+      }
+
       this.getInitData()
       //获取当前机构有人员信息
       this.getAllDoctorList()

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

           { value: 11, label: '普通门诊' },
           // { value: 12, label: '门诊挂号' },
           // { value: 13, label: '急诊' },
-          { value: 14, label: '门诊特殊病' }
+          { value: 14, label: '门诊慢性病' }
           // { value: 15, label: '门诊统筹' },
           // { value: 16, label: '门诊慢性病' },
           // { value: 21, label: '普通住院' }

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

           }
 
           if (this.hisPatientInfo.id_card_type == 1) {
-            if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10088) {
+            if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10106 ) {
               this.pwdFormVisible = true
               this.pwd = ''
             } else {