陈少旭 3 月之前
父節點
當前提交
0682a8ff9a

+ 4 - 6
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue 查看文件

@@ -1196,7 +1196,7 @@ export default {
1196 1196
         { value: '2302', label: '异地就医(2302)' },
1197 1197
         { value: '1111', label: '精一' },
1198 1198
         { value: '1112', label: '精二' },
1199
-        { value: '0', label: '自费' },
1199
+        { value: '999999', label: '自费' },
1200 1200
         { value: '118801', label: '118801' },
1201 1201
 
1202 1202
 
@@ -1792,7 +1792,7 @@ export default {
1792 1792
           this.newLoading = false
1793 1793
         })
1794 1794
       } else {
1795
-        if((this.org_id == 10644 && this.other_prescriptions[0].med_type == "1112") || (this.org_id == 10644 && this.other_prescriptions[0].med_type == "1111") || (this.org_id == 0 && this.other_prescriptions[0].med_type == "1111") || (this.org_id == 0 && this.other_prescriptions[0].med_type == "1112")) {
1795
+        if((this.org_id == 10644 && this.other_prescriptions[0].med_type == "1112") || (this.org_id == 10644 && this.other_prescriptions[0].med_type == "1111") || (this.other_prescriptions[0].med_type == "999999") ) {
1796 1796
           upload(form).then(response => {
1797 1797
             if (response.data.state == 0) {
1798 1798
               this.$message.error(response.data.msg)
@@ -5810,10 +5810,8 @@ export default {
5810 5810
             case 140104:
5811 5811
               return '门诊特殊病(140104)' + '处方' + index
5812 5812
               break
5813
-            case 140104:
5814
-              return '门诊特殊病(140104)' + '处方' + index
5815
-              break
5816
-            case 0:
5813
+
5814
+            case 999999:
5817 5815
               return '自费' + '处方' + index
5818 5816
               break
5819 5817
             case 118801:

+ 7 - 3
src/xt_pages/outpatientCharges/statementPrint.vue 查看文件

@@ -30,7 +30,7 @@
30 30
           :info="info"
31 31
           :paramsObj="paramsObj"
32 32
           :balanceAccounts="balanceAccounts"
33
-          v-if="org_id == 10138 || org_id == 10278 || org_id ==10610 || org_id==10537 || org_id == 0"
33
+          v-if="org_id == 10138 || org_id == 10278 || org_id ==10610 || org_id==10537"
34 34
         ></printThree>
35 35
         <printFour
36 36
           v-if="org_id == 9504 || org_id == 10028 || org_id == 10088 "
@@ -69,7 +69,7 @@
69 69
       <!-- 顺有好 -->
70 70
       <printSixtheen :info="info" v-if="org_id == 10697"></printSixtheen>
71 71
       <!-- 杏康 -->
72
-      <printSeventheen  :info="info" v-if=" org_id == 10721"></printSeventheen>
72
+      <printSeventheen  :info="info" v-if=" org_id == 10721 || org_id == 0"></printSeventheen>
73 73
       <printOne :info="info" v-if=" org_id != 9990 &&
74 74
             org_id != 10138 && org_id != 9504 && org_id != 10028 &&
75 75
             org_id != 10610 && org_id !=10537 && org_id !=10697 &&
@@ -81,7 +81,7 @@
81 81
             org_id != 10138 && org_id != 9504 &&  org_id != 10028 && org_id !=10697 &&
82 82
             org_id != 10278 && org_id != 10610 && org_id !=10537 && org_id != 10387 &&
83 83
             org_id != 10191 &&org_id != 10210 &&org_id != 10485  &&org_id != 10480 &&
84
-            org_id != 10510 &&org_id != 10633 && org_id != 10721   && this.paramsObj.balance_accounts_type == 2">
84
+            org_id != 10510 &&org_id != 10633 && org_id != 10721   &&org_id != 0  && this.paramsObj.balance_accounts_type == 2">
85 85
       </privateChargePrint>
86 86
     </div>
87 87
   </div>
@@ -1714,6 +1714,10 @@ export default {
1714 1714
 
1715 1715
                 }
1716 1716
                 that.info['Z_list'] = list
1717
+                console.log(" that.info")
1718
+                console.log(that.info.Z_list)
1719
+                console.log(" that.info")
1720
+
1717 1721
 
1718 1722
                 //获取所有项目类型进行去重
1719 1723
                 let med_chrgitm_types = []

+ 1 - 1
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue 查看文件

@@ -670,7 +670,7 @@ export default {
670 670
         { value: 2302, label: '异地就医(2302)' },
671 671
         { value: 1111, label: '精一' },
672 672
         { value: 1112, label: '精二' },
673
-        { value: 0, label: '自费' },
673
+        { value: 999999, label: '自费' },
674 674
         { value: 118801, label: '118801' }
675 675
 
676 676