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

src/api/drug/drug.js

     params: params
   })
 }
+
+export function getDrugInventoryWarehouseInfoList(params) {
+  return request({
+    url: '/api/stock/getdruginfolist',
+    method: 'Get',
+    params: params
+  })
+}

src/api/stock.js

     params: params
   })
 }
+
+export function getwarehouseinfolist(params) {
+  return request({
+    url: '/api/stock/getwarehouseinfolist',
+    method: 'get',
+    params: params
+  })
+}

src/store/modules/globalConfig.js

         id: 13,
         name: '那屈肝素钙',
         type: 1,
-        shouji: 2,
-        weichi: 2,
-        zongliang: 2,
+        shouji: 1,
+        weichi: 1,
+        zongliang: 1,
         gaimingcheng: -1,
         gaijiliang: -1,
         shouji_unit: 'mg',

src/xt_pages/dialysis/details/DialysisPrescription.vue

           <label>目标超滤量 : </label>
           <span class="content">{{ target_ultrafiltration != "0" ? target_ultrafiltration : ""}}</span>
           
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10345  && this.$store.getters.xt_user.template_info.org_id != 10346  && this.$store.getters.xt_user.template_info.org_id != 10249"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345  || this.$store.getters.xt_user.template_info.org_id == 10346  || this.$store.getters.xt_user.template_info.org_id == 10249" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10345  && this.$store.getters.xt_user.template_info.org_id != 10346  && this.$store.getters.xt_user.template_info.org_id != 10395"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345  || this.$store.getters.xt_user.template_info.org_id == 10346  || this.$store.getters.xt_user.template_info.org_id == 10395" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
         </li>
 
          <li v-if="isShow('目标超滤量') && this.$store.getters.xt_user.template_info.org_id == 10290">

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

 
         <el-table-column label="推送医嘱" align="center" width="1280">
            <template slot-scope="scope">
-             {{getAdviceContent(scope.row.patient_id)}}
-             {{getHisAdviceContent(scope.row.patient_id)}}
+             <span v-if="config.is_open !=1">{{getAdviceContent(scope.row.patient_id)}}</span> 
+            <span v-if="config.is_open == 1"> {{getHisAdviceContent(scope.row.patient_id)}}</span>
            </template>
         </el-table-column>
      
         adviceList:[],
         templateList:[],
         startdialogVisible:false,
-        schedule_type:"",
-        partion_type:"",
+        schedule_type:0,
+        partion_type:0,
         druglist:[],
         tableList:[],
