Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -1044,7 +1044,7 @@
                     </el-col>
 
                     <el-col :span="8" v-if="isShows('葡萄糖')">
-                        <el-form-item label="葡萄糖：" prop="amylaceum" :rules="isCheckmust('葡萄糖')">
+                        <el-form-item label="葡萄糖(mmol/L)：" prop="amylaceum" :rules="isCheckmust('葡萄糖')">
                             <el-input v-model="dialysisPrescription.amylaceum"></el-input>
                         </el-form-item>
                     </el-col>

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -94,7 +94,6 @@
 
         <el-select
           v-model="form.insuplc_admdvs"
-          multiple
           filterable
           remote
           reserve-keyword
@@ -723,6 +722,9 @@
         let params = {
           'id_card_type': this.form.id_card_type,
           'admin_user_id': this.$store.getters.xt_user.user.id,
+          'id': this.$store.getters.xt_user.user.id,
+          'id_card_no' :this.form.id_card,
+          'insuplc_admdvs':this.form.insuplc_admdvs,
           'certificates':this.form.certificates,
         }
 
@@ -745,8 +747,8 @@
                   })
 
                 }else {
+                  that.$message({ message: '读卡成功', type: 'success' })
                   var patient = response.data.data.patient
-
                   if (that.form.id_card_type == 1) {
                     that.form.id = patient.id
                     that.form.name = patient.name
@@ -771,6 +773,16 @@
                     that.form.id_card = patient.id_card_no
                     that.form.blac = response.data.data.blac
                     that.form.psn_desc = response.data.data.desc
+
+                    var temp_insuplc_admdvs = ""
+                    for(let i =0; i < response.data.data.info.output.insuinfo.length; i++){
+                      //险种一致，且参保没过期
+                      if(insutype == response.data.data.info.output.insuinfo[i].insutype && response.data.data.info.output.insuinfo[i].psn_insu_stas == 1)
+                        temp_insuplc_admdvs = response.data.data.info.output.insuinfo[i].insuplc_admdvs
+                      that.form.insuplc_admdvs = temp_insuplc_admdvs
+                    }
+
+
                   } else {
                     that.form.id = patient.id
                     that.form.name = patient.name
@@ -783,7 +795,6 @@
                     that.form.blac = response.data.data.blac
                     that.form.psn_desc = response.data.data.desc
                   }
-                  that.$message({ message: '读卡成功', type: 'success' })
                 }
               }
             })
