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

src/api/advice.js

@@ -603,4 +603,4 @@ export function getDocAdviceByPatientId(params){
     method:"get",
     params:params,
   })
-}
+}

src/api/dialysis.js

@@ -556,4 +556,14 @@ export function getDialysisTotalCount(params){
     method:"Get",
     params:params
   })
+}
+
+
+export function getDialysisProject(params){
+  
+  return request({
+    url:"/api/schedule/getdialysisproject",
+    method:"Get",
+    params:params
+  })
 }

src/api/pharmacy.js

@@ -120,3 +120,30 @@ export function routeofadministration(params) {
     params: params
   })
 }
+
+export function getGoodInventoryList(params){
+  
+  return request({
+    url:"/api/pharmacy/getgoodinventorylist",
+    method:"Get",
+    params:params,
+  })
+}
+
+export function getGoodInventoryByGoodId(id,params){
+  
+  return request({
+    url:"/api/pharmacy/getgoodinventorybygoodid?id="+id,
+    method:"get",
+    params:params,
+  })
+}
+
+export function updateInventoryWarehouseInfo(params){
+  
+  return request({
+    url:"/api/pharmacy/updateInventoryWarehouseInfo",
+    method:"get",
+    params:params,
+  })
+} 

src/router/modules/dialysis.js

@@ -144,6 +144,18 @@ export default {
       }
     },
 
+    {
+      path: '/dialysis/doctorNewProjectStaticPrint',
+      component: () => import('@/xt_pages/dialysis/doctorNewProjectStaticPrint'),
+      name: '透析耗材统计打印',
+      hidden: true,
+      is_menu: false,
+      meta: {
+        title: '透析耗材统计打印',
+        noCache: true
+      }
+    },
+
     {
       path: '/dialysis/signPrint',
       component: () => import('@/xt_pages/dialysis/signPrint'),

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -3011,7 +3011,15 @@
           </div>
           <div style="position: relative;left: 70%;top: 30px;">
             患者签名：
-            <div class="under_line" style="width: 120px;"></div>
+            <div class="under_line" style="width: 120px;">
+              <img
+                v-if="record.dialysis_order.url!=''"
+                style="height: 30px"
+                :src="record.dialysis_order == null? 0: dialysis_order.url"
+                alt=""
+                srcset=""
+              />
+            </div>
           </div>
         </div>
       </div>

src/xt_pages/dialysis/details/BasicInfor.vue

@@ -174,7 +174,7 @@ export default {
   },
   watch:{
     dialysis_date:function(){
-      console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh我爱中国",this.dialysis_date)
+      // console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh我爱中国",this.dialysis_date)
       this.dialysis_time = this.dialysis_date
     }
   }

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

@@ -2893,7 +2893,7 @@ mu
         }
         // console.log('this.dialysisPrescription.mode_id', this.dialysisPrescription.mode_id)
         // console.log('this.schedual', schedual.mode_id)
