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

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -685,39 +685,50 @@
                     that.$message.error(response.data.msg)
                     return false
                   } else {
-                    var patient = response.data.data.patient
-
-                    if (that.form.id_card_type == 1) {
-                      that.form.id = patient.id
-                      that.form.name = patient.name
-                      that.form.gender = patient.gender
-                      that.form.age = patient.age
-                      that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
-                      that.form.phone = patient.phone
-                      that.form.id_card = patient.id_card_no
-                      that.form.medical_insurance_card = response.data.data.number
-                      that.form.social_type = parseInt(response.data.data.insutype)
-
-
-                    } else if (that.form.id_card_type == 2) {
-                      that.form.id = patient.id
-                      that.form.name = patient.name
-                      that.form.gender = patient.gender
-                      that.form.age = patient.age
-                      that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
-                      that.form.phone = patient.phone
-                      that.form.id_card = patient.id_card_no
+
+                    if (response.data.data.failed_code == -10) {
+                      that.$confirm(response.data.data.msg, '医保错误信息', {
+                        confirmButtonText: '确 定',
+                        type: 'warning'
+                      }).then(() => {
+
+                      }).catch(() => {
+                      })
                     } else {
-                      that.form.id = patient.id
-                      that.form.name = patient.name
-                      that.form.gender = patient.gender
-                      that.form.age = patient.age
-                      that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
-                      that.form.phone = patient.phone
-                      that.form.id_card = patient.id_card_no
-                      that.form.social_type = parseInt(response.data.data.insutype)
+
+                      var patient = response.data.data.patient
+
+                      if (that.form.id_card_type == 1) {
+                        that.form.id = patient.id
+                        that.form.name = patient.name
+                        that.form.gender = patient.gender
+                        that.form.age = patient.age
+                        that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+                        that.form.phone = patient.phone
+                        that.form.id_card = patient.id_card_no
+                        that.form.medical_insurance_card = response.data.data.number
+                        that.form.social_type = parseInt(response.data.data.insutype)
+
+                      } else if (that.form.id_card_type == 2) {
+                        that.form.id = patient.id
+                        that.form.name = patient.name
+                        that.form.gender = patient.gender
+                        that.form.age = patient.age
+                        that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+                        that.form.phone = patient.phone
+                        that.form.id_card = patient.id_card_no
+                      } else {
+                        that.form.id = patient.id
+                        that.form.name = patient.name
+                        that.form.gender = patient.gender
+                        that.form.age = patient.age
+                        that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+                        that.form.phone = patient.phone
+                        that.form.id_card = patient.id_card_no
+                        that.form.social_type = parseInt(response.data.data.insutype)
+                      }
+                      that.$message({ message: '读卡成功', type: 'success' })
                     }
-                    that.$message({ message: '读卡成功', type: 'success' })
                   }
                 })
                 .catch(function(error) {

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1511,7 +1511,12 @@ export default {
           this.month_prescriptions = []
           this.setMonthPrescription(response.data.data.month_prescriptions)
           this.curMonthPrescriptions = this.month_prescriptions[0]
-
+          this.form.diagnosis = []
+          for(let i = 0; i <  response.data.data.dia_arr.length;i++) {
+            if (response.data.data.dia_arr[i] > 0 || response.data.data.dia_arr[i].length > 0) {
+              this.form.diagnosis.push(parseInt(response.data.data.dia_arr[i]))
+            }
+          }
         } else {
           this.$message.error(response.data.msg)
         }
@@ -1536,7 +1541,12 @@ export default {
           this.month_prescriptions = []
           this.setMonthPrescription(response.data.data.month_prescriptions)
           this.curMonthPrescriptions = this.month_prescriptions[0]
-
+          this.form.diagnosis = []
+          for(let i = 0; i <  response.data.data.dia_arr.length;i++) {
+            if (response.data.data.dia_arr[i] > 0 || response.data.data.dia_arr[i].length > 0) {
+              this.form.diagnosis.push(parseInt(response.data.data.dia_arr[i]))
+            }
+          }
         } else {
           this.$message.error(response.data.msg)
         }
@@ -1668,17 +1678,24 @@ export default {
           .then(function(response) {
             if (response.data.state == 0) {
               that.$message.error(response.data.msg)
+
               that.loadingtwo = false
               that.$refs.charge.hide()
+
               return false
             } else {
               if (response.data.data.failed_code == -10) {
+
                 that.$confirm(response.data.data.msg, '医保错误信息', {
                   confirmButtonText: '确 定',
                   type: 'warning'
                 }).then(() => {
+                  that.$refs.charge.hide()
+                  that.changeRadioAndPatient(1)
                   that.newLoading = false
                 }).catch(() => {
+                  that.$refs.charge.hide()
+                  that.changeRadioAndPatient(1)
                   that.newLoading = false
                 })
 
@@ -2460,6 +2477,13 @@ export default {
             this.setMonthPrescription(response.data.data.month_prescriptions)
             this.curMonthPrescriptions = this.month_prescriptions[0]
 
+            this.form.diagnosis = []
+            for(let i = 0; i <  response.data.data.dia_arr.length;i++) {
+              if (response.data.data.dia_arr[i] > 0 || response.data.data.dia_arr[i].length > 0) {
+                this.form.diagnosis.push(parseInt(response.data.data.dia_arr[i]))
+              }
+            }
+
           } else {
             this.$message.error(response.data.msg)
           }
@@ -4938,13 +4962,8 @@ export default {
 
                 this.all_table_data.push(obj)
             }else{
-              console.log("count")
-              console.log(response.data.data.list[i].his_patient.length)
               if (response.data.data.list[i].his_patient.length > 0) {
-
                 for(let b = 0;b < response.data.data.list[i].his_patient.length; b++){
-                  console.log("his_patient")
-                  console.log(response.data.data.list[i].his_patient)
                   let obj = {
                     id: response.data.data.list[i].id,
                     name: response.data.data.list[i].name,
@@ -4961,9 +4980,6 @@ export default {
             }
           }
 
-          console.log("this.all_table_data")
-          console.log(this.all_table_data)
-
           let unChargePatient = []
           for (let i = 0; i < this.all_table_data.length; i++) {
             unChargePatient.push(this.all_table_data[i])
@@ -5702,6 +5718,14 @@ export default {
             this.info = response.data.data.info
             this.order = response.data.data.order
             this.addtions_charge = response.data.data.addtions_charge
+
+             // response.data.data.dia_arr
+            this.form.diagnosis = []
+            for(let i = 0; i <  response.data.data.dia_arr.length;i++) {
+              if (response.data.data.dia_arr[i] > 0 || response.data.data.dia_arr[i].length > 0) {
+                this.form.diagnosis.push(parseInt(response.data.data.dia_arr[i]))
+              }
+            }
             this.setMonthPrescription(response.data.data.month_prescriptions)
           }
         })