Browse Source

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

28169 10 months ago
parent
commit
5383507aef

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

60
       <printtwelve :info="info" v-if="org_id == 10480 "></printtwelve>
60
       <printtwelve :info="info" v-if="org_id == 10480 "></printtwelve>
61
       <!-- 大冶 -->
61
       <!-- 大冶 -->
62
       <printthirteen :info="info" v-if="org_id == 10510 || org_id == 0"></printthirteen>
62
       <printthirteen :info="info" v-if="org_id == 10510 || org_id == 0"></printthirteen>
63
+
63
       <printOne :info="info" v-if=" org_id != 9990 &&
64
       <printOne :info="info" v-if=" org_id != 9990 &&
64
             org_id != 10138 &&
65
             org_id != 10138 &&
65
             org_id != 9504 &&
66
             org_id != 9504 &&
1078
                 that.info = response.data.data.info
1079
                 that.info = response.data.data.info
1079
                 that.p_admin = response.data.data.printor_admin
1080
                 that.p_admin = response.data.data.printor_admin
1080
                 that.charge_admin = response.data.data.charge_admin
1081
                 that.charge_admin = response.data.data.charge_admin
1081
-
1082
+                that.info['psn_cash_pay'] = response.data.data.psn_cash_pay
1082
                 that.info['new_order'] = response.data.data.order
1083
                 that.info['new_order'] = response.data.data.order
1083
                 that.info['p_admin'] = that.p_admin
1084
                 that.info['p_admin'] = that.p_admin
1084
                 that.info['charge_admin'] = that.charge_admin
1085
                 that.info['charge_admin'] = that.charge_admin

+ 5 - 2
src/xt_pages/outpatientCharges/summary.vue View File

1380
                 id_card_no: order.patient.id_card_no,
1380
                 id_card_no: order.patient.id_card_no,
1381
                 year: "2023",
1381
                 year: "2023",
1382
                 month: order.setl_time.split(" ")[0].split("-")[1],
1382
                 month: order.setl_time.split(" ")[0].split("-")[1],
1383
+                ddd:this.getTimes(order.settle_accounts_date),
1383
                 code: data[b].code,
1384
                 code: data[b].code,
1384
                 pric: data[b].total ,
1385
                 pric: data[b].total ,
1385
                 item_name: data[b].name,
1386
                 item_name: data[b].name,
1409
                 "医保类型": list[i].insutype,
1410
                 "医保类型": list[i].insutype,
1410
                 "年": list[i].year,
1411
                 "年": list[i].year,
1411
                 "月": list[i].month,
1412
                 "月": list[i].month,
1412
-
1413
+                "时间": list[i].ddd,
1413
                 "药品编码": list[i].code,
1414
                 "药品编码": list[i].code,
1414
                 "费用类型": list[i].item_type_name,
1415
                 "费用类型": list[i].item_type_name,
1415
                 "名称": list[i].item_name,
1416
                 "名称": list[i].item_name,
1429
               "医保类型",
1430
               "医保类型",
1430
               "年",
1431
               "年",
1431
               "月",
1432
               "月",
1433
+              "时间",
1432
               "药品编码",
1434
               "药品编码",
1433
               "费用类型",
1435
               "费用类型",
1434
               "名称",
1436
               "名称",
1444
               "医保类型",
1446
               "医保类型",
1445
               "年",
1447
               "年",
1446
               "月",
1448
               "月",
1449
+              "时间",
1447
               "药品编码",
1450
               "药品编码",
1448
               "费用类型",
1451
               "费用类型",
1449
               "名称",
1452
               "名称",
1771
           var tarList = []
1774
           var tarList = []