+        config:{},
       }
     },
     created() {
       this.getlist()
     },
     methods: {
+      open(){
+
+      },
       getlist(){
         getDialysisAdviceTemplateList(this.query).then(response=>{
           if(response.data.state == 1){
             var adviceList = response.data.data.adviceList
             this.adviceList = adviceList
             var templateList = response.data.data.templateList
+            var druglist = response.data.data.drugList
+            for(let i=0;i<templateList.length;i++){
+              templateList[i].advice_desc = ""
+             for(let j=0;j<druglist.length;j++){
+               if(templateList[i].drug_id == druglist[j].id){
+                 templateList[i].advice_desc = druglist[j].dose + druglist[j].dose_unit +"*"+druglist[j].min_unit +druglist[j].min_number+"/"+druglist[j].max_unit
+               }
+             }
+            }
+            console.log("医嘱模版",templateList)
             this.templateList = templateList
+           
+            this.config = response.data.data.config
+            
           }
         })
       },
              console.log("listwo222222",list)
              var adviceList = response.data.data.adviceList
              console.log("adviceList",adviceList)
-             if(adviceList!=null && adviceList.length > 0){
-               let dataInfo = {}
-                adviceList.forEach((item, index) => {
-                let { advice_name } = item
-                if (!dataInfo[advice_name]) {
-                  dataInfo[advice_name] = {
-                    advice_name:item.advice_name,
-                    child: [],
-                    count:0,
-                    drug_id:item.drug_id,
-                    specification_name:item.advice_desc,
+             var config = response.data.data.config
+             console.log("config",config)
+             if(config.is_open!=1){
+               if(adviceList!=null && adviceList.length > 0){
+                let dataInfo = {}
+                  adviceList.forEach((item, index) => {
+                  let { advice_name } = item
+                  if (!dataInfo[advice_name]) {
+                    dataInfo[advice_name] = {
+                      advice_name:item.advice_name,
+                      child: [],
+                      count:0,
+                      drug_id:item.drug_id,
+                      specification_name:item.advice_desc,
+                      patient_id:item.patient_id,
+                    }
+                  }
+                })
+                let arr = Object.values(dataInfo)
+                if(arr.length > 0){
+                  for(let i=0;i<adviceList.length;i++){
+                    for(let j=0;j<arr.length;j++){
+                      if(adviceList[i].advice_name == arr[j].advice_name){
+                          arr[j].child.push(adviceList[i])
+                      }
+                    }
                   }
                 }
-              })
-              let arr = Object.values(dataInfo)
-               if(arr.length > 0){
-                 for(let i=0;i<adviceList.length;i++){
+               
+                this.tableList = []
+                for(let i=0;i<list.length;i++){
                   for(let j=0;j<arr.length;j++){
-                     if(adviceList[i].advice_name == arr[j].advice_name){
-                        arr[j].child.push(adviceList[i])
-                     }
+                    if(list[i].patient_id == arr[j].patient_id){
+                      this.tableList.push(arr[j])
+                    }
                   }
-                 }
-               }
-              console.log("xinar232323232",arr)
-              this.tableList = []
-              this.tableList = arr
+                }
+               
+              }
              }
+          
            
 
 
              var templateList = response.data.data.templateList
-           
-              console.log("templateList",templateList)
-             if(templateList!=null && templateList.length > 0){
-                let dataInfoOne = {}
-                adviceList.forEach((item, index) => {
-                let { advice_name } = item
-                if (!dataInfoOne[advice_name]) {
-                  dataInfoOne[advice_name] = {
-                    advice_name:item.advice_name,
-                    child: [],
-                    count:0,
-                    specification_name:this.getSpecification(item.drug_id),
-                    drug_id:item.drug_id,
+             console.log("templatelist",templateList)
+             if(config.is_open == 1){
+               if(templateList!=null && templateList.length > 0){
+                  let dataInfoOne = {}
+                  templateList.forEach((item, index) => {
+                  let { advice_name } = item
+                  if (!dataInfoOne[advice_name]) {
+                    dataInfoOne[advice_name] = {
+                      advice_name:item.advice_name,
+                      child: [],
+                      count:0,
+                      specification_name:this.getSpecification(item.drug_id),
+                      drug_id:item.drug_id,
+                      patient_id:item.patient_id,
+                    }
+                  }
+                })
+                let hisarr = Object.values(dataInfoOne)
+                if(hisarr.length > 0){
+                  for(let i=0;i<templateList.length;i++){
+                    for(let j=0;j<hisarr.length;j++){
+                      if(templateList[i].drug_id == hisarr[j].drug_id){
+                          hisarr[j].child.push(templateList[i])
+                      }
+                    }
                   }
                 }
-              })
-              let hisarr = Object.values(dataInfoOne)
-               if(hisarr.length > 0){
-                 for(let i=0;i<templateList.length;i++){
+                console.log("hisarr",hisarr)
+                this.tableList = []
+                 for(let i=0;i<list.length;i++){
                   for(let j=0;j<hisarr.length;j++){
-                     if(templateList[i].advice_name == hisarr[j].advice_name){
-                        hisarr[j].child.push(templateList[i])
-                     }
+                    if(list[i].patient_id == hisarr[j].patient_id){
+                      this.tableList.push(hisarr[j])
+                    }
                   }
-                 }
-               }
-              this.tableList = []
-              console.log("hisarrw22222222",hisarr)
-              this.tableList = hisarr
+                }
+              }
              }
+     
            
            
             
       formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
       },
+   
       getAdviceContent(patient_id){
         var newArr = []
         var his_str = ""
-        if(this.templateList!=null && this.templateList.length > 0){
-          for(let i=0;i<this.templateList.length;i++){
-            if(patient_id == this.templateList[i].patient_id){
-              newArr.push(this.templateList[i])
+        if(this.adviceList!=null && this.adviceList.length > 0){
+          for(let i=0;i<this.adviceList.length;i++){
+            if(patient_id == this.adviceList[i].patient_id){
+              newArr.push(this.adviceList[i])
             }
           }
         }
         if(newArr!=null && newArr.length > 0){
           for(let i=0;i<newArr.length;i++){
-            his_str += newArr[i].advice_name +''+newArr[i].advice_desc +''+ newArr[i].prescribing_number +''+newArr[i].prescribing_number_unit + "。"
+            his_str += newArr[i].advice_name +' '+newArr[i].advice_desc +' '+ newArr[i].prescribing_number +' '+newArr[i].prescribing_number_unit + "。"
           }
         }
         return his_str
       },
       getHisAdviceContent(patient_id){
         var arr = []
-        for(let i=0;i<this.adviceList.length;i++){
-          if(patient_id == this.adviceList[i].patient_id){
-             arr.push(this.adviceList[i])
+        for(let i=0;i<this.templateList.length;i++){
+          if(patient_id == this.templateList[i].patient_id){
+             arr.push(this.templateList[i])
           }
         } 
         var str = ""
         if(arr!=null && arr.length > 0){
           for(let i=0;i<arr.length;i++){
-            str += arr[i].advice_name +''+ arr[i].advice_desc+'' + arr[i].prescribing_number+'' + arr[i].prescribing_number_unit +  "。"
+            str += arr[i].advice_name +' '+ arr[i].advice_desc+' ' + arr[i].prescribing_number+' ' + arr[i].prescribing_number_unit +  "。"
           }
         }
         return str 
         var specification_name = ""
         for(let i=0;i<this.druglist.length;i++){
           if(id == this.druglist[i].id){
-            specification_name = this.druglist[i].dose+this.druglist[i].dose_unit +"*"+this.druglist[i].min_nubmer +this.druglist[i].min_unit +"/"+this.druglist[i].max_unt
+            specification_name = this.druglist[i].dose+this.druglist[i].dose_unit +"*"+this.druglist[i].min_number+this.druglist[i].min_unit +"/"+this.druglist[i].max_unit
           }
         }
         return specification_name

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

         </div>
       </div>
       <div>
+        <el-button size="small" icon="el-icon-printer" @click="exportList" type="primary">打印</el-button>
         <el-button size="small" icon="el-icon-printer" @click="exportList" type="primary">导出</el-button>
         <el-button size="small" type="primary" @click="statistics">统计表</el-button>
       </div>
           :label="item.filed_name_cn"
         >
           <template slot-scope="scope">
-             <!-- <span>{{scope.row.good_type[index].name}}</span> -->
              {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}}
           </template>
 
         </el-table-column>
 
+       <el-table-column  align="center"  width="100" label="备注">
+           <template slot-scope="scope">
+            {{scope.row.dialysis_solution.remark}}
+           </template>
+        </el-table-column>
+
       </el-table>
     </div>
 
         hemodialysisPipelinesOptions:[],
         startDialogVisible:false,
         tableList:[],
-        schedule_type:"",
-        partion_type:"",
+        schedule_type:0,
+        partion_type:0,
       }
     },
     created() {
-      this.dialysate_formulation =  getDataConfig(  
-          'hemodialysis',
-          'dialysate_formulation'
-      )
-      this.body_fluid_option = this.$store.getters.body_fluid
-      this.displace_liqui_part_option = this.$store.getters.displace_liqui
-      this.blood_access_option = this.$store.getters.blood_access
-      this.blood_access_option = getDataConfig('hemodialysis', 'vascular_access_desc')
-      this.hemodialysisPipelinesOptions = getDataConfig('hemodialysis', 'hemodialysis_pipelines')
-      var filedList = this.$store.getters.xt_user.fileds
-      for (let i = 0; i < filedList.length; i++) {
-        if ( filedList[i].module == 1 && filedList[i].is_show == 1) {
-          this.rowList.push(filedList[i])
-        }
-      }
-      console.log("行33333333333333",this.rowList)
-      this.getAllZone()
       let date = uParseTime(new Date(), "{y}-{m}-{d}")
       var newDate = new Date();
       var y = newDate.getFullYear();
       this.query.schedule_type = 0
       this.query.partition_id = 0
       this.query.page = 1
+      this.getAllZone()
+      this.dialysate_formulation =  getDataConfig(  
+            'hemodialysis',
+            'dialysate_formulation'
+      )
+      this.body_fluid_option = this.$store.getters.body_fluid
+      this.displace_liqui_part_option = this.$store.getters.displace_liqui
+      this.blood_access_option = this.$store.getters.blood_access
+      this.blood_access_option = getDataConfig('hemodialysis', 'vascular_access_desc')
+      this.hemodialysisPipelinesOptions = getDataConfig('hemodialysis', 'hemodialysis_pipelines')
+      var filedList = this.$store.getters.xt_user.fileds
+      for (let i = 0; i < filedList.length; i++) {
+        if ( filedList[i].module == 1 && filedList[i].is_show == 1 && (filedList[i].filed_name_cn == '透析器/灌流器' || filedList[i].filed_name_cn == '透析器' || filedList[i].filed_name_cn == '灌流器'  || filedList[i].filed_name_cn == '钾' || filedList[i].filed_name_cn == '钠' || filedList[i].filed_name_cn == '钙' || filedList[i].filed_name_cn == '葡萄糖'  || filedList[i].filed_name_cn == '穿刺针'  || filedList[i].filed_name_cn == '穿刺针支数')) {
+          this.rowList.push(filedList[i])
+        }
+      }
       this.getlist()
     },
     methods: {
+      open(){
+       this.getlist()
+      },
       getlist(){
         getPatientDialysisSolutionGroupList(this.query).then(response=>{
            if(response.data.state == 1){
              var list = response.data.data.list
-             console.log("list23322323ow",list)
-             console.log("rowlist22222wode",this.rowList)
              if(list!=null){
                for(let i=0;i<list.length;i++){
                  list[i].rowList = []
                  list[i].rowList = this.rowList
                }
              }
-             console.log("h哈哈哈哈哈哈哈",list)
+             this.list= []
              this.list = list
              var total = response.data.data.total
              this.total = total
         })
       },
       statistics() {
+        
         var params = {
           schedule_type:this.schedule_type,
           partion_type:this.partion_type,
           selected_date:this.query.schedule_date,
         }
-        console.log("params2332232wo",params)
+        // console.log("params2332232wo",params)
        getDialysisGoodTotalCount(params).then(response=>{
           if(response.data.state == 1){
             this.startDialogVisible = true
             var list = response.data.data.list
+            var kaliumCount = 0
+            var sodiumCount = 0
+            var calciumCount = 0
+            var glucoseCount = 0
+            var punctureNeedleCount = 0
             console.log("list232323223222wid",list)
             if(list!=null && list.length>0){
               for(let i=0;i<list.length;i++){
                  list[i].dialysis_dialyszers_arr = []
                  list[i].dialyzer_perfusion_apparatus_arr = []
                  list[i].dialysis_irrigation_arr = []
-                 if(list[i].dialysis_prescription.dialysis_dialyszers!=""){
-                   list[i].dialysis_dialyszers_arr = list[i].dialysis_prescription.dialysis_dialyszers.split(",")
+                 list[i].puncture_needle_arr = []
+                 if(list[i].dialysis_solution.dialysis_dialyszers!=""){
+                   list[i].dialysis_dialyszers_arr = list[i].dialysis_solution.dialysis_dialyszers.split(",")
                  }
-                 if(list[i].dialysis_prescription.dialyzer_perfusion_apparatus!=""){
-                   list[i].dialyzer_perfusion_apparatus_arr = list[i].dialysis_prescription.dialyzer_perfusion_apparatus.split(",")
+                 if(list[i].dialysis_solution.dialyzer_perfusion_apparatus!=""){
+                   list[i].dialyzer_perfusion_apparatus_arr = list[i].dialysis_solution.dialyzer_perfusion_apparatus.split(",")
                  }
-                 if(list[i].dialysis_prescription.dialysis_irrigation!=""){
-                   list[i].dialysis_irrigation_arr = list[i].dialysis_prescription.dialysis_irrigation.split(",")
+                 if(list[i].dialysis_solution.dialysis_irrigation!=""){
+                   list[i].dialysis_irrigation_arr = list[i].dialysis_solution.dialysis_irrigation.split(",")
                  }
+                 if(list[i].dialysis_solution.puncture_needle!="" ){
+                    list[i].puncture_needle_arr = list[i].dialysis_solution.puncture_needle.split(",")
+                 }
+                 kaliumCount += parseInt(list[i].dialysis_solution.kalium) 
+                 sodiumCount += parseInt(list[i].dialysis_solution.sodium)
+                 calciumCount +=parseInt(list[i].dialysis_solution.calcium)
+                 glucoseCount += parseInt(list[i].dialysis_solution.glucose)
+                 punctureNeedleCount += parseInt(list[i].dialysis_solution.puncture_needle_count)
+
               }
             }
             var dialysisDialyszersArr = []
             var dialyzerPerfusionApparaArr = []
             var dialysisIrrigationArr = []
+            var punctureNeedleArr = []
             for(let i=0;i<list.length;i++){
              for(let j=0;j<list[i].dialysis_dialyszers_arr.length;j++){
-              console.log("list23323232",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++){
              for(let y=0;y<list[i].dialysis_irrigation_arr.length;y++){
               dialysisIrrigationArr.push(list[i].dialysis_irrigation_arr[y])
              }
+             for(let h=0;h<list[i].puncture_needle_arr.length;h++){
+               punctureNeedleArr.push(list[i].puncture_needle_arr[h])   
+             }
             }
             console.log("透析器",dialysisDialyszersArr)
             console.log("透析器/灌流器",dialyzerPerfusionApparaArr)
             console.log("灌流器",dialysisIrrigationArr)
-             
+            console.log("穿刺针",punctureNeedleArr)  
            let obj = {}
            let objOne = {}
            let objTwo = {}
+           let objThree = {}
            for(let i = 0 ; i < dialysisDialyszersArr.length; i++){
             if(obj[dialysisDialyszersArr[i]]){
                obj[dialysisDialyszersArr[i]] +=1
               Arr.push(a);
             }
             console.log("newa",Arr)
-            this.tableList = Arr
+          
+          for(let i = 0 ; i < punctureNeedleArr.length; i++){
+            if(objThree[punctureNeedleArr[i]]){
+               objThree[punctureNeedleArr[i]] +=1
+            }else{
+              objThree[punctureNeedleArr[i]] = 1
+            }
+           }
+           for (let i in objThree) {
+              let a = {};
+              a[i] = objThree[i];
+              a.name = "穿刺针"
+              a.count = objThree[i]
+              a.specification_name = i
+              Arr.push(a);
+            }
+            
+
+           var objfive = {name:"钾(mmol/L)",specification_name:"2.0",count:""}
+           var objsix =  {name:"钠(mmol/L)",specification_name:"1.25",count:""}
+           var objseven = {name:"钙(mmol/L)",specification_name:"1.5",count:""}
+           var objeight = {name:"葡萄糖(mmol/L)",specification_name:"无糖",count:""}
+           var objten = {name:"穿刺针支数",specification_name:"穿刺针支数",count:""}
+           
+            objfive.count = kaliumCount
+            objsix.count = sodiumCount
+            objseven.count = calciumCount
+            objeight.count = glucoseCount
+            objten.count = punctureNeedleCount
+            this.tableList.push(objfive)
+            this.tableList.push(objsix)
+            this.tableList.push(objseven)
+            this.tableList.push(objeight)
+            this.tableList.push(objten)
+            for(let i=0;i<Arr.length;i++){
+
+              this.tableList.push(Arr[i])
+            }
+            
+           
           }
        })
         

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

         startdialogVisible:false,
         schedule_type:"",
         partion_type:"",
+        tableList:[],
       }
     },
     created() {

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

      <div class="app-container ">
         <el-tabs v-model="activeName" @tab-click="handleClick">
             <el-tab-pane label="透析耗材" name="first">
-              <DialysisGood></DialysisGood>
+              <DialysisGood ref="mychild"></DialysisGood>
             </el-tab-pane>
             <el-tab-pane label="药品" name="second">
-               <DialysisDrug ref="mychild"></DialysisDrug>
+               <DialysisDrug ref="mychildOne"></DialysisDrug>
            </el-tab-pane>
             <el-tab-pane label="透析参数" name="third">
-               <DialysisParameter ref="mychildOne"></DialysisParameter>
+               <DialysisParameter ref="mychildtwo"></DialysisParameter>
             </el-tab-pane>
         
         </el-tabs>
   },
   methods:{
     handleClick(val){
-      if(val.name == "second"){
+      if(val.name == "first"){
        this.$refs.mychild.open()
       }   
-      if(val.name == "third"){
+      if(val.name == "second"){
        this.$refs.mychildOne.open()
       }
-      if(val.name == "fourth"){
+      if(val.name == "third"){
         this.$refs.mychildtwo.open()
       }
     }

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

           </template>
         </el-table-column>
         <el-table-column
-          v-if="template_id != 6"
+          v-if="template_id != 6 && org_id!=10223"
           prop="checker"
           min-width="30px"
           align="center"

src/xt_pages/hospitalStation/chargeDetailManagement.vue

                 price: prescription.project[b].price,
                 remark: prescription.project[b].remark,
                 // medical_code: prescription.project[b].project.medical_code,
-                unit: prescription.project[b].project.unit,
+                unit: prescription.project[b].unit,
                 type: prescription.project[b].type,
                 det_item_fee_sumamt: prescription.project[b].order_info.det_item_fee_sumamt,
                 fulamt_ownpay_amt: prescription.project[b].order_info.fulamt_ownpay_amt,

src/xt_pages/hospitalStation/components/deskPrescription.vue

                   this.prescriptions[i].project[b].total = this.prescriptions[i].project[b].total.toString()
                   this.prescriptions[i].project[b].delivery_way = this.prescriptions[i].project[b].delivery_way.toString()
                   this.prescriptions[i].project[b].single_dose = this.prescriptions[i].project[b].single_dose.toString()
+                  
 
                 }
 

src/xt_pages/hospitalStation/doctorDesk.vue

                     remark: prescription.project[b].remark,
                     medical_code: prescription.project[b].project.medical_code,
                     unit: prescription.project[b].unit,
-                    type: prescription.project[b].type
+                    type: prescription.project[b].type,
+                    
 
                   }
 
                     obj['medical_code'] = prescription.project[b].project.medical_code
                     obj['project_name'] = prescription.project[b].project.project_name
                     obj['project'] = prescription.project[b].project
+                  
 
                   } else if (prescription.project[b].type == 3) {
                     if(prescription.project[b].team_id > 0){
                     obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                     obj['project_name'] = prescription.project[b].good_info.good_name
                     obj['good_info'] = prescription.project[b].good_info
+                  
 
                   }
                   tempProject.push(obj)
                       remark: prescription.project[b].remark,
                       medical_code: prescription.project[b].project.medical_code,
                       unit: prescription.project[b].unit,
-                      type: prescription.project[b].type
+                      type: prescription.project[b].type,
+                      
 
                     }
 
                       obj['project_name'] = prescription.project[b].project.project_name
                       obj['price'] = prescription.project[b].project.price
                       obj['project'] = prescription.project[b].project
+                      
 
                     } else if (prescription.project[b].type == 3) {
                       obj['statistical_classification'] = ''
                       obj['project_name'] = prescription.project[b].good_info.good_name
                       obj['price'] = prescription.project[b].good_info.packing_price
                       obj['good_info'] = prescription.project[b].good_info
+                     
                     }
                     tempProject.push(obj)
                   }
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
                           unit: prescription.project[b].unit,
-                          type: prescription.project[b].type
+                          type: prescription.project[b].type,
+                         
                         }
 
                         if (prescription.project[b].type == 2) {
                             remark: prescription.project[b].remark,
                             medical_code: prescription.project[b].project.medical_code,
                             unit: prescription.project[b].unit,
-                            type: prescription.project[b].type
-
+                            type: prescription.project[b].type,
+                           
                           }
 
                           if (prescription.project[b].type == 2) {
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
                           unit: prescription.project[b].unit,
-                          type: prescription.project[b].type
+                          type: prescription.project[b].type,
+                         
+                  
                         }
 
                         if (prescription.project[b].type == 2) {
                             remark: prescription.project[b].remark,
                             medical_code: prescription.project[b].project.medical_code,
                             unit: prescription.project[b].unit,
-                            type: prescription.project[b].type
+                            type: prescription.project[b].type,
+                           
                           }
 
                           if (prescription.project[b].type == 2) {
                         remark: prescription.project[b].remark,
                         medical_code: prescription.project[b].project.medical_code,
                         unit: prescription.project[b].unit,
-                        type: prescription.project[b].type
+                        type: prescription.project[b].type,
+                        
                       }
 
                       if (prescription.project[b].type == 2) {
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
                           unit: prescription.project[b].unit,
-                          type: prescription.project[b].type
+                          type: prescription.project[b].type,
+                         
                         }
 
                         if (prescription.project[b].type == 2) {

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

                         </el-button>
           </div>
 
-          <div  v-if="org_id != 10340 || org_id != 0">
+          <div  v-if="org_id != 10340 && org_id != 0">
 <!--            <el-button size="small"-->
 <!--                       @click="openZb(1)"-->
 <!--                       type="primary">登记-->
             obj['settle_accounts_type'] = 2
           }
           var that = this
-          axios.get(process.env.BASE_API  + '/coordinate/settleAccount', {
+          axios.get("http://127.0.0.1:9532"  + '/coordinate/settleAccount', {
             params: obj
           })
               .then(function(response) {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

                   this.prescriptions[i].project[b].total = this.prescriptions[i].project[b].total.toString()
                   this.prescriptions[i].project[b].delivery_way = this.prescriptions[i].project[b].delivery_way.toString()
                   this.prescriptions[i].project[b].single_dose = this.prescriptions[i].project[b].single_dose.toString()
+                 
 
                 }
 
                   month_prescriptions[i].project[b].total = month_prescriptions[i].project[b].total.toString()
                   month_prescriptions[i].project[b].delivery_way = month_prescriptions[i].project[b].delivery_way.toString()
 
+                  
+
                 }
 
                 for (let b = 0; b < month_prescriptions[i].addition.length; b++) {

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

                   unit: prescription.project[b].unit,
                   type: prescription.project[b].type,
                   execution_state: prescription.project[b].execution_state,
-
+                
 
                 }
 
                   obj['medical_code'] = prescription.project[b].project.medical_code
                   obj['project_name'] = prescription.project[b].project.project_name
                   obj['project'] = prescription.project[b].project
+                 
 
                 } else if (prescription.project[b].type == 3) {
                   obj['statistical_classification'] = ''
                   obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                   obj['project_name'] = prescription.project[b].good_info.good_name
                   obj['good_info'] = prescription.project[b].good_info
+                
 
                 }
                 tempProject.push(obj)
                     unit: prescription.project[b].unit,
                     type: prescription.project[b].type,
                     execution_state: 2,
+                    
 
                   }
 
                     obj['project_name'] = prescription.project[b].project.project_name
                     obj['price'] = prescription.project[b].project.price
                     obj['project'] = prescription.project[b].project
+                    
 
                   } else if (prescription.project[b].type == 3) {
                     obj['statistical_classification'] = ''
                     obj['project_name'] = prescription.project[b].good_info.good_name
                     obj['price'] = prescription.project[b].good_info.packing_price
                     obj['good_info'] = prescription.project[b].good_info
+                  
                   }
                   tempProject.push(obj)
                 }
 
             }
           }
-          console.log('~~~~~00000222222')
+          console.log('~~~~~00000222222',this.prescriptions)
           this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis)
         }
       })
                         unit: prescription.project[b].unit,
                         type: prescription.project[b].type,
                         execution_state: prescription.project[b].execution_state,
+                       
                       }
 
                       if (prescription.project[b].type == 2) {
                           unit: prescription.project[b].unit,
                           type: prescription.project[b].type,
                           execution_state: 2,
+                         
 
                         }
 
                         unit: prescription.project[b].unit,
                         type: prescription.project[b].type,
                         execution_state: prescription.project[b].execution_state,
-
+                       
                       }
 
                       if (prescription.project[b].type == 2) {
                           unit: prescription.project[b].unit,
                           type: prescription.project[b].type,
                           execution_state: 2,
-
+                         
                         }
 
                         if (prescription.project[b].type == 2) {
                       medical_code: prescription.project[b].project.medical_code,
                       unit: prescription.project[b].unit,
                       type: prescription.project[b].type,
-                      execution_state: prescription.project[b].execution_state
-
+                      execution_state: prescription.project[b].execution_state,
+                  
                     }
 
                     if (prescription.project[b].type == 2) {
                         medical_code: prescription.project[b].project.medical_code,
                         unit: prescription.project[b].unit,
                         type: prescription.project[b].type,
-                        execution_state: 2
+                        execution_state: 2,
+                       
 
                       }
 
                         medical_code: prescription.project[b].project.medical_code,
                         unit: prescription.project[b].unit,
                         type: prescription.project[b].type,
-                        execution_state: prescription.project[b].execution_state
-
+                        execution_state: prescription.project[b].execution_state,
+                       
                       }
 
                       if (prescription.project[b].type == 2) {
                         obj['medical_code'] = prescription.project[b].project.medical_code
                         obj['project_name'] = prescription.project[b].project.project_name
                         obj['project'] = prescription.project[b].project
+                      
 
                       } else if (prescription.project[b].type == 3) {
                         if (prescription.project[b].team_id > 0) {
                         obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                         obj['project_name'] = prescription.project[b].good_info.good_name
                         obj['good_info'] = prescription.project[b].good_info
+                       
 
                       }
                       tempProject.push(obj)
                           unit: prescription.project[b].unit,
                           type: prescription.project[b].type,
                           execution_state: 2,
+                          
                         }
 
                         if (prescription.project[b].type == 2) {
                         medical_code: prescription.project[b].project.medical_code,
                         unit: prescription.project[b].unit,
                         type: prescription.project[b].type,
-                        execution_state: prescription.project[b].execution_state
-
+                        execution_state: prescription.project[b].execution_state,
+                       
                       }
 
                       if (prescription.project[b].type == 2) {
                           medical_code: prescription.project[b].project.medical_code,
                           unit: prescription.project[b].unit,
                           type: prescription.project[b].type,
-                          execution_state: 2
-
+                          execution_state: 2,
+                         
                         }
 
                         if (prescription.project[b].type == 2) {

src/xt_pages/stock/drugs/components/drugQuery.vue

             </el-table-column>
             <el-table-column label="批准文号" align="center">
               <template slot-scope="scope">
-                {{scope.row.medical_insurance_number}}
+                {{scope.row.number}}
               </template>
             </el-table-column>
             <el-table-column label="国家编码" align="center">
           "药品名称",
           "规格&单位",
           "生产厂商",
+          "批准文号",
           "国家编码",
           "入库数量",
           "出库数量",
           "drug_name",
           "specification_name",
           "manufacturer_name",
+          "number",
           "medical_insurance_number",
           "stock_in_count",
           "stock_out_count",

src/xt_pages/stock/drugs/components/drugQueryPrint.vue

                     {{ getManufacturName(item.manufacturer) }}
                   </td>
                   <!-- 批准文号 -->
-                   <td ></td>
+                   <td >{{item.number}}</td>
                   <td >{{ item.medical_insurance_number }}</td>
                   <!-- 仓库名称   -->
                   <td style="padding: 0;text-align:center;">

src/xt_pages/stock/drugs/components/purchaseDrugQuery.vue

   },
    open(){
     this.start_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
-    this.end_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
+    this.end_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
     this.houseList= []
     this.drugTypeList = []
     this.getStorehouseList()

src/xt_pages/stock/drugs/components/purchaseNewDrugQuery.vue

    open(){
    
     this.start_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
-    this.end_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
+    this.end_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
     this.houseList= []
     this.drugTypeList = []
     this.getStorehouseList()

src/xt_pages/stock/drugs/drugInventory.vue

         style="height: 100%; display: flex; flex-direction: column"
         @tab-click="handleClick"
       >
-        <el-tab-pane label="药品盘点" name="first" v-if="first">
+       <!-- <el-tab-pane label="药品盘点" name="first" v-if="first">
           <drug-inventory></drug-inventory>
+        </el-tab-pane> -->
+         <el-tab-pane label="药品盘点" name="four">
+          <drug-new-inventory></drug-new-inventory>
         </el-tab-pane>
         <el-tab-pane label="盘点列表" name="second" v-if="second">
           <inventory-details ref="child"></inventory-details>
 <script>
 import BreadCrumb from "../../components/bread-crumb";
 import drugInventory from "./inventory";
+import drugNewInventory from "./newDrugInventory"
 import inventoryDetails from "./inventoryDetails";
 import drugDamaged from "./drugDamaged.vue";
 export default {
     drugInventory,
     inventoryDetails,
     drugDamaged,
+    drugNewInventory,
   },
   data() {
     return {
         { path: false, name: "药品管理" },
         { path: false, name: "药品盘点" },
       ],
-      activeName: "first",
+      activeName: "four",
       first: true,
       second: true,
       three: true,

src/xt_pages/stock/drugs/drugNewQuery.vue

               <DrugQuery></DrugQuery>
             </el-tab-pane>
           
-            <el-tab-pane label="进销存查询" name="second">
+           <el-tab-pane label="进销存查询" name="second">
               <PurchaseDrugQuery ref="mychild"></PurchaseDrugQuery>
-            </el-tab-pane>
+            </el-tab-pane> 
 
              <!-- <el-tab-pane label="进销存查询" name="five">
                <PurchaseNewDrugQuery ref="mychildfive"></PurchaseNewDrugQuery>

src/xt_pages/stock/query/goodNewQuery.vue

             </el-table-column>
             <el-table-column label="批准文号" align="center">
               <template slot-scope="scope">
-                  {{getManufacturName(scope.row.manufacturer)}}
+                 {{scope.row.number}}
               </template>
             </el-table-column>
             <el-table-column label="国家编码" align="center">
           }
          }
          
-         const tHeader = ['序号','耗材类型', '耗材名称', '规格&单位','生产厂商','国家编码','入库数量','出库数量','退库数量','实际出库','剩余库存','总库存']
-         const filterVal = ['index','type_name', 'good_name', 'spec','manufacturer_name','social_security_directory_code','stock_in_count','act_out_count','stock_cancel_count','stock_out_count','over_count','sum_count']
+         const tHeader = ['序号','耗材类型', '耗材名称', '规格&单位','生产厂商','批准文号','国家编码','入库数量','出库数量','退库数量','实际出库','剩余库存','总库存']
+         const filterVal = ['index','type_name', 'good_name', 'spec','manufacturer_name','number','social_security_directory_code','stock_in_count','act_out_count','stock_cancel_count','stock_out_count','over_count','sum_count']
         
          const data = this.formatJson(filterVal, this.tableList)
          excel.export_json_to_excel({

src/xt_pages/stock/query/goodNewQueryPrint.vue

                   </td>
                    <!--  批准文号-->
                   <td>
-                    {{ getManufacturName(item.manufacturer) }}
+                    {{item.number}}
                   </td>
                   <!-- 国家编码 -->
                   <td>{{ item.social_security_directory_code }}</td>

src/xt_pages/stock/query/purchaseNewStockQuery.vue

               // list[i].stockOutprice = this.stockOutprice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
               // list[i].saleOutMoney = this.getSaleStockMony(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
               list[i].stockOutprice = "/"
-              list[i].saleOutprice = "/"
+              list[i].saleOutMoney = "/"
               // list[i].overStock= this.getEndWarehouseInfo(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
               // list[i].overPrice= this.getEndOverPrice(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
               // list[i].overMoney = this.getEndSalePrice(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
    },
    open(){
     this.start_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
-    this.end_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
+    this.end_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
     this.houseList = []
     this.goodTypeList= []
     this.getStorehouseList()

src/xt_pages/stock/query/purchaseStockQuery.vue

    },
    open(){
     this.start_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
-    this.end_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
+    this.end_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
     this.houseList = []
     this.goodTypeList= []
     this.getStorehouseList()

src/xt_pages/stock/stockInventory.vue

     </div>
     <div class="app-container">
         <el-tabs v-model="activeName" @tab-click="handleClick">
-            <el-tab-pane label="耗材盘点" name="first">
+            <!-- <el-tab-pane label="耗材盘点" name="first">
                 <inventory></inventory>
+            </el-tab-pane> -->
+            <el-tab-pane label="耗材盘点" name="four">
+                <new-inventory></new-inventory>
             </el-tab-pane>
             <el-tab-pane label="盘点列表" name="second">
                 <inventory-details ref="child"></inventory-details>
 <script>
 import BreadCrumb from "../components/bread-crumb";
 import inventory from './inventory.vue'
+import newInventory from './newInventory.vue'
 import inventoryDetails from './inventoryDetails.vue'
 import stockDamaged from "./stockDamaged.vue"
 export default {
         BreadCrumb,
         inventory,
         inventoryDetails,
-        stockDamaged
+        stockDamaged,
+        newInventory
     },
     data() {
         return{
                 { path: false, name: "耗材管理" },
                 { path: false, name: "耗材盘点" }
             ],
-            activeName:'first'
+            activeName:'four'
         }
     },
     methods:{

src/xt_pages/stock/stockNewQuery.vue

             <el-tab-pane label="进销存查询" name="second">
                <PurchaseStockQuery ref="mychild"></PurchaseStockQuery>
             </el-tab-pane>
-
-             <!-- <el-tab-pane label="进销存查询" name="five">
+<!-- 
+             <el-tab-pane label="进销存查询" name="five">
                <PurchaseNewStockQuery ref="mychildfive"></PurchaseNewStockQuery>
             </el-tab-pane> -->