Browse Source

提交代码

陈少旭 1 year ago
parent
commit
8632472a97

+ 16 - 1
src/xt_pages/outpatientCharges/components/registerDialog.vue View File

@@ -885,6 +885,7 @@
885 885
         this.form.age = ''
886 886
         this.form.id_card = ''
887 887
         this.form.register = ''
888
+
888 889
         this.form.doctor = ''
889 890
         this.form.department = ''
890 891
         this.form.registration_fee = ''
@@ -905,8 +906,22 @@
905 906
         if (departments.length > 0) {
906 907
           this.form.department = departments[0].id
907 908
         }
909
+        console.log("11231231231223233432423dddd312")
908 910
         if (doctors.length > 0) {
909
-          this.form.doctor = doctors[0].admin_user_id
911
+          if(this.$store.getters.xt_user.org_id == 10318 || this.$store.getters.xt_user.org_id == 0){
912
+            console.log("~~~~~~~")
913
+            this.form.doctor = 3127
914
+
915
+          }else{
916
+            console.log("-----------")
917
+
918
+            this.form.doctor = doctors[0].admin_user_id
919
+
920
+          }
921
+        }else{
922
+          console.log("~~~~~~~")
923
+          this.form.doctor = 3127
924
+
910 925
         }
911 926
 
912 927
         // this.form.name = patientInfo.name

+ 2 - 1
src/xt_pages/outpatientCharges/listPrint.vue View File

@@ -172,11 +172,11 @@
172 172
                 if (infos.advice && infos.advice.id == 0 && infos.project && infos.project.id > 0) {
173 173
                   obj['p_time'] = this.getTimes(infos.project.prescription.ctime)
174 174
                   obj['feedetl_sn'] = infos.feedetl_sn
175
+                  obj['type'] = infos.chrgitm_lv
175 176
 
176 177
                   if(infos.project.type == 2){
177 178
                     obj['name'] = infos.project.project.project_name
178 179
                     obj['code'] = infos.project.project.medical_code
179
-
180 180
                     obj['spec'] = ''
181 181
                     obj['unit'] =  infos.project.project.unit
182 182
                     obj['is_total']= 0
@@ -193,6 +193,7 @@
193 193
 
194 194
                 }
195 195
                 if (infos.advice && infos.advice.id > 0 && infos.project && infos.project.id == 0) {
196
+                  obj['type'] = infos.chrgitm_lv
196 197
                   obj['p_time'] = this.getTimes(infos.advice.prescription.ctime)
197 198
                   obj['name'] = infos.advice.drug.drug_name
198 199
                   obj['code'] = infos.advice.drug.medical_insurance_number

+ 17 - 0
src/xt_pages/outpatientCharges/listTemplate/printOne.vue View File

@@ -25,6 +25,9 @@
25 25
                 <td style="width:10%">单价(元)</td>
26 26
                 <td style="width:6%">数量</td>
27 27
                 <td style="width:10%">金额(元)</td>
28
+              <td v-if="$store.getters.xt_user.org_id == 10318 || $store.getters.xt_user.org_id == 0 " style="width:10%">医保类型</td>
29
+
30
+
28 31
             </tr>
29 32
             <tr v-for="item in list.slice(index * 15,(index * 15) + pageArr[index])">
30 33
                 <td style="width:15%">{{item.p_time}}</td>
@@ -35,6 +38,8 @@
35 38
                 <td style="width:10%">{{item.price}}</td>
36 39
                 <td style="width:6%">{{item.count}}{{item.unit}}</td>
37 40
                 <td style="width:10%">{{(item.price * item.count).toFixed(2)}}</td>
41
+              <td v-if="$store.getters.xt_user.org_id == 10318 || $store.getters.xt_user.org_id == 0 " style="width:10%">{{getMedicineInsuranceKind(item.type)}}</td>
42
+
38 43
             </tr>
39 44
         </table>
40 45
         <div class="tableBottom">
@@ -89,6 +94,18 @@
89 94
     //     this.getPage()
90 95
     // },
91 96
     methods:{
97
+      getMedicineInsuranceKind(type){
98
+        switch (type) {
99
+          case "01":
100
+            return '甲类';
101
+          case "02":
102
+            return '乙类';
103
+          case "03":
104
+            return '自费';
105
+            break;
106
+        }
107
+
108
+      },
92 109
       getNowTime: function () {
93 110
         let dateTime
94 111
         let yy = new Date().getFullYear()

+ 1 - 1
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue View File

@@ -3306,7 +3306,7 @@ export default {
3306 3306
           })
3307 3307
         }
3308 3308
       } else if (index == 6) {
3309
-        if (this.$store.getters.xt_user.org_id == 0 || 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) {
3309
+        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) {
3310 3310
           this.$refs.register9504.show()
3311 3311
         } else {
3312 3312
           this.$refs.register.show(this.doctors, this.department)

+ 1 - 0
src/xt_pages/outpatientCharges/summary.vue View File

@@ -2819,6 +2819,7 @@ export default {
2819 2819
       });
2820 2820
 
2821 2821
 
2822
+
2822 2823
     },
2823 2824
     export_detail_ten_three(){
2824 2825
       exportOrderInfo().then((response) => {

File diff suppressed because it is too large
+ 1043 - 1048
src/xt_pages/role/components/AdminInfoForm.vue