1772
           for (let i = 0; i < list.length; i++) {
1775
           for (let i = 0; i < list.length; i++) {
1773
             let obj = {
1776
             let obj = {
1774
-              "周期": "2023年第季度",
1777
+              "周期": "2023年第季度",
1775
               "类别": "门诊",
1778
               "类别": "门诊",
1776
               "医保目录编码": list[i].code,
1779
               "医保目录编码": list[i].code,
1777
               "医保目录名称": list[i].name,
1780
               "医保目录名称": list[i].name,

+ 72 - 19
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue View File

2592
           //   }
2592
           //   }
2593
           // }
2593
           // }
2594
           if (index == 1) {
2594
           if (index == 1) {
2595
-            console.log(this.prescriptions)
2595
+            // console.log(this.prescriptions)
2596
+
2597
+            if (this.org_id == 10206 || this.org_id == 0){
2598
+              console.log(this.prescriptions)
2599
+
2600
+              //药品
2601
+              for(let i = 0; i < this.prescriptions.length; i++){
2602
+                  for(let b = 0; b < this.prescriptions[i].advices.length; b++){
2603
+                    if(this.prescriptions[i].advices[b].advice_id == 0) {
2604
+                      this.judgmentsDrugStock(this.prescriptions[i].advices[b].drug.bby01, this.prescriptions[i].advices[b].drug.bbx01,this.prescriptions[i].advices[b].drug_name,this.prescriptions[i].advices[b].prescribing_number)
2605
+                    }
2606
+                  }
2607
+              }
2608
+              //耗材
2609
+              for(let i = 0; i < this.prescriptions.length; i++){
2610
+
2611
+                  for(let b = 0; b < this.prescriptions[i].project.length; b++){
2612
+                    if(this.prescriptions[i].project[b].type == 3){
2613
+                      if(this.prescriptions[i].project[b].id == 0) {
2614
+                        this.judgmentsGoodStock(this.prescriptions[i].project[b].good_info.bby01, this.prescriptions[i].project[b].good_info.bbx01,this.prescriptions[i].project[b].good_info.good_name,this.prescriptions[i].project[b].good_info.specification_name,this.prescriptions[i].project[b].total)
2615
+                      }
2616
+                    }
2617
+                  }
2618
+              }
2619
+            }
2620
+
2621
+
2596
 
2622
 
2597
             if (this.org_id != 10206 && this.org_id != 0) {
2623
             if (this.org_id != 10206 && this.org_id != 0) {
2598
               for (let i = 0; i < this.prescriptions.length; i++) {
2624
               for (let i = 0; i < this.prescriptions.length; i++) {
2624
               }
2650
               }
2625
             }
2651
             }
2626
 
2652
 
2653
+            //库存限制
2654
+
2655
+
2656
+
2627
 
2657
 
2628
             this.$emit('editKeepLoad', true)
2658
             this.$emit('editKeepLoad', true)
2629
             var str = ""
2659
             var str = ""
3013
 
3043
 
3014
                   }
3044
                   }
3015
              }
3045
              }
3016
-              createHisPrescription(data, params).then(response => {
3017
-                if (response.data.state == 1) {
3018
-                  this.$emit('change', this.patientInfo.id)
3019
-                  this.$message.success('保存成功!')
3020
-                  this.$emit('editKeepLoad', false)
3021
-                  this.$parent.getInitData()
3022
-                  this.getlist()
3023
-                } else {
3024
-                  this.$message.error(response.data.msg)
3025
-                  this.$emit('editKeepLoad', false)
3026
-
3027
-                }
3028
-              })
3046
+              // createHisPrescription(data, params).then(response => {
3047
+              //   if (response.data.state == 1) {
3048
+              //     this.$emit('change', this.patientInfo.id)
3049
+              //     this.$message.success('保存成功!')
3050
+              //     this.$emit('editKeepLoad', false)
3051
+              //     this.$parent.getInitData()
3052
+              //     this.getlist()
3053
+              //   } else {
3054
+              //     this.$message.error(response.data.msg)
3055
+              //     this.$emit('editKeepLoad', false)
3056
+              //
3057
+              //   }
3058
+              // })
3029
             }
3059
             }
3030
         }
3060
         }
3031
 
3061
 
3119
           }
3149
           }
3120
         }
3150
         }
3121
       }
3151
       }