-        if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || schedual.mode_id == 2 || schedual.mode_id == 5 || schedual.mode_id == 12 || schedual.mode_id == 0) {
+        if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || schedual.mode_id == 2 || schedual.mode_id == 5 || schedual.mode_id == 12 || schedual.mode_id == 0 || schedual.mode_id == 37 || schedual.mode_id == 36 || schedual.mode_id == 35 || schedual.mode_id == 34) {
           this.zhiShow = true
           this.huShow = true
           this.totalShow = true
@@ -3138,7 +3138,7 @@ mu
             //   }
 
             // }
-            if(this.dialysisPrescription.mode_id!=2 && this.dialysisPrescription.mode_id!=5 && this.dialysisPrescription.mode_id!=12 && this.dialysisPrescription.mode_id!=10 && this.dialysisPrescription.mode_id!=34 && this.dialysisPrescription.mode_id!=35  && this.dialysisPrescription.mode_id!=36){
+            if(this.dialysisPrescription.mode_id!=2 && this.dialysisPrescription.mode_id!=5 && this.dialysisPrescription.mode_id!=12 && this.dialysisPrescription.mode_id!=10 && this.dialysisPrescription.mode_id!=34 && this.dialysisPrescription.mode_id!=35  && this.dialysisPrescription.mode_id!=36 && this.dialysisPrescription.mode_id!=37){
               this.dialysisPrescription.displace_liqui_part = 0
               this.dialysisPrescription.displace_liqui_value = 0
               this.dialysisPrescription.replacement_total = 0

src/xt_pages/dialysis/doctorNewProjectStaticPrint.vue

@@ -0,0 +1,305 @@
+<template>
+    <div class="main-contain">
+      <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+        <el-row style="float:right;">
+          <el-col :span="24">
+            <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="app-container" style="background-color: white;">
+  
+        <div id="print_content">
+          <div class="print_main_content">
+            <div class="order_title_panl">
+              <span class="main_title"> &nbsp;
+                透析耗材
+              </span>
+              <span  style="float:right;">打印日期: &nbsp;
+                 {{$route.query.schedule_date}}
+              </span>
+            </div>
+            <div class="table_panel">
+  
+              <table class="table">
+                <thead>
+                <tr>
+                  <td width="50">序号</td>
+                  <td width="100">耗材名称</td>
+                  <td width="100">规格</td>
+                  <td width="100">数量</td>
+                  
+                </tr>
+                </thead>
+                <tbody>
+                 <tr v-for="(item,i) in tableProjectList" :key="i">
+                  <td>{{i+1}}</td>
+                  <td>{{item.good_name}}</td>
+                   <td>{{item.specification_name}}</td>
+                  <td>
+                    {{item.count}}
+                  </td>
+                 </tr>
+                </tbody>
+              </table>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </template>
+  
+  <script>
+    import { getDialysisProject  } from '@/api/dialysis'
+    import { parseTime } from '@/utils'
+    import { uParseTime } from '@/utils/tools'
+    import BreadCrumb from '@/xt_pages/components/bread-crumb'
+    import print from 'print-js'
+    import { getDataConfig } from '@/utils/data'
+    export default {
+      name: 'SchedulePrint',
+      data() {
+        return {
+          crumbs: [
+            { path: false, name: '排班管理' },
+            { path: false, name: '排班打印' }
+          ],
+          td_1_width: '8%',
+          td_2_width: '8%',
+          td_3_width: '64%',
+          td_4_width: '20%',
+          month: 1,
+          begin_day: 1,
+          total:[],
+          list:[],
+          schedule_date:"",
+          schedule_type:0,
+          partition_type:0,
+          keywords:"",
+          loading:false,
+          tableData:[],
+          numberList:[],
+          partitionArr:[],
+          his_config:{},
+          typeList:[],
+          rowList:[],
+          dialysate_formulation:[],
+          body_fluid_option:[],
+          displace_liqui_part_option:[],
+          blood_access_option:[],
+          hemodialysisPipelinesOptions:[],
+          tableList:[],
+          druglist:[],
+          config:{},
+          tableProjectList:[]
+        }
+      },
+      components: {
+        BreadCrumb
+      },
+      created() {
+        this.getDialysisProject()
+      },
+      methods: {
+        getDialysisProject(){
+          var params = {
+            schedule_type:this.$route.query.schedule_type,
+            partion_type:this.$route.query.partion_type,
+            selected_date:this.$route.query.schedule_date,
+          }
+         getDialysisProject(params).then(response=>{
+           if(response.data.state ==1){
+             var list = response.data.data.list
+             var newArr = []
+             if(list!=null && list.length>0){
+               for(let i=0;i<list.length;i++){
+                 for(let j=0;j<list[i].his_doctor_project.length;j++){
+                    newArr.push(list[i].his_doctor_project[j])
+                 }
+               }
+             }
+             
+             let dataInfo = {}
+              newArr.forEach((item, index) => {
+              let { project_id } = item
+              if (!dataInfo[project_id]) {
+                dataInfo[project_id] = {
+                  project_id:item.project_id,
+                  good_name:item.good.good_name,
+                  specification_name:item.good.specification_name,
+                  child: [],
+                  count:0,
+                }
+              }
+            })
+            let arr = Object.values(dataInfo)
+            
+            if(arr!=null && arr.length >0){
+              for(let i =0;i<arr.length;i++){
+                for(let j=0;j<newArr.length;j++){
+                   if(arr[i].project_id == newArr[j].project_id){
+                      arr[i].child.push(newArr[i])
+                   }
+                } 
+              }
+              for(let i =0;i<arr.length;i++){
+                for(let j=0;j<arr[i].child.length;j++){
+                   arr[i].count += parseInt(arr[i].child[j].count)
+                }
+              }
+
+              console.log("arr0000000000000000000000",arr)
+              this.tableProjectList = []
+              this.tableProjectList = arr
+
+            }
+           }
+         })
+      },
+       getTimeOne(val) {
+          if(val == ""){
+          return ""
+          }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+          }
+       },
+       getCount(val){
+         var count = 0
+         if(val!=null && val.length > 0){
+          for(let i=0;i<val.length;i++){
+            count += parseInt(val[i].prescribing_number)
+          }
+         }
+         if(count > 0){
+          return count
+         }else{
+          return 0
+         }
+       },
+      printAction: function() {
+      const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+  
+      printJS({
+          printable: 'print_content',
+          type: 'html',
+          documentTitle: '  ',
+          style: style,
+          scanStyles: false
+       })
+      },
+      getSpecification(id){
+          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_number+this.druglist[i].min_unit +"/"+this.druglist[i].max_unit
+            }
+          }
+          return specification_name
+        },
+       getHisCount(val,max_unit,min_unit,min_number){
+          var total = 0
+          var max_str = "";
+          var min_str = "";
+          for(let i=0;i<val.length;i++){
+            total+=parseInt(val[i].prescribing_number)
+          }
+          if (total < min_number) {
+          min_str = total + min_unit;
+        }
+        if (total == 0) {
+          min_str = "";
+          max_str = "";
+        }
+        if (total >= min_number) {
+          if (parseInt(total / min_number) != 0) {
+            max_str = parseInt(total / min_number) + max_unit;
+          }
+          if (total % min_number != 0) {
+            min_str = (total % min_number) + min_unit;
+          }
+        }
+        return max_str + min_str;
+          
+        },
+     }
+    }
+  </script>
+  
+  <style rel="stylesheet/scss" lang="scss" scoped>
+    .print_main_content {
+      background-color: white;
+      width: 960px;
+      margin: 0 auto;
+      padding: 0 0 20px 0;
+  
+    .order_title_panl {
+      text-align: center;
+  
+    .main_title {
+      font-size: 18px;
+      line-height: 40px;
+      font-weight: 500;
+    }
+  
+    }
+    .table_panel {
+  
+    .table {
+      width: 100%;
+      border: 1px solid;
+      border-collapse: collapse;
+      padding: 2px;
+  
+    thead {
+  
+    tr {
+  
+    td {
+      border: 1px solid;
+      text-align: center;
+      font-size: 20px;
+      padding: 15px 5px;
+    }
+  
+    }
+    }
+    tbody {
+  
+    tr {
+  
+    td {
+      border: 1px solid;
+      text-align: center;
+      font-size: 18px;
+      padding: 10px 5px;
+  
+    .proj {
+      padding: 5px 0;
+      text-align: left;
+  
+    .proj_title {
+      font-size: 16px;
+      font-weight: 500;
+      line-height: 25px;
+    }
+  
+    .proj_item {
+      font-size: 15px;
+      line-height: 20px;
+  
+    .zone_name {
+      font-weight: 500;
+    }
+  
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+  </style>
+  
+  

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -183,9 +183,13 @@
       </div> -->
 
       <div style="margin-top: 10px;margin-bottom:10px">
-        <el-button type="primary" size="small" @click="toStatic" v-if="org_id!=9671  && org_id!=10340">统计</el-button>
+        <el-button type="primary" size="small" @click="toStatic" v-if="org_id!=9671  && org_id!=10340">药品统计</el-button>
 
-        <el-button type="primary" size="small" @click="toStaticOne" v-if="org_id == 9671 || org_id==10340">统计</el-button>
+        <el-button type="primary" size="small" @click="toStaticOne" v-if="org_id == 9671 || org_id==10340">药品统计</el-button>
+
+        <el-button type="primary" size="small" @click="toStaticTwo">耗材统计</el-button>
+
+        
       </div>
 
 
@@ -736,6 +740,76 @@
         <el-button type="primary" @click="startdialogVisibleOne = false">确 定</el-button>
       </span>
     </el-dialog>
+
+
+    <el-dialog
+      title="耗材统计表"
+      :visible.sync="startdialogVisibleTwo"
+      width="60%">
+      <span>
+        <div class="cell clearfix" style="margin-bottom:10px">
+          <label class="title"> <span class="name">排班班次</span> : </label>
+           <el-select v-model="schedule_type" placeholder="请选择" @change="changeScheduleTypeTwo" >
+            <el-option
+              v-for="item in schedulArr"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+           </el-select>
+           <label class="title"> <span class="name">病区选择</span> : </label>
+           <el-select v-model="partion_type" placeholder="请选择" @change="changePartionTypeTwo" multiple >
+            <el-option
+              v-for="item in partitionArr"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+           </el-select>
+           <el-button size="small" icon="el-icon-printer"  @click="toPrintThree" type="primary">打印</el-button>
+           <el-button size="small"  @click="toExportListTwo" type="primary">导出</el-button>
+        </div>
+
+      <el-table
+        :data="tableProjectList"
+        border
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+      >
+         <el-table-column  align="center"  label="序号">
+           <template slot-scope="scope">
+              {{scope.$index+1}}
+           </template>
+        </el-table-column>
+        <el-table-column  align="center"   label="耗材名称">
+         <template slot-scope="scope">
+            {{scope.row.good_name}}
+          </template>
+        </el-table-column>
+        <el-table-column  align="center"  label="规格">
+           <template slot-scope="scope">
+             {{scope.row.specification_name}}
+           </template>
+        </el-table-column>
+
+        <el-table-column  align="center"   label="数量">
+           <template slot-scope="scope">
+              {{scope.row.count}}
+           </template>
+        </el-table-column>
+
+
+
+      </el-table>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="startdialogVisibleTwo = false">取 消</el-button>
+        <el-button type="primary" @click="startdialogVisibleTwo = false">确 定</el-button>
+      </span>
+    </el-dialog>
     </div>
 
 
@@ -744,7 +818,7 @@
 
 <script>
 const moment = require('moment')
-import { getSchedualPatient, GetAllZone,getDialysisAdviceToday } from "@/api/dialysis";
+import { getSchedualPatient, GetAllZone,getDialysisAdviceToday,getDialysisProject } from "@/api/dialysis";
 import { parseTime } from "@/utils";
 import { uParseTime } from '@/utils/tools'
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
@@ -826,6 +900,7 @@ export default {
       tableList:[],
       startdialogVisible:false,
       startdialogVisibleOne:false,
+      startdialogVisibleTwo:false,
       schedule_type:0,
       partion_type:0,
       druglist:[],
@@ -839,6 +914,7 @@ export default {
       zoneIdList:[],
       partion_str:"",
       keyword:"",
+      tableProjectList:[],
     };
   },
   created() {
@@ -1882,7 +1958,7 @@ export default {
                 this.tableList = hisarr
               }
 
-              console.log("中国人民解放军",this.tableList)
+             
              }
           }
         })
@@ -1932,7 +2008,7 @@ export default {
 
               if(doctorList!=null && doctorList.length > 0){
 
-                let dataInfo = {}
+                  let dataInfo = {}
                   doctorList.forEach((item, index) => {
                   item.advice_name = item.advice_name.replace(/\s/g,"")
                   let { advice_name } = item
@@ -2009,6 +2085,73 @@ export default {
         })
 
       },
+      toStaticTwo(){
+        var str = ""
+         if(this.partion_type==0){
+            str = this.zoneIdList.join(",")
+         }
+         if(this.partion_type!=0){
+            str = this.partion_type.join(",")
+         }
+         this.partion_str = ""
+         this.partion_str = str  
+         this.tableList = []
+          var params = {
+            schedule_type:this.schedule_type,
+            partion_type:str,
+            selected_date: moment(this.time).format('YYYY-MM-DD'),
+          }
+         getDialysisProject(params).then(response=>{
+           if(response.data.state ==1){
+             var list = response.data.data.list
+             var newArr = []
+             if(list!=null && list.length>0){
+               for(let i=0;i<list.length;i++){
+                 for(let j=0;j<list[i].his_doctor_project.length;j++){
+                    newArr.push(list[i].his_doctor_project[j])
+                 }
+               }
+             }
+             
+             let dataInfo = {}
+              newArr.forEach((item, index) => {
+              let { project_id } = item
+              if (!dataInfo[project_id]) {
+                dataInfo[project_id] = {
+                  project_id:item.project_id,
+                  good_name:item.good.good_name,
+                  specification_name:item.good.specification_name,
+                  child: [],
+                  count:0,
+                }
+              }
+            })
+            let arr = Object.values(dataInfo)
+            
+            if(arr!=null && arr.length >0){
+              for(let i =0;i<arr.length;i++){
+                for(let j=0;j<newArr.length;j++){
+                   if(arr[i].project_id == newArr[j].project_id){
+                      arr[i].child.push(newArr[i])
+                   }
+                } 
+              }
+              for(let i =0;i<arr.length;i++){
+                for(let j=0;j<arr[i].child.length;j++){
+                   arr[i].count += parseInt(arr[i].child[j].count)
+                }
+              }
+
+              console.log("arr0000000000000000000000",arr)
+
+              this.startdialogVisibleTwo = true
+              this.tableProjectList = []
+              this.tableProjectList = arr
+
+            }
+           }
+         })
+      },
       getDrugAdviceCount(advice_name,zone_name){
         var str = ""
         var arr =[]
@@ -2100,6 +2243,10 @@ export default {
         var schedule_date = moment(this.time).format('YYYY-MM-DD')
         this.$router.push({path:"/dialysis/doctorNewAdviceStaticPrint?schedule_type="+this.schedule_type+"&partion_type="+this.partion_str+"&schedule_date="+schedule_date+"&is_open="+this.config.is_open})
       },
+      toPrintThree(){
+        var schedule_date = moment(this.time).format('YYYY-MM-DD')
+        this.$router.push({path:"/dialysis/doctorNewProjectStaticPrint?schedule_type="+this.schedule_type+"&partion_type="+this.partion_str+"&schedule_date="+schedule_date+"&is_open="+this.config.is_open})
+      },
       toExportListOne(){
         import('@/vendor/Export2Excel').then(excel => {
 
@@ -2127,6 +2274,26 @@ export default {
             this.downloadLoading = false
           })
       },
+      toExportListTwo(){
+        import('@/vendor/Export2Excel').then(excel => {
+
+          if(this.tableProjectList!=null && this.tableProjectList.length > 0){
+            for(let i=0;i<this.tableProjectList.length;i++){
+              this.tableProjectList[i].index = i+1
+            }
+          }
+          const tHeader = ['序号','耗材名称','规格','数量']
+          const filterVal = ['index','good_name','specification_name','count']
+
+          const data = this.formatJson(filterVal, this.tableProjectList)
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: '耗材统计'
+          })
+            this.downloadLoading = false
+          })
+      },
       formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
       },
@@ -2146,6 +2313,14 @@ export default {
         this.tableDataList = []
         this.toStaticOne()
       },
+      changeScheduleTypeTwo(){
+        this.tableProjectList = []
+        this.toStaticTwo()
+      },
+      changePartionTypeTwo(){
+        this.tableProjectList=[]
+        this.toStaticTwo()
+      },
       getModeId(val){
         if(val!=null && val.length > 0){
           let dataInfo = {}
@@ -2273,6 +2448,21 @@ export default {
              if(hisNewArr[i].mode_id == 32){
                 hisNewArr[i].mode_id = "HDP"
              }
+             if(hisNewArr[i].mode_id == 33){
+                hisNewArr[i].mode_id = "HFD"
+             }
+             if(hisNewArr[i].mode_id == 34){
+                hisNewArr[i].mode_id = "HDF100"
+             }
+             if(hisNewArr[i].mode_id == 35){
+                hisNewArr[i].mode_id = "HDF600"
+             }
+             if(hisNewArr[i].mode_id == 36){
+                hisNewArr[i].mode_id = "HDF800"
+             }
+             if(hisNewArr[i].mode_id == 37){
+                hisNewArr[i].mode_id = "HDF1000"
+             }
              str += hisNewArr[i].mode_id +"("+hisNewArr[i].child.length+")" +"\n"
            }
 

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -2578,12 +2578,13 @@
          <div style="position: relative; left: 70%;top: 50px;width: 288px;">
           患者签名：
           <div class="under_line" style="width: 120px;">
-            <!-- <img
+            <img
+              v-if="dialysisOrder.url!=''"
               style="height: 30px"
               :src="dialysisOrder == null? 0: dialysisOrder.url"
               alt=""
               srcset=""
-            /> -->
+            />
           </div>
         </div>
       </div>

src/xt_pages/outpatientCharges/costComparison.vue

@@ -636,22 +636,6 @@ c<template>
                 //   }
                 // }
 
-                var hifes_pays = [];
-
-                if(this.fromData[i].setl_detail.length > 0){
-                  var jsonObj = JSON.parse(this.fromData[i].setl_detail);
-                  console.log(jsonObj)
-                  for (let i = 0; i < jsonObj.length; i++) {
-                    if (jsonObj[i].fund_pay_type == '310100') {
-                      hifes_pays.push(jsonObj[i].fund_payamt)
-                    }
-                  }
-                }
-
-                let hifes_pay = 0.00
-                if(hifes_pays.length == 2){
-                  hifes_pay = hifes_pays[1]
-                }
 
                 let obj = {
                   '序号': i+1,
@@ -669,7 +653,7 @@ c<template>
                   '小计I+II': this.fromData[i].act_pay_dedc + this.fromData[i].psn_cash_pay,
                   '基本统筹基金': this.fromData[i].hifp_pay,
                   '公务员补助': this.fromData[i].cvlserv_pay,
-                  '单位补充保险': hifes_pay,
+                  '单位补充保险': this.fromData[i].hifmi_pay,
                   '煤矿补充保险': "0.00",
                   "超封顶线费用": "0.00",
                   '大额医疗保险应付': this.fromData[i].hifob_pay,
@@ -711,21 +695,6 @@ c<template>
               var list = []
               for (let i = 0; i < this.fromData.length; i++) {
 
-                var hifmi_pay = 0.00;
-
-                if(this.fromData[i].setl_detail.length > 0){
-                  var jsonObj = JSON.parse(this.fromData[i].setl_detail);
-                  console.log(jsonObj)
-                  for (let i = 0; i < jsonObj.length; i++) {
-                      if (jsonObj[i].fund_pay_type == '390200') {
-                        hifmi_pay = jsonObj[i].fund_payamt
-                      }
-                  }
-                }
-
-
-
-
                 let obj = {
                   '序号': i+1,
                   '姓名': this.fromData[i].psn_name,
@@ -742,19 +711,14 @@ c<template>
                   "超封顶线费用": "0.00",
                   "合计": parseFloat(this.fromData[i].act_pay_dedc)  + parseFloat(this.fromData[i].psn_cash_pay),
                   '基本统筹基金': this.fromData[i].hifp_pay,
-                  '大病保险': hifmi_pay,
+                  '大病保险':this.fromData[i].hifmi_pay,
                   '医疗救助': this.fromData[i].maf_pay,
                   '实账支付额': "0.00",
                   "血透次数":this.fromData[i].DialysisCount,
                   "置留管数量":0,
                   "备注":"",
-
                 }
 
-
-
-
-
                 list.push(obj)
               }
               var insutype_name = ''

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -20,7 +20,7 @@
           org_id == 10138 ||
           org_id == 9504 ||
           org_id == 10028 ||
-          org_id == 10278
+          org_id == 10278 || org_id == 10610 || org_id == 0
         "
       >
         <printTwo :info="info" v-if="org_id == 9990"></printTwo>
@@ -28,7 +28,7 @@
           :info="info"
           :paramsObj="paramsObj"
           :balanceAccounts="balanceAccounts"
-          v-if="org_id == 10138 || org_id == 10278 || org_id ==10610"
+          v-if="org_id == 10138 || org_id == 10278 || org_id ==10610 || org_id == 0"
         ></printThree>
         <printFour
           v-if="org_id == 9504 || org_id == 10028 || org_id == 10088  "
@@ -61,12 +61,12 @@
       <!-- 大冶 -->
       <printthirteen :info="info" v-if="org_id == 10510"></printthirteen>
       <!-- 广水原生堂 -->
-      <printfourteen :info="info" v-if="(org_id == 10088 || org_id == 0 ) && this.paramsObj.balance_accounts_type == 1"></printfourteen>
+      <printfourteen :info="info" v-if="(org_id == 10088 ) && this.paramsObj.balance_accounts_type == 1"></printfourteen>
       <printOne :info="info" v-if=" org_id != 9990 &&
             org_id != 10138 &&
             org_id != 9504 &&
             org_id != 10028 &&
-            org_id != 0 &&
+            org_id != 0 &&   org_id != 10610 &&
             org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485 &&org_id != 10480 &&org_id != 10510 &&org_id != 10088 &&org_id != 0   && this.paramsObj.balance_accounts_type == 1">
       </printOne>
 
@@ -74,7 +74,7 @@
             org_id != 10138 &&
             org_id != 9504 &&
             org_id != 10028 &&
-            org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485  &&org_id != 10480 &&org_id != 10510  && org_id != 0 && this.paramsObj.balance_accounts_type == 2">
+            org_id != 10278 && org_id != 10610  && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485  &&org_id != 10480 &&org_id != 10510  && org_id != 0 && this.paramsObj.balance_accounts_type == 2">
       </privateChargePrint>
 
     </div>
@@ -309,7 +309,7 @@ export default {
       if (
         this.$store.getters.xt_user.org_id == 10138 ||
         this.$store.getters.xt_user.org_id == 4 ||
-        this.$store.getters.xt_user.org_id == 10278
+        this.$store.getters.xt_user.org_id == 10278 ||   this.$store.getters.xt_user.org_id == 10610
       ) {
         setTimeout(() => {
           const style =
@@ -720,7 +720,7 @@ export default {
         }
         if (
           this.org_id == 10138 ||
-          this.org_id == 10278
+          this.org_id == 10278 ||  this.org_id == 10610 || this.org_id == 0
         ) {
           getPrivateExpenses(params).then((response) => {
             if (response.data.state == 0) {

src/xt_pages/stock/drugs/inventory.vue

@@ -336,6 +336,10 @@ export default {
                   //  }else{
                   //    list[i].type = 6
                   //   }
+                   list[i].last_stock_max_number = 0
+                   list[i].last_stock_max_number = list[i].stock_max_number
+                   list[i].last_stock_min_number = 0
+                   list[i].last_stock_min_number = list[i].stock_min_number
                    list[i].type = 6
                    for(let j=0;j<this.manufacturerList.length;j++){
                      if(list[i].manufacturer == this.manufacturerList[j].id){

src/xt_pages/stock/historyInventory.vue

@@ -0,0 +1,360 @@
+<template>
+    <!--患者发药-->
+    <div class="main-contain new-main-contain">
+      <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+      </div>
+      <div
+        class="app-container"
+        style="display: flex; flex: 1; padding: 10px 20px 0px 20px"
+      >
+        <div class="mainLeft">
+          <div>
+            <div
+              class="list"
+              style="display: flex; justify-content: space-between"
+            >
+              <el-input
+                size="small"
+                style="width: 200px"
+                v-model="keywords"
+                class="filter-item"
+                placeholder="请输入耗材名称"
+                clearable
+              />
+              <el-button
+               
+                size="small"
+                class="filter-item"
+                type="primary"
+                @click="searchAction"
+                >搜索
+              </el-button>
+            </div>
+  
+            <el-table
+              height="80vh"
+              ref="table01"
+              :data="goodList"
+              highlight-current-row
+              @current-change="handleCurrentChange"
+              border
+              style="width: 100%"
+              v-if="state == 1"
+              :row-style="{ color: '#303133' }"
+              :header-cell-style="{
+                backgroundColor: 'rgb(245, 247, 250)',
+                color: '#606266',
+              }"
+            >
+              <el-table-column prop="date" label="耗材名称" align="center">
+                <template slot-scope="scope">
+                   {{scope.row.good_name}}
+                </template>
+              </el-table-column>
+              <el-table-column prop="name" label="规格" align="center">
+                <template slot-scope="scope">
+                    {{scope.row.specification_name}}
+                </template>
+              </el-table-column>
+
+              <el-table-column prop="name" label="厂家" align="center">
+                <template slot-scope="scope">
+                  {{getManufacturerName(scope.row.manufacturer)}}
+                </template>
+              </el-table-column>
+            </el-table>
+            
+          </div>
+        </div>
+
+        <div class="mainRight">
+          <div class="titlelist">
+          <div>
+            <div>日期：{{nowTime}}   盘点人：{{user_name}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 
+           </div>
+          </div>
+
+        </div>
+        <el-divider style="margin-top: 10px"></el-divider>
+        <div>
+          <el-table
+            :height="tableHeight"
+            :data="infoList"
+            border
+            style="width: 100%"
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266',
+            }"
+          >
+            <el-table-column label="入库单号"  align="center">
+              <template slot-scope="scope">
+                {{scope.row.warehousing_order}}
+              </template>
+            </el-table-column>
+            <el-table-column label="入库数量"  align="center">
+              <template slot-scope="scope">
+                {{scope.row.warehousing_count}}
+              </template>
+            </el-table-column>
+            <el-table-column label="有效期"  align="center">
+              <template slot-scope="scope">
+                {{getTime(scope.row.expiry_date)}}
+              </template>
+            </el-table-column>
+            <el-table-column label="批号"  align="center">
+              <template slot-scope="scope">
+                 {{scope.row.number}}
+              </template>
+            </el-table-column>
+            <el-table-column label="进货价"  align="center">
+              <template slot-scope="scope">
+                  {{scope.row.price}}
+              </template>
+            </el-table-column>
+            <el-table-column label="剩余库存"  align="center">
+              <template slot-scope="scope">
+                 {{scope.row.stock_count}}
+              </template>
+            </el-table-column>
+            <el-table-column label="盘点后数量"  align="center">
+              <template slot-scope="scope">
+                <el-input style="width:80px" v-model="scope.row.last_stock_count" type="number"></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作"  align="center">
+              <template slot-scope="scope">
+                <span><el-button type="danger" @click="UpdateWarehouseInfo(scope.row)">保存</el-button></span>
+              </template>
+            </el-table-column>
+           
+          </el-table>
+        </div>
+       
+      </div>
+    
+      </div>
+    </div>
+  </template>
+  
+  <script>
+  
+  import BreadCrumb from "@/xt_pages/components/bread-crumb";
+  import {
+    getGoodInventoryList,
+    getGoodInventoryByGoodId,
+    updateInventoryWarehouseInfo
+  } from "@/api/pharmacy";
+  const moment = require("moment");
+  import { uParseTime } from '@/utils/tools'
+  export default {
+    components: {
+      BreadCrumb,
+    },
+    data() {
+      return {
+        nowTime: moment(new Date()).format("YYYY-MM-DD HH:MM:SS"),
+        patient_id: 0,
+        crumbs: [
+          { path: false, name: "耗材管理" },
+          { path: "/Pharmacy/patiantDispensing", name: "耗材盘点" },
+        ],
+        tableHeight: 400,
+        start_time: moment(new Date()).add("year", 0).format("YYYY-MM-DD"),
+        start_time2: moment(new Date()).add("year", 0).format("YYYY-MM-DD HH:mm"),
+        state: 1, //1待发药，2已发药
+        waitmount: 0, //待发药人数
+        waitmount_data: [],
+        alreadmount: 0, //已发药人数
+        alreadmount_data: [],
+        keywords: "",
+        tableData: [],
+        propsTable: [],
+        tableData_list: [],
+        isVisibility: false,
+        isVisibilityTwo:false,
+        currentRow: null,
+        dialogVisible: false,
+        is_open: "2",
+        banshift: [
+          { value: 0, text: "全部班" },
+          { value: 1, text: "上午" },
+          { value: 2, text: "下午" },
+          { value: 3, text: "晚上" },
+        ],
+        shift: 0, //班次
+        fen: [],
+        partition: 0, //分区
+        drugList:[],
+        baseList:[],
+        org_id:'',
+        patients:{},
+        doctors:[],
+        diagnosearr:[],
+        diagnosis:'',
+        goodList:[],
+        manufacturerList:[],
+        user_name:this.$store.getters.xt_user.user.user_name,
+        infoList:[]
+      };
+    },
+    watch: {},
+    created() {
+      this.org_id = this.$store.getters.xt_user.org.id
+
+      this.getGoodInventoryList()
+    },
+   methods:{
+    getTime(val) {
+        if(val < 0){
+        return ""
+        }
+        if(val == ""){
+        return ""
+        }else {
+        return uParseTime(val, '{y}-{m}-{d}')
+        }
+     },
+    searchAction(){
+        this.getGoodInventoryList()
+    },
+    getGoodInventoryList(){
+        var params = {
+            keywords:this.keywords
+        }
+       getGoodInventoryList(params).then(response=>{
+            if(response.data.state ==1){
+                var list = response.data.data.list
+                this.goodList = list
+                this.$refs.table01.setCurrentRow(this.goodList[0])
+                this.manufacturerList = response.data.data.manufacturerList
+            }
+        })
+     },
+     getManufacturerName(id){
+       var manufacturer_name = ""
+       for(let i=0;i<this.manufacturerList.length;i++){
+          if(id == this.manufacturerList[i].id){
+            manufacturer_name = this.manufacturerList[i].manufacturer_name
+          }
+       }
+       return manufacturer_name
+     },
+     handleCurrentChange(val){
+       getGoodInventoryByGoodId(val.id).then(response=>{
+          if(response.data.state ==1){
+             var obj = {}
+             this.infoList = response.data.data.infoList
+          }
+       })
+     },
+     UpdateWarehouseInfo(row){
+       if(parseInt(row.last_stock_count) >=parseInt(row.stock_count)){
+         this.$message.error("该批次盘点后数量不能大于或等于入库数量!")
+         return false
+       }
+        var params = {
+            id:row.id,
+            stock_count:parseInt(row.stock_count),
+            last_stock_count:parseInt(row.last_stock_count),
+            good_id:row.good_id,
+            storehouse_id:parseInt(val.storehouse_id), 
+        }
+       updateInventoryWarehouseInfo(params).then(response=>{
+          if(response.data.state ==1){
+            var msg = response.data.data.msg
+            this.$message.success("保存成功!")
+          }
+       })
+     }
+    }
+  };
+  </script>
+  
+  <style rel="stylesheet/css" lang="scss" scoped>
+  .new-main-contain {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+  }
+  
+  .app-container {
+    height: 100%;
+  }
+  .mainLeft {
+    width: 400px;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+  
+    .el-radio {
+      margin-right: 5px;
+    }
+  
+    .list {
+      margin: 10px 0;
+    }
+  }
+  .mainRight {
+    margin-left: 10px;
+    flex: 1;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    overflow-y: auto;
+    .titlelist {
+      display: flex;
+      justify-content: space-between;
+      white-space: nowrap;
+      color: #909399;
+      font-size: 14px;
+      /deep/ .el-input__inner {
+        font-size: 13px !important;
+      }
+    }
+    .el-table {
+      margin-top: -13px;
+    }
+    .el-button {
+      height: 34px;
+      width: 65px;
+    }
+    /deep/ .el-divider {
+      height: 2px;
+      margin-top: 10px;
+    }
+  
+    /deep/ .el-table__body-wrapper {
+      overflow-x: scroll !important;
+    }
+  }
+  
+  /deep/ .el-input__inner {
+    padding-right: 15px;
+  }
+  
+  /deep/ .el-table--scrollable-x .el-table__body-wrapper {
+    overflow: auto;
+    overflow-x: hidden;
+  }
+  /deep/ .gutter {
+    width: 15px !important;
+    display: inline-block !important;
+  }
+  /deep/ .el-table__fixed-right-patch {
+    width: 15px !important;
+  }
+  
+  /deep/ .el-table__fixed-right {
+    bottom: 0 !important;
+    left: auto;
+    right: 0;
+  }
+  /deep/ .el-table__body-wrapper::-webkit-scrollbar {
+    width: 15px !important;
+    height: 15px !important;
+  }
+  </style>
+  

src/xt_pages/stock/inventory.vue

@@ -462,6 +462,9 @@ export default {
               //   list[i].type = 6
               // }
               list[i].type =6
+
+              list[i].last_stock_count = 0
+              list[i].last_stock_count = list[i].stock_count
               
               list[i].good_name = list[i].GoodInfo.good_name
               list[i].specification_name = list[i].GoodInfo.specification_name
@@ -501,7 +504,7 @@ export default {
               }
             }
         
-          
+          console.log("hahhahahahah",newList)
           this.tableData = newList
           this.showSearch = false
           this.showTable = true

src/xt_pages/stock/stockInventory.vue

@@ -11,6 +11,9 @@
             <el-tab-pane label="耗材盘点(模式二)" name="four">
                 <new-inventory ref="childFour"></new-inventory>
             </el-tab-pane>
+            <!-- <el-tab-pane label="耗材盘点(模式三)" name="five">
+                <history-inventory ref="childFive"></history-inventory>
+            </el-tab-pane> -->
             <el-tab-pane label="盘点列表" name="second">
                 <inventory-details ref="child"></inventory-details>
             </el-tab-pane>
@@ -29,6 +32,7 @@
 import BreadCrumb from "../components/bread-crumb";
 import inventory from './inventory.vue'
 import newInventory from './newInventory.vue'
+import historyInventory from './historyInventory.vue'
 import inventoryDetails from './inventoryDetails.vue'
 import stockDamaged from "./stockDamaged.vue"
 export default {
@@ -38,7 +42,8 @@ export default {
         inventory,
         inventoryDetails,
         stockDamaged,
-        newInventory
+        newInventory,
+        historyInventory
     },
     data() {
         return{
@@ -61,6 +66,9 @@ export default {
         if(this.activeName =="three"){
           this.$refs.childOne.getlist()
         }
+        if(this.activeName == "five"){
+          this.$refs.childFive.getGoodInventoryList()
+        }
       }
     },
     created(){