11

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1724,57 +1724,85 @@ export default {
         }) .catch(function(error) {
           this.newLoading = false
         })
-
       } else {
-        var that = this
-        axios.get('http://127.0.0.1:9532/api/upload/get', {
-          params: form,
-          headers: {
-            'Permission': 5
-          }
-        })
-          .then(function(response) {
+        if((this.org_id == 10644 && this.other_prescriptions[0].med_type == "1112") || (this.org_id == 10644 && this.other_prescriptions[0].med_type == "1111")) {
+          upload(form).then(response => {
             if (response.data.state == 0) {
-              that.$message.error(response.data.msg)
-
-              that.loadingtwo = false
-              that.$refs.charge.hide()
-
+              this.$message.error(response.data.msg)
+              this.loadingtwo = false
+              this.newLoading = false
+              this.$refs.charge.hide()
               return false
             } else {
-              if (response.data.data.failed_code == -10) {
+              this.$refs.charge.hide()
+              this.radio = 2
+              this.changeRadioAndPatient(2)
+              this.loadingtwo = false
+              this.state = '已收费'
+              this.$message({ message: '收费成功', type: 'success' })
+              this.$refs.charge.hide()
+              this.loadingtwo = false
+              this.newLoading = false
+            }
+          }) .catch(function(error) {
+            this.newLoading = false
+          })
+        }else{
 
-                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
-                })
+          var that = this
+          axios.get('http://127.0.0.1:9532/api/upload/get', {
+            params: form,
+            headers: {
+              'Permission': 5
+            }
+          })
+            .then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.msg)
 
-              } else {
-                that.radio = 2
-                that.changeRadioAndPatient(2)
-                that.$refs.charge.hide()
-                that.loadingtwo = false
-                that.state = '已收费'
-                that.$message({ message: '收费成功', type: 'success', duration: 5000 })
                 that.loadingtwo = false
-                that.cal_one = this.cal_one - 1
-                that.cal_two = this.cal_two + 1
-                that.patientTableData.splice(this.current_index, 1)
-                that.newLoading = 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
+                  })
+
+                } else {
+                  that.radio = 2
+                  that.changeRadioAndPatient(2)
+                  that.$refs.charge.hide()
+                  that.loadingtwo = false
+                  that.state = '已收费'
+                  that.$message({ message: '收费成功', type: 'success', duration: 5000 })
+                  that.loadingtwo = false
+                  that.cal_one = this.cal_one - 1
+                  that.cal_two = this.cal_two + 1
+                  that.patientTableData.splice(this.current_index, 1)
+                  that.newLoading = false
+                }
               }
-            }
-          })
-          .catch(function(error) {
-            that.newLoading = false
-          })
+            })
+            .catch(function(error) {
+              that.newLoading = false
+            })
+
+        }
+
+
+
       }
     },
     chargeCancel() {
@@ -3314,6 +3342,7 @@ export default {
         this.treatVisible = true
         // this.$router.push('/outpatientCharges/treatPrint?record_date=' + this.record_date + '&patient_id=' + this.patient_id + '&prescription_id=' + this.prescription_id)
       } else if (index == 4) {//收费
+
         var ids = []
         for (let i = 0; i < prescriptions.length; i++) {
           ids.push(prescriptions[i].id)
@@ -3338,6 +3367,8 @@ export default {
             this.pwd = ''
           } else {
             if (this.activeName == 'first') {
+
+
               this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder,this.patientInfo.id)
             } else {
               this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder,this.patientInfo.id)

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2274,12 +2274,13 @@ export default {
       }
 
       this.state1 = info.sick_type
-      if (this.state1 == 0 || this.state1 == '') {
-        this.state1 = ''
-        for (let i = 0; i < this.sick.length; i++) {
-          this.state1 = this.sick[0].id
-        }
-      }
+      // if (this.state1 == 0 || this.state1 == '') {
+      //   this.state1 = ''
+      //   for (let i = 0; i < this.sick.length; i++) {
+      //     this.state1 = this.sick[0].id
+      //
+      //   }
+      // }
 
       if (this.departmentValue == '' || this.departmentValue == 0) {
         if (department.length > 0) {
@@ -2296,6 +2297,12 @@ export default {
         this.state1 = 662
       }
 
+      //
+      // if (this.org_id == 10598 || this.org_id == 0) {
+      //   this.state1 = 662
+      // }
+
+
       if (info.id > 0) {
         this.doctorValue = info.doctor_id
         this.departmentValue = info.departments
@@ -2411,6 +2418,7 @@ export default {
         console.log('hhahahahah', this.patient_diagnose)
       }
 
+      console.log('--------', info.sick_type)
       this.state1 = info.sick_type
       if (this.state1 == 0 || this.state1 == '') {
         this.state1 = ''
@@ -2423,6 +2431,10 @@ export default {
         this.state1 = 607
       }
 
+      if (this.org_id == 10598 || this.org_id == 0) {
+        this.state1 = 693
+      }
+
       if (this.departmentValue == '' || this.departmentValue == 0) {
         if (department.length > 0) {
           this.departmentValue = department[0].id