3152
+    },judgmentsDrugStock(bby01, bbx01,name,count){
3153
+      for (let i = 0; i < this.zuobiao_drug.length; i++) {
3154
+          if (this.zuobiao_drug[i].bby01 == bby01) {
3155
+            if (this.zuobiao_drug[i].sysl < parseInt(count)){
3156
+              this.$message.error(name + "库存不足,无法保存")
3157
+              return
3158
+            }
3159
+          }
3160
+      }
3161
+
3162
+    },judgmentsGoodStock(bby01, bbx01,name,specification_name,count){
3163
+      for (let i = 0; i < this.zuobiao_project.length; i++) {
3164
+        if (this.zuobiao_project[i].bbx01 == bbx01 && this.zuobiao_project[i].bby06 == specification_name) {
3165
+          if (this.zuobiao_project[i].lsqty < parseInt(count)){
3166
+            this.$message.error(name + "库存不足,无法保存")
3167
+            return
3168
+          }
3169
+        }
3170
+      }
3122
     },
3171
     },
3123
     addTab(targetName) {
3172
     addTab(targetName) {
3124
 
3173
 
3651
                 groupno: index + temp_index,
3700
                 groupno: index + temp_index,
3652
                 hosp_appr_flag: '1',
3701
                 hosp_appr_flag: '1',
3653
                 execution_state:2,
3702
                 execution_state:2,
3703
+
3704
+
3654
               }
3705
               }
3655
               if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
3706
               if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
3656
                 obj.prescribing_number = 1
3707
                 obj.prescribing_number = 1
3840
               project_name: good_info[i].good_name,
3891
               project_name: good_info[i].good_name,
3841
               statistical_classification: '',
3892
               statistical_classification: '',
3842
               single_dose: good_info[i].specification_name,
3893
               single_dose: good_info[i].specification_name,
3894
+              specification_name: good_info[i].specification_name,
3843
               delivery_way: '',
3895
               delivery_way: '',
3844
               execution_frequency: '',
3896
               execution_frequency: '',
3845
               number_days: 1,
3897
               number_days: 1,
3970
                   this.$message.error(project[i].good_info.good_name + '库存不足')
4022
                   this.$message.error(project[i].good_info.good_name + '库存不足')
3971
                 }
4023
                 }
3972
 
4024
 
3973
-                if (project[i].good_info.zuobiao_stock_num <= 0 && this.org_id == 10206) {
3974
-                  num++
3975
-                  this.$refs.tabProjectTeam.toggleRowSelection(row)
3976
-                  this.$message.error(project[i].good_info.good_name + '库存不足')
3977
-                }
4025
+                //TODO
4026
+                // if (project[i].good_info.zuobiao_stock_num <= 0 && this.org_id == 10206) {
4027
+                //   num++
4028
+                //   this.$refs.tabProjectTeam.toggleRowSelection(row)
4029
+                //   this.$message.error(project[i].good_info.good_name + '库存不足')
4030
+                // }
3978
 
4031
 
3979
                 if (num > 0) {
4032
                 if (num > 0) {
3980
                   this.$refs.tabProjectTeam.clearSelection()
4033
                   this.$refs.tabProjectTeam.clearSelection()

+ 12 - 2
src/xt_pages/outpatientDoctorStation/doctorDesk.vue View File

1143
       })
1143
       })
1144
     },
1144
     },
