Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1774,7 +1774,7 @@
                     </table>
                   </td>
                 </tr>
-                <tr v-if="org_id!=10402">
+                <tr v-if="org_id!=10402 && org_id!=10206 && org_id!=0">
                   <td style="padding: 0; position: relative" colspan="2">
                     <table class="inside_table">
                       <tbody>
@@ -1946,7 +1946,7 @@
                   </td>
                 </tr>
 
-                 <tr v-if="org_id == 10402">
+                 <tr v-if="org_id == 10402 || org_id == 0 || org_id == 10206">
                   <td style="padding: 0; position: relative" colspan="2">
                     <table class="inside_table">
                       <tbody>

src/xt_pages/dialysis/details/consumable/dialysisParameterCountPrint.vue

@@ -40,8 +40,8 @@
                </tr>
               </tbody>
             </table>
-            
-         
+
+
 
           </div>
         </div>
@@ -103,7 +103,7 @@
      this.getDialysisParameterGoodList()
     },
     methods: {
-    
+
      getTimeOne(val) {
         if(val == ""){
         return ""
@@ -134,7 +134,7 @@
             this.startdialogVisible = true
             var list = response.data.data.list
             console.log("list232323223222wid",list)
-            
+
             var anticoagulantList = []
             if(list!=null && list.length>0){
               for(let i=0;i<list.length;i++){
@@ -226,7 +226,7 @@
                 hisarr[i].count = hisarr[i].child.length
                 this.tableList.push(hisarr[i])
               }
-             
+
             }
             var dialysisDialyszersArr = []
             var dialyzerPerfusionApparaArr = []
@@ -234,8 +234,8 @@
             var dialysisStrainerArr = []
             for(let i=0;i<list.length;i++){
              for(let j=0;j<list[i].dialysis_dialyszers_arr.length;j++){
-              
-               dialysisDialyszersArr.push(list[i].dialysis_dialyszers_arr[j])  
+
+               dialysisDialyszersArr.push(list[i].dialysis_dialyszers_arr[j])
              }
              for(let z=0;z<list[i].dialyzer_perfusion_apparatus_arr.length;z++){
               dialyzerPerfusionApparaArr.push(list[i].dialyzer_perfusion_apparatus_arr[z])
@@ -250,7 +250,7 @@
             console.log("透析器",dialysisDialyszersArr)
             console.log("透析器/灌流器",dialyzerPerfusionApparaArr)
             console.log("灌流器",dialysisIrrigationArr)
-             
+
            let obj = {}
            let objOne = {}
            let objTwo = {}
@@ -271,15 +271,15 @@
               a.specification_name = i
               Arr.push(a);
             }
-          
+
            for(let i=0;i<dialyzerPerfusionApparaArr.length;i++){
             if(objOne[dialyzerPerfusionApparaArr[i]]){
                 objOne[dialyzerPerfusionApparaArr[i]] +=1
              }else{
               objOne[dialyzerPerfusionApparaArr[i]] = 1
-             }   
+             }
            }
-           
+
            for (let i in objOne) {
               let a = {};
               a[i] = objOne[i];
@@ -294,7 +294,7 @@
               objTwo[dialysisIrrigationArr[i]] +=1
              }else{
               objTwo[dialysisIrrigationArr[i]] = 1
-             }   
+             }
            }
 
            for (let i in objTwo) {
@@ -322,7 +322,7 @@
               objThree[dialysisStrainerArr[i]] +=1
              }else{
               objThree[dialysisStrainerArr[i]] = 1
-             }   
+             }
            }
 
            for (let i in objThree) {
@@ -333,13 +333,14 @@
               a.specification_name = i
               Arr.push(a);
             }
-           
-         
+
+
             if(Arr.length >0){
               for(let i=0;i<Arr.length;i++){
                  this.tableList.push(Arr[i])
               }
             }
+
            }
         })
       },

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -4359,6 +4359,19 @@ export default {
         }
       
         console.log("时间我我我哦我我",this.doctor_advices)
