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

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -60,6 +60,7 @@
       <printtwelve :info="info" v-if="org_id == 10480 "></printtwelve>
       <!-- 大冶 -->
       <printthirteen :info="info" v-if="org_id == 10510 || org_id == 0"></printthirteen>
+
       <printOne :info="info" v-if=" org_id != 9990 &&
             org_id != 10138 &&
             org_id != 9504 &&
@@ -1078,7 +1079,7 @@ export default {
                 that.info = response.data.data.info
                 that.p_admin = response.data.data.printor_admin
                 that.charge_admin = response.data.data.charge_admin
-
+                that.info['psn_cash_pay'] = response.data.data.psn_cash_pay
                 that.info['new_order'] = response.data.data.order
                 that.info['p_admin'] = that.p_admin
                 that.info['charge_admin'] = that.charge_admin

src/xt_pages/outpatientCharges/summary.vue

@@ -1380,6 +1380,7 @@ export default {
                 id_card_no: order.patient.id_card_no,
                 year: "2023",
                 month: order.setl_time.split(" ")[0].split("-")[1],
+                ddd:this.getTimes(order.settle_accounts_date),
                 code: data[b].code,
                 pric: data[b].total ,
                 item_name: data[b].name,
@@ -1409,7 +1410,7 @@ export default {
                 "医保类型": list[i].insutype,
                 "年": list[i].year,
                 "月": list[i].month,
-
+                "时间": list[i].ddd,
                 "药品编码": list[i].code,
                 "费用类型": list[i].item_type_name,
                 "名称": list[i].item_name,
@@ -1429,6 +1430,7 @@ export default {
               "医保类型",
               "年",
               "月",
+              "时间",
               "药品编码",
               "费用类型",
               "名称",
@@ -1444,6 +1446,7 @@ export default {
               "医保类型",
               "年",
               "月",
+              "时间",
               "药品编码",
               "费用类型",
               "名称",
@@ -1771,7 +1774,7 @@ export default {
           var tarList = []
           for (let i = 0; i < list.length; i++) {
             let obj = {
-              "周期": "2023年第三季度",
+              "周期": "2023年第四季度",
               "类别": "门诊",
               "医保目录编码": list[i].code,
               "医保目录名称": list[i].name,

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2592,7 +2592,33 @@ export default {
           //   }
           // }
           if (index == 1) {
-            console.log(this.prescriptions)
+            // console.log(this.prescriptions)
+
+            if (this.org_id == 10206 || this.org_id == 0){
+              console.log(this.prescriptions)
+
+              //药品
+              for(let i = 0; i < this.prescriptions.length; i++){
+                  for(let b = 0; b < this.prescriptions[i].advices.length; b++){
+                    if(this.prescriptions[i].advices[b].advice_id == 0) {
+                      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)
+                    }
+                  }
+              }
+              //耗材
+              for(let i = 0; i < this.prescriptions.length; i++){
+
+                  for(let b = 0; b < this.prescriptions[i].project.length; b++){
+                    if(this.prescriptions[i].project[b].type == 3){
+                      if(this.prescriptions[i].project[b].id == 0) {
+                        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)
+                      }
+                    }
+                  }
+              }
+            }
+
+
 
             if (this.org_id != 10206 && this.org_id != 0) {
               for (let i = 0; i < this.prescriptions.length; i++) {
@@ -2624,6 +2650,10 @@ export default {
               }
             }
 
+            //库存限制
+
+
+
 
             this.$emit('editKeepLoad', true)
             var str = ""
@@ -3013,19 +3043,19 @@ export default {
 
                   }
              }
-              createHisPrescription(data, params).then(response => {
-                if (response.data.state == 1) {
-                  this.$emit('change', this.patientInfo.id)
-                  this.$message.success('保存成功!')
-                  this.$emit('editKeepLoad', false)
-                  this.$parent.getInitData()
-                  this.getlist()
-                } else {
-                  this.$message.error(response.data.msg)
-                  this.$emit('editKeepLoad', false)
-
-                }
-              })
+              // createHisPrescription(data, params).then(response => {
+              //   if (response.data.state == 1) {
+              //     this.$emit('change', this.patientInfo.id)
+              //     this.$message.success('保存成功!')
+              //     this.$emit('editKeepLoad', false)
+              //     this.$parent.getInitData()
+              //     this.getlist()
+              //   } else {
+              //     this.$message.error(response.data.msg)
+              //     this.$emit('editKeepLoad', false)
+              //
+              //   }
+              // })
             }
         }
 
@@ -3119,6 +3149,25 @@ export default {
           }
         }
       }
+    },judgmentsDrugStock(bby01, bbx01,name,count){
+      for (let i = 0; i < this.zuobiao_drug.length; i++) {
+          if (this.zuobiao_drug[i].bby01 == bby01) {
+            if (this.zuobiao_drug[i].sysl < parseInt(count)){
+              this.$message.error(name + "库存不足，无法保存")
+              return
+            }
+          }
+      }
+
+    },judgmentsGoodStock(bby01, bbx01,name,specification_name,count){
+      for (let i = 0; i < this.zuobiao_project.length; i++) {
+        if (this.zuobiao_project[i].bbx01 == bbx01 && this.zuobiao_project[i].bby06 == specification_name) {
+          if (this.zuobiao_project[i].lsqty < parseInt(count)){
+            this.$message.error(name + "库存不足，无法保存")
+            return
+          }
+        }
+      }
     },
     addTab(targetName) {
 
@@ -3651,6 +3700,8 @@ export default {
                 groupno: index + temp_index,
                 hosp_appr_flag: '1',
                 execution_state:2,
+
+
               }
               if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
                 obj.prescribing_number = 1
@@ -3840,6 +3891,7 @@ export default {
               project_name: good_info[i].good_name,
               statistical_classification: '',
               single_dose: good_info[i].specification_name,
+              specification_name: good_info[i].specification_name,
               delivery_way: '',
               execution_frequency: '',
               number_days: 1,
@@ -3970,11 +4022,12 @@ export default {
                   this.$message.error(project[i].good_info.good_name + '库存不足')
                 }
 
-                if (project[i].good_info.zuobiao_stock_num <= 0 && this.org_id == 10206) {
-                  num++
-                  this.$refs.tabProjectTeam.toggleRowSelection(row)
-                  this.$message.error(project[i].good_info.good_name + '库存不足')
-                }
+                //TODO
+                // if (project[i].good_info.zuobiao_stock_num <= 0 && this.org_id == 10206) {
+                //   num++
+                //   this.$refs.tabProjectTeam.toggleRowSelection(row)
+                //   this.$message.error(project[i].good_info.good_name + '库存不足')
+                // }
 
                 if (num > 0) {
                   this.$refs.tabProjectTeam.clearSelection()

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1143,6 +1143,7 @@ export default {
       })
     },
     setMonthPrescription(month_prescriptions) {
+      console.log("--======-66666777--====")
 
       this.month_prescriptions = []
 
@@ -1271,6 +1272,14 @@ export default {
             // obj['medical_c/**/ode'] = project_month_prescriptions.project[a].project.medical_code
             obj['unit'] = project_month_prescriptions.project[a].unit
             obj['project_id'] = project_month_prescriptions.project[a].project_id
+
+
+            if(project_month_prescriptions.project[a].project_id == 12302){
+              console.log("--======---====")
+              console.log("--======---====")
+              console.log(count)
+            }
+
             count = count + parseFloat(project_month_prescriptions.project[a].count)
             // price = price + project_month_prescriptions.project[a].price
             obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
@@ -1945,7 +1954,8 @@ export default {
                     hosp_appr_flag: '1',
                     execution_state: 2,
                     is_self_drug: '',
-                    drug_way_count: '1'
+                    drug_way_count: '1',
+
 
                   }
 
@@ -2289,7 +2299,7 @@ export default {
                         execution_state: prescription.advices[b].execution_state,
                         is_medicine: prescription.advices[b].is_medicine,
                         is_self_drug: prescription.advices[b].is_self_drug.toString(),
-                        drug_way_count: prescription.advices[b].drug_way_count
+                        drug_way_count: prescription.advices[b].drug_way_count,
 
                       }
                       tempAdvice.push(obj)

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -113,7 +113,7 @@
       </el-table-column>
       <el-table-column align="center" label="金额" prop="total_all">
         <template slot-scope="scope">
-          <!-- <span v-if="scope.row.is_total == 1">{{ scope.row.total }}</span>  
+          <!-- <span v-if="scope.row.is_total == 1">{{ scope.row.total }}</span>
           <span v-if="scope.row.is_total == 2">{{ (scope.row.price * scope.row.count).toFixed(2) }}</span>   -->
           <span>{{
             (scope.row.count_number * scope.row.pric).toFixed(2)
@@ -455,7 +455,7 @@ export default {
             this.item_type = this.id;
           }
           console.log(this.item_type,'this.item_type')
-          
+
 
           if (this.keywords != "") {
             for (let i = 0; i < this.tableList.length; i++) {
@@ -1165,7 +1165,7 @@ export default {
     getLaboratoryCostTotal() {
       var total_price = 0;
       for (let i = 0; i < this.tableList.length; i++) {
-        if (this.tableList[i].cost_type == "化验费") {
+        if (this.tableList[i].cost_type == "化验费" || this.tableList[i].cost_type == "化验") {
           total_price +=
             this.tableList[i].count_number * this.tableList[i].pric;
         }