1145
     setMonthPrescription(month_prescriptions) {
1145
     setMonthPrescription(month_prescriptions) {
1146
+      console.log("--======-66666777--====")
1146
 
1147
 
1147
       this.month_prescriptions = []
1148
       this.month_prescriptions = []
1148
 
1149
 
1271
             // obj['medical_c/**/ode'] = project_month_prescriptions.project[a].project.medical_code
1272
             // obj['medical_c/**/ode'] = project_month_prescriptions.project[a].project.medical_code
1272
             obj['unit'] = project_month_prescriptions.project[a].unit
1273
             obj['unit'] = project_month_prescriptions.project[a].unit
1273
             obj['project_id'] = project_month_prescriptions.project[a].project_id
1274
             obj['project_id'] = project_month_prescriptions.project[a].project_id
1275
+
1276
+
1277
+            if(project_month_prescriptions.project[a].project_id == 12302){
1278
+              console.log("--======---====")
1279
+              console.log("--======---====")
1280
+              console.log(count)
1281
+            }
1282
+
1274
             count = count + parseFloat(project_month_prescriptions.project[a].count)
1283
             count = count + parseFloat(project_month_prescriptions.project[a].count)
1275
             // price = price + project_month_prescriptions.project[a].price
1284
             // price = price + project_month_prescriptions.project[a].price
1276
             obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
1285
             obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
1945
                     hosp_appr_flag: '1',
1954
                     hosp_appr_flag: '1',
1946
                     execution_state: 2,
1955
                     execution_state: 2,
1947
                     is_self_drug: '',
1956
                     is_self_drug: '',
1948
-                    drug_way_count: '1'
1957
+                    drug_way_count: '1',
1958
+
1949
 
1959
 
1950
                   }
1960
                   }
1951
 
1961
 
2289
                         execution_state: prescription.advices[b].execution_state,
2299
                         execution_state: prescription.advices[b].execution_state,
2290
                         is_medicine: prescription.advices[b].is_medicine,
2300
                         is_medicine: prescription.advices[b].is_medicine,
2291
                         is_self_drug: prescription.advices[b].is_self_drug.toString(),
2301
                         is_self_drug: prescription.advices[b].is_self_drug.toString(),
2292
-                        drug_way_count: prescription.advices[b].drug_way_count
2302
+                        drug_way_count: prescription.advices[b].drug_way_count,
2293
 
2303
 
2294
                       }
2304
                       }
2295
                       tempAdvice.push(obj)
2305
                       tempAdvice.push(obj)

+ 3 - 3
src/xt_pages/outpatientTool/components/gatherStatistics.vue View File

113
       </el-table-column>
113
       </el-table-column>
114
       <el-table-column align="center" label="金额" prop="total_all">
114
       <el-table-column align="center" label="金额" prop="total_all">
115
         <template slot-scope="scope">
115
         <template slot-scope="scope">
116
-          <!-- <span v-if="scope.row.is_total == 1">{{ scope.row.total }}</span>  
116
+          <!-- <span v-if="scope.row.is_total == 1">{{ scope.row.total }}</span>
117
           <span v-if="scope.row.is_total == 2">{{ (scope.row.price * scope.row.count).toFixed(2) }}</span>   -->
117
           <span v-if="scope.row.is_total == 2">{{ (scope.row.price * scope.row.count).toFixed(2) }}</span>   -->
118
           <span>{{
118
           <span>{{
119
             (scope.row.count_number * scope.row.pric).toFixed(2)
119
             (scope.row.count_number * scope.row.pric).toFixed(2)
455
             this.item_type = this.id;
455
             this.item_type = this.id;
456
           }
456
           }
457
           console.log(this.item_type,'this.item_type')
457
           console.log(this.item_type,'this.item_type')
458
-          
458
+
459
 
459
 
460
           if (this.keywords != "") {
460
           if (this.keywords != "") {
461
             for (let i = 0; i < this.tableList.length; i++) {
461
             for (let i = 0; i < this.tableList.length; i++) {
1165
     getLaboratoryCostTotal() {
1165
     getLaboratoryCostTotal() {
1166
       var total_price = 0;
1166
       var total_price = 0;
1167
       for (let i = 0; i < this.tableList.length; i++) {
1167
       for (let i = 0; i < this.tableList.length; i++) {
1168
-        if (this.tableList[i].cost_type == "化验费") {
1168
+        if (this.tableList[i].cost_type == "化验费" || this.tableList[i].cost_type == "化验") {
1169
           total_price +=
1169
           total_price +=
1170
             this.tableList[i].count_number * this.tableList[i].pric;
1170
             this.tableList[i].count_number * this.tableList[i].pric;
1171
         }
1171
         }