陈少旭 пре 8 месеци
родитељ
комит
00bf69216e

+ 74 - 43
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue Прегледај датотеку

@@ -1724,57 +1724,85 @@ export default {
1724 1724
         }) .catch(function(error) {
1725 1725
           this.newLoading = false
1726 1726
         })
1727
-
1728 1727
       } else {
1729
-        var that = this
1730
-        axios.get('http://127.0.0.1:9532/api/upload/get', {
1731
-          params: form,
1732
-          headers: {
1733
-            'Permission': 5
1734
-          }
1735
-        })
1736
-          .then(function(response) {
1728
+        if((this.org_id == 10644 && this.other_prescriptions[0].med_type == "1112") || (this.org_id == 10644 && this.other_prescriptions[0].med_type == "1111")) {
1729
+          upload(form).then(response => {
1737 1730
             if (response.data.state == 0) {
1738
-              that.$message.error(response.data.msg)
1739
-
1740
-              that.loadingtwo = false
1741
-              that.$refs.charge.hide()
1742
-
1731
+              this.$message.error(response.data.msg)
1732
+              this.loadingtwo = false
1733
+              this.newLoading = false
1734
+              this.$refs.charge.hide()
1743 1735
               return false
1744 1736
             } else {
1745
-              if (response.data.data.failed_code == -10) {
1737
+              this.$refs.charge.hide()
1738
+              this.radio = 2
1739
+              this.changeRadioAndPatient(2)
1740
+              this.loadingtwo = false
1741
+              this.state = '已收费'
1742
+              this.$message({ message: '收费成功', type: 'success' })
1743
+              this.$refs.charge.hide()
1744
+              this.loadingtwo = false
1745
+              this.newLoading = false
1746
+            }
1747
+          }) .catch(function(error) {
1748
+            this.newLoading = false
1749
+          })
1750
+        }else{
1746 1751
 
1747
-                that.$confirm(response.data.data.msg, '医保错误信息', {
1748
-                  confirmButtonText: '确 定',
1749
-                  type: 'warning'
1750
-                }).then(() => {
1751
-                  that.$refs.charge.hide()
1752
-                  that.changeRadioAndPatient(1)
1753
-                  that.newLoading = false
1754
-                }).catch(() => {
1755
-                  that.$refs.charge.hide()
1756
-                  that.changeRadioAndPatient(1)
1757
-                  that.newLoading = false
1758
-                })
1752
+          var that = this
1753
+          axios.get('http://127.0.0.1:9532/api/upload/get', {
1754
+            params: form,
1755
+            headers: {
1756
+              'Permission': 5
1757
+            }
1758
+          })
1759
+            .then(function(response) {
1760
+              if (response.data.state == 0) {
1761
+                that.$message.error(response.data.msg)
1759 1762
 
1760
-              } else {
1761
-                that.radio = 2
1762
-                that.changeRadioAndPatient(2)
1763
-                that.$refs.charge.hide()
1764
-                that.loadingtwo = false
1765
-                that.state = '已收费'
1766
-                that.$message({ message: '收费成功', type: 'success', duration: 5000 })
1767 1763
                 that.loadingtwo = false
1768
-                that.cal_one = this.cal_one - 1
1769
-                that.cal_two = this.cal_two + 1
1770
-                that.patientTableData.splice(this.current_index, 1)
1771
-                that.newLoading = false
1764
+                that.$refs.charge.hide()
1765
+
1766
+                return false
1767
+              } else {
1768
+                if (response.data.data.failed_code == -10) {
1769
+
1770
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
1771
+                    confirmButtonText: '确 定',
1772
+                    type: 'warning'
1773
+                  }).then(() => {
1774
+                    that.$refs.charge.hide()
1775
+                    that.changeRadioAndPatient(1)
1776
+                    that.newLoading = false
1777
+                  }).catch(() => {
1778
+                    that.$refs.charge.hide()
1779
+                    that.changeRadioAndPatient(1)
1780
+                    that.newLoading = false
1781
+                  })
1782
+
1783
+                } else {
1784
+                  that.radio = 2
1785
+                  that.changeRadioAndPatient(2)
1786
+                  that.$refs.charge.hide()
1787
+                  that.loadingtwo = false
1788
+                  that.state = '已收费'
1789
+                  that.$message({ message: '收费成功', type: 'success', duration: 5000 })
1790
+                  that.loadingtwo = false
1791
+                  that.cal_one = this.cal_one - 1
1792
+                  that.cal_two = this.cal_two + 1
1793
+                  that.patientTableData.splice(this.current_index, 1)
1794
+                  that.newLoading = false
1795
+                }
1772 1796
               }
1773
-            }
1774
-          })
1775
-          .catch(function(error) {
1776
-            that.newLoading = false
1777
-          })
1797
+            })
1798
+            .catch(function(error) {
1799
+              that.newLoading = false
1800
+            })
1801
+
1802
+        }
1803
+
1804
+
1805
+
1778 1806
       }