+        if(this.org_id == 10265){
+          var docArr = []
+          if(this.doctor_advices!=null && this.doctor_advices.length>0){
+            for(let i=0;i<this.doctor_advices.length;i++){
+              if(this.doctor_advices[i].delivery_way!='口服' && this.doctor_advices[i].delivery_way!='中药口服'){
+                  docArr.push(this.doctor_advices[i])
+              }
+            }
+          }
+          this.doctor_advices = [] 
+          this.doctor_advices = docArr
+        }
+       
         if (this.doctor_advices.length <= 6) {
           var nl = 6;
           this.print_length = 6;

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -728,6 +728,98 @@ export default {
     }
   },
   methods: {
+    getZuobiaoGoodStock(){
+      var that = this
+      axios.get("http://127.0.0.1:9532" + '/nmg/coordinate/querystockgood', {
+      })
+        .then(function(response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.msg)
+            that.loadingtwo = false
+            return false
+          } else {
+            if (response.data.data.failed_code == -10) {
+              that.$confirm(response.data.data.msg, '医保错误信息', {
+                confirmButtonText: '确 定',
+                type: 'warning'
+              }).then(() => {
+
+              }).catch(() => {
+              })
+
+            } else {
+              that.zuobiao_project  = response.data.data.project
+              for (let i = 0; i < that.zuobiao_project.length; i++) {
+                for (let b = 0; b < that.tabProject.length; b++) {
+                  if (that.zuobiao_project[i].bbx01 == that.tabProject[b].bbx01 &&  that.zuobiao_project[i].bby06 == that.tabProject[b].single_dose){
+                    console.log( that.zuobiao_project[i].lsqty)
+                    console.log( that.tabProject[b].zuobiao_stock_num)
+                    that.tabProject[b].zuobiao_stock_num = that.zuobiao_project[i].lsqty
+                    that.tabProject[b].price = that.zuobiao_project[i].price
+                  }
+                }
+              }
+
+
+            }
+          }
+        })
+        .catch(function(error) {
+        })
+
+
+
+
+
+    },
+    getZuobiaoDrugStock(){
+      var that = this
+      axios.get('http://127.0.0.1:9532' + '/nmg/coordinate/querystockdrug', {})
+        .then(function(response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.msg)
+            that.loadingtwo = false
+            return false
+          } else {
+            if (response.data.data.failed_code == -10) {
+              that.$confirm(response.data.data.msg, '医保错误信息', {
+                confirmButtonText: '确 定',
+                type: 'warning'
+              }).then(() => {
+
+              }).catch(() => {
+              })
+
+            } else {
+              that.zuobiao_drug = response.data.data.drug
+              console.log('坐标～～坐标')
+              console.log(that.zuobiao_drug)
+              console.log(response.data.data.drug)
+              console.log('坐标～～坐标')
+
+              // that.zuobiao_project  = response.data.data.project
+              //跟坐标数据进行匹配，如果bbx01相等的话则，替换库存数量
+              for (let i = 0; i < that.zuobiao_drug.length; i++) {
+                for (let b = 0; b < that.drugs.length; b++) {
+                  if (that.zuobiao_drug[i].bby01 == that.drugs[b].bby01) {
+                    that.drugs[b]['zuobiao_stock_num'] = that.zuobiao_drug[i].sysl
+                    that.drugs[b].min_price = that.zuobiao_drug[i].lsj
+
+                  }
+
+                }
+              }
+              console.log('坐标～～坐标')
+              console.log(that.drugs)
+              console.log('坐标～～坐标')
+
+            }
+          }
+        })
+        .catch(function(error) {
+        })
+
+    },
     getzuobiao(){
 
       if(this.org_id == 10206){

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -115,6 +115,9 @@
 
           </el-tabs>
           <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子处方'">
+            <el-button v-if="org_id == 10206" size="small" ref="button_three" @click="open_four()" type="primary">刷新库存</el-button>
+
+
             <el-button size="small" ref="button_one" @click="open(1)" type="primary"
                        v-loading="saveLoading">保存
             </el-button>
@@ -655,8 +658,10 @@ export default {
     openPrint() {
       // this.centerDialogVisible = true
       this.getPrescriptionList(this.patientInfo.id, this.record_date)
+    },open_four(){
+      this.$refs.prescriptions.getZuobiaoGoodStock()
+      this.$refs.prescriptions.getZuobiaoDrugStock()
     },
-
     // 电子病历打印
     opentwo(index) {
       if (index == 1) {
@@ -973,7 +978,6 @@ export default {
 
           //排班
           for (let i = 0; i < response.data.data.list_two.length; i++) {
-            console.log('hahhahahahahahahah', response.data.data.list_two)
             //未就诊
             if (response.data.data.list_two[i].prescription.length == 0 && response.data.data.list_two[i].his_patient.id == 0) {
               let obj = {