@@ -950,11 +961,16 @@
 
 
       showTwo: function(doctors,departments,info,patient_info,insutype) {
-        console.log(this.$store.getters.insuplc_admdvs)
+        console.log(doctors)
+        console.log(departments)
+        console.log(patient_info)
+        console.log(info)
+        console.log(insutype)
+
+
+
         this.options =  this.$store.getters.insuplc_admdvs
-        console.log(this.options)
         this.list =  this.$store.getters.insuplc_admdvs
-        console.log(this.list)
 
         this.visibility = true
         // this.form = Object.assign({}, this.resetForm)
@@ -969,7 +985,6 @@
         this.form.age = ''
         this.form.id_card = ''
         this.form.register = ''
-
         this.form.doctor = ''
         this.form.department = ''
         this.form.registration_fee = ''
@@ -978,39 +993,18 @@
         this.form.phone = ''
         this.form.social_type = ''
         this.form.insuplc_admdvs =''
-
-        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
-        if (this.$store.getters.xt_user.org_id == 10188  || this.$store.getters.xt_user.org_id == 10217 || this.$store.getters.xt_user.org_id == 10191){
-          this.form.id_card_type = 1
-        }
+
         if (departments.length > 0) {
           this.form.department = departments[0].id
         }
-        console.log("11231231231223233432423dddd312")
         if (doctors.length > 0) {
-          if(this.$store.getters.xt_user.org_id == 10318 || this.$store.getters.xt_user.org_id == 0){
-            console.log("~~~~~~~")
-            this.form.doctor = 3127
-
-          }else{
-            this.form.doctor = doctors[0].admin_user_id
-          }
-        }else{
-          this.form.doctor = 3127
+          this.form.doctor = doctors[0].admin_user_id
         }
 
-        this.form.social_type = insutype
-        var temp_insuplc_admdvs = ""
-        for(let i =0; i < info.output.insuinfo.length; i++){
-          //险种一致，且参保没过期
-          if(insutype == info.output.insuinfo[i].insutype && info.output.insuinfo[i].psn_insu_stas == 1)
-          temp_insuplc_admdvs = info.output.insuinfo[i].insuplc_admdvs
-        }
-        this.form.insuplc_admdvs = temp_insuplc_admdvs
         this.form.id = patient_info.id
         this.form.name = patient_info.name
         this.form.gender = patient_info.gender
@@ -1031,9 +1025,24 @@
           '-' +
           birth.substr(6, 2)
         this.form.age = jsGetAge(births, '-')
-      },
+        this.form.social_type =  parseInt(insutype)
+        if(patient_info.insuplc_admdvs.length > 0){
+          for(let i = 0; i < this.options.length;i++){
+            if(this.options[i].value == parseInt(patient_info.insuplc_admdvs)){
+              this.form.insuplc_admdvs = this.options[i].value
+            }
+          }
+        }
+        var temp_insuplc_admdvs = ""
+        for(let i =0; i < info.output.insuinfo.length; i++){
+          //险种一致，且参保没过期
+          if(insutype == info.output.insuinfo[i].insutype && info.output.insuinfo[i].psn_insu_stas == 1)
+          temp_insuplc_admdvs = info.output.insuinfo[i].insuplc_admdvs
+          this.form.insuplc_admdvs = temp_insuplc_admdvs
+        }
 
 
+      },
       hide: function () {
         this.visibility = false
         this.$refs['formValue'].resetFields()

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -128,13 +128,16 @@
                        type="primary">挂号
             </el-button>
 
+<!--            <el-button  size="small"-->
+<!--                       @click="open(10086)"-->
+<!--                       type="primary">查询医保参保信息-->
+<!--            </el-button>-->
+
             <el-button v-loading="loadingone" size="small"
                        @click="open(20)"
                        type="primary">查询备案信息
             </el-button>
 
-
-
             <el-button  size="small"  v-if="(org_id == 10138 && this.order.is_upload_diagnose == 0 && this.order.order_status == 2) || (org_id == 10278 && this.order.is_upload_diagnose == 0 && this.order.order_status == 2)"
                         @click="openZF(1)"
                         type="primary">自费门诊就医上传(4205)
@@ -218,7 +221,7 @@
                             </el-button>
 
                               <el-select style="margin-right:5px;width:300px;"
-                                         v-model="item.diagnoses" multiple placeholder="诊断" v-if="org_id == 10721">
+                                         v-model="item.diagnoses" multiple placeholder="诊断" v-if="org_id == 10721 || org_id == 0">
                                 <el-option
                                   v-for="(item,index) in diagnoses"
                                   :key="index"
@@ -3398,6 +3401,9 @@ export default {
       this.other_prescriptions = prescriptions
 
       if (index == 1) {
+      }else if (index == 10086) {
+
+
       } else if (index == 2) {
         this.$router.push('/outpatientDoctorStation/printtwo?record=' + this.record_date)
       } else if (index == 3) {
@@ -3539,59 +3545,41 @@ export default {
         if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10088 || this.$store.getters.xt_user.org_id == 10278) {
           this.$refs.register9504.show()
         } else {
-
-          if(this.$store.getters.xt_user.org_id == 10721000){
+          if(this.$store.getters.xt_user.org_id == 10721 || this.org_id == 0){
             var  that= this
             axios.get('http://127.0.0.1:9532/test/net',{}).then(function(response) {
               if (response.data.state == 0) {
-                // that.$message.error(response.data.data.msg);
-                that.$confirm("请检查医保程序是否有打开", "提示", {
-                  confirmButtonText: "确 定",
-                  cancelButtonText: "取 消",
-                  type: "warning",
-                }).then(() => {
-                  var that = this
-                  let params={
-                    id_card_no: this.patientInfo.id_card_no,
-                    admin_user_id:this.$store.getters.xt_user.user.id,
+                  that.$refs.register.showTwo(that.doctors, that.department,"",that.patientInfo,"")
+                return false
+              } else {
+                let params={
+                  id_card_no: that.patientInfo.id_card_no,
+                  admin_user_id:that.$store.getters.xt_user.user.id,
+                }
+                axios.get('http://127.0.0.1:9532/zh/api/patient/info', {
+                  params: params,
+                  headers: {
+                    'Permission': 5
                   }
-                  axios.get('http://127.0.0.1:9532/zh/api/patient/info', {
-                    params: params,
-                    headers: {
-                      'Permission': 5
-                    }
-                  })
-                    .then(function(response) {
-                      if (response.data.state == 0) {
-                        that.$message.error(response.data.msg)
-                        that.loadingone = false
-                        return false
+                })
+                  .then(function(response) {
+                    if (response.data.state == 0) {
+                      that.$message.error(response.data.msg)
+                      that.$refs.register.showTwo(that.doctors, that.department,"",that.patientInfo,"")
+                      return false
+                    } else {
+                      if (response.data.data.failed_code == -10) {
+                        that.$refs.register.showTwo(that.doctors, that.department,"",that.patientInfo,"")
                       } else {
-                        that.loadingone = false
-                        if (response.data.data.failed_code == -10) {
-                          // that.$message.error(response.data.data.msg)
-                            this.$refs.register.showTwo(this.doctors, this.department,"")
-                        } else {
-                          this.$refs.register.showTwo(this.doctors, this.department,response.data.data.info)
-                        }
+                        that.$refs.register.showTwo(that.doctors, that.department,response.data.data.info,that.patientInfo,response.data.data.insutype)
                       }
-                    })
-                    .catch(function(error) {
-                    })
-                })
-                  .catch(() => {});
-                return false
-              } else {
-
+                    }
+                  })
+                  .catch(function(error) {
+                  })
               }
             }).catch(function(error) {
-              that.$confirm("数据异常，请检查医保程序是否有打开", "提示", {
-                confirmButtonText: "确 定",
-                cancelButtonText: "取 消",
-                type: "warning",
-              }).then(() => {
-              })
-                .catch(() => {});
+              that.$refs.register.showTwo(that.doctors, that.department,"",that.patientInfo,"")
             })
 
           }else{
@@ -3668,7 +3656,6 @@ export default {
           form['end_time'] = this.other_end_time_two
           form['settle_accounts_type'] = 2
         }
-
         if (this.hisPatientInfo.balance_accounts_type == 2) {
           this.$confirm('是否进行预结算', '预结算', {
             confirmButtonText: '确 定',

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -3200,11 +3200,13 @@ export default {
               }
 
 
-              if (this.org_id == 10721) {
+              if (this.org_id == 10721 || this.org_id == 0) {
                 for (let i = 0; i < data.prescriptions.length; i++) {
                   data.prescriptions[i]["diagnoses"] = data.prescriptions[i].diagnose.join(",")
                 }
               }
+              console.log(data.prescriptions)
+
               createHisPrescription(data, params).then(response => {
                 if (response.data.state == 1) {
                   this.$emit('change', this.patientInfo.id)

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-    store.dispatch('VerifyConfigList', []).then(() => {
-      next()
-    })
-  }
-  if (store.getters.permission_routers === undefined) {
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
-      next()
-    })
-  } else {
-    next()
-  }
-  return
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //   store.dispatch('VerifyConfigList', []).then(() => {
+  //     next()
+  //   })
+  // }
+  // if (store.getters.permission_routers === undefined) {
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //     next()
+  //   })
+  // } else {
+  //   next()
+  // }
+  // return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))