1779 1807
     },
1780 1808
     chargeCancel() {
@@ -3314,6 +3342,7 @@ export default {
3314 3342
         this.treatVisible = true
3315 3343
         // this.$router.push('/outpatientCharges/treatPrint?record_date=' + this.record_date + '&patient_id=' + this.patient_id + '&prescription_id=' + this.prescription_id)
3316 3344
       } else if (index == 4) {//收费
3345
+
3317 3346
         var ids = []
3318 3347
         for (let i = 0; i < prescriptions.length; i++) {
3319 3348
           ids.push(prescriptions[i].id)
@@ -3338,6 +3367,8 @@ export default {
3338 3367
             this.pwd = ''
3339 3368
           } else {
3340 3369
             if (this.activeName == 'first') {
3370
+
3371
+
3341 3372
               this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder,this.patientInfo.id)
3342 3373
             } else {
3343 3374
               this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder,this.patientInfo.id)

+ 18 - 6
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue Прегледај датотеку

@@ -2274,12 +2274,13 @@ export default {
2274 2274
       }
2275 2275
 
2276 2276
       this.state1 = info.sick_type
2277
-      if (this.state1 == 0 || this.state1 == '') {
2278
-        this.state1 = ''
2279
-        for (let i = 0; i < this.sick.length; i++) {
2280
-          this.state1 = this.sick[0].id
2281
-        }
2282
-      }
2277
+      // if (this.state1 == 0 || this.state1 == '') {
2278
+      //   this.state1 = ''
2279
+      //   for (let i = 0; i < this.sick.length; i++) {
2280
+      //     this.state1 = this.sick[0].id
2281
+      //
2282
+      //   }
2283
+      // }
2283 2284
 
2284 2285
       if (this.departmentValue == '' || this.departmentValue == 0) {
2285 2286
         if (department.length > 0) {
@@ -2296,6 +2297,12 @@ export default {
2296 2297
         this.state1 = 662
2297 2298
       }
2298 2299
 
2300
+      //
2301
+      // if (this.org_id == 10598 || this.org_id == 0) {
2302
+      //   this.state1 = 662
2303
+      // }
2304
+
2305
+
2299 2306
       if (info.id > 0) {
2300 2307
         this.doctorValue = info.doctor_id
2301 2308
         this.departmentValue = info.departments
@@ -2411,6 +2418,7 @@ export default {
2411 2418
         console.log('hhahahahah', this.patient_diagnose)
2412 2419
       }
2413 2420
 
2421
+      console.log('--------', info.sick_type)
2414 2422
       this.state1 = info.sick_type
2415 2423
       if (this.state1 == 0 || this.state1 == '') {
2416 2424
         this.state1 = ''
@@ -2423,6 +2431,10 @@ export default {
2423 2431
         this.state1 = 607
2424 2432
       }
2425 2433
 
2434
+      if (this.org_id == 10598 || this.org_id == 0) {
2435
+        this.state1 = 693
2436
+      }
2437
+
2426 2438
       if (this.departmentValue == '' || this.departmentValue == 0) {
2427 2439
         if (department.length > 0) {
2428 2440
           this.departmentValue = department[0].id