hah阿凡达

src/api/advice.js

@@ -336,12 +336,12 @@ export function PostInitAdviceTemplate(params) {
   })
 }
 
-export function getPrintInfo(data, advice_type, stop_type) {
+export function getPrintInfo(data, advice_type, stop_type,his_str) {
   console.log('data', data)
   console.log('advice_tuype23232', advice_type)
   console.log('stop_type', stop_type)
   return request({
-    url: '/api/advicetemplate/getprintinfo?advice_type=' + advice_type + '&stop_type=' + stop_type,
+    url: '/api/advicetemplate/getprintinfo?advice_type=' + advice_type + '&stop_type=' + stop_type+'&his_str='+his_str,
     method: 'post',
     data: data
   })

src/api/patient.js

@@ -1495,4 +1495,41 @@ export function savePatentCount(params){
     method:"get",
     params:params
   })
+}
+
+export function getPatientCountList(params){
+ 
+  return request({
+    url:"/api/patient/getpatientcount",
+    method:"Get",
+    params:params
+  })
+}
+
+export function deletePatientCount(id,params){
+
+  return request({
+    url:"/api/patient/deletepatientcount?id="+id,
+    method:"get",
+    params:params
+  })
+}
+
+export function checkPatientCount(id,params){
+
+  return request({
+    url:"/api/patient/checkpatientcount?id="+id,
+    method:"get",
+    params:params,
+    
+  })
+}
+
+export function toReturnCheck(id,params){
+
+  return request({
+    url:"/api/patient/returncheck?id="+id,
+    method:"get",
+    params:params
+  })
 }

src/router/modules/charging.js

@@ -12,47 +12,47 @@ export default {
     title:'charging',
     icon: 'statistics'
   },
-  // children: [
-  //   {
-  //     path: '/dialysis/charging',
-  //     component: () => import('@/xt_pages/charging/index'),
-  //     name: '计费查询',
-  //     meta: {
-  //       title: '计费查询',
-  //       noCache: true
-  //     }
-  //   },
-  //   {
-  //     path: '/dialysis/charging_cz',
-  //     component: () => import('@/xt_pages/charging/charging_cz'),
-  //     name: '计费充值',
-  //     is_menu: false,
-  //     hidden: true,
-  //     meta: {
-  //       title: '计费充值',
-  //       noCache: true
-  //     }
-  //   },
-  //   {
-  //     path: '/dialysis/chargin_kf',
-  //     component: () => import('@/xt_pages/charging/chargin_kf'),
-  //     name: '计数扣费',
-  //     is_menu: false,
-  //     hidden: true,
-  //     meta: {
-  //       title: '计数扣费',
-  //       noCache: true
-  //     }
-  //   },
-  //   {
-  //     path: '/dialysis/charging_collect',
-  //     component: () => import('@/xt_pages/charging/charging_collect'),
-  //     name: '计费汇总',
-  //     meta: {
-  //       title: '计费汇总',
-  //       noCache: true
-  //     }
-  //   },
-  // ]
+  children: [
+    {
+      path: '/dialysis/charging',
+      component: () => import('@/xt_pages/charging/index'),
+      name: '计费查询',
+      meta: {
+        title: '计费查询',
+        noCache: true
+      }
+    },
+    {
+      path: '/dialysis/charging_cz',
+      component: () => import('@/xt_pages/charging/charging_cz'),
+      name: '计费充值',
+      is_menu: false,
+      hidden: true,
+      meta: {
+        title: '计费充值',
+        noCache: true
+      }
+    },
+    {
+      path: '/dialysis/chargin_kf',
+      component: () => import('@/xt_pages/charging/chargin_kf'),
+      name: '计数扣费',
+      is_menu: false,
+      hidden: true,
+      meta: {
+        title: '计数扣费',
+        noCache: true
+      }
+    },
+    {
+      path: '/dialysis/charging_collect',
+      component: () => import('@/xt_pages/charging/charging_collect'),
+      name: '计费汇总',
+      meta: {
+        title: '计费汇总',
+        noCache: true
+      }
+    },
+  ]
  
 }

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -554,7 +554,8 @@ export default {
       drug_id:0,
       newArrList:[],
       baseList:[],
-      textAreaList:[]
+      textAreaList:[],
+      scan_code:""
     };
   },
 
@@ -580,7 +581,7 @@ export default {
     // 追溯码
     getDrugCode(id,DataSources,DrugCode,index){
       
-      if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 10610 || this.$store.getters.xt_user.org.id == 10537){
+      if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 10610 || this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 0){
         var params = {
             drug_id:this.drug_id,
             start_time:moment().subtract(15, 'days').format("YYYY-MM-DD")
@@ -591,6 +592,8 @@ export default {
             
             var adviceList = response.data.data.adviceList
 
+           this.scan_code = response.data.data.drug.scan_code
+              
             var str = ""
             if(adviceList!=null && adviceList.length>0){
               for(let i=0;i<adviceList.length;i++){
@@ -700,19 +703,14 @@ export default {
         textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
 
       
-        if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 10610 || this.$store.getters.xt_user.org.id == 10537){
+        if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 10610 || this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 0){
           
           var drugindentificaitoncode = this.getDrugIdentificationCode(this.drug_id)
-          // console.log("drugindentification===================",drugindentificaitoncode)
-
-          var scan_code = this.getDrugScanCode(this.drug_id)
-          
-          // console.log("scan_code============",scan_code)
-
+         
           var total_one = 0
           var total_two = 0
 
-          // console.log("newArr-------------",this.newArrList)
+          
 
           var arr= []
           arr = textarea.split(",")
@@ -785,14 +783,11 @@ export default {
              }
           }
 
-
-          // console.log("数量1--------------",total_one)
-          // console.log("数量2---------------",total_two)
-        
-          // console.log("scan_code=====",scan_code)
-          
-          if(scan_code>0){
-            if((total_one + total_two)>scan_code){
+          console.log("total_one-----------",total_one)
+          console.log("total_two-----------",total_two)
+   
+          if(this.scan_code>0){
+            if((total_one + total_two)>this.scan_code){
               this.$message.error("扫码次数已经超过限制!")
               arr.splice(i_index,1)
             }
@@ -800,45 +795,55 @@ export default {
          
          var is_arr = this.hasDuplicates(arr)
 
-        //  console.log("is_arr-=--------------",is_arr)
+       
 
         this.textarea = arr.join(",")
 
         }else{
-          // console.log("textarea22==============",textarea)
+          var arr = textarea.split(",");
+          
+          var lastElement = arr[arr.length - 2];
 
-          var newArr = []
-          var is_err_check = 0
-          var i_index = ""
-          var arr = textarea.split(",")
-          if(arr!=null && arr.length>0){
+          if(lastElement.length!=20){
+            this.$message.error("药品追溯码长度没有满足20位!")
+            arr.splice(arr.length-2,1)
+          }
+          console.log("arr-------------",arr)
+         
+          this.textarea = ""
+          this.textarea = arr.join(",")
+
+          // var newArr = []
+          // var is_err_check = 0
+          // var i_index = ""
+          // var arr = textarea.split(",")
+          // if(arr!=null && arr.length>0){
             
-            for(let i=0;i<arr.length;i++){
-              console.log("arrp[i].")
-              i_index = i
-              if(arr[i]!=""){
-                if(arr[i].length!=20){
-                 this.$message.error("药品追溯码长度没有满足20位!")
-                  is_err_check = 1
-                }else{
-                  newArr.push(arr[i])
-                }
+          //   for(let i=0;i<arr.length;i++){
+          //     console.log("arrp[i].")
+          //     i_index = i
+          //     if(arr[i]!=""){
+          //       if(arr[i].length!=20){
+          //        this.$message.error("药品追溯码长度没有满足20位!")
+          //         is_err_check = 1
+          //       }else{
+          //         newArr.push(arr[i])
+          //       }
                 
-              }
-            }
-          }
-          // console.log("is_err_check==============",is_err_check)
-          // console.log("i_index=====",i_index)
-          if(is_err_check == 1){
-             newArr.splice(i_index,1)
-          }
+          //     }
+          //   }
+          // }
+         
+          // if(is_err_check == 1){
+          //    newArr.splice(i_index,1)
+          // }
 
           
-          if(newArr!=null && newArr.length>0){
+          // if(newArr!=null && newArr.length>0){
            
-            this.textarea = newArr.join(",")
-          }
-          this.textarea = textarea
+          //   this.textarea = newArr.join(",")
+          // }
+          // this.textarea = textarea
         }
        
       }

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -423,7 +423,8 @@ export default {
       drug_id:0,
       total_count:0,
       newArrList:[],
-      textAreaList:[]
+      textAreaList:[],
+      scan_code:""
     };
   },
  
@@ -1268,17 +1269,21 @@ export default {
     getDrugCode(id,DataSources,DrugCode,index,DrugId){
       
      // 针对百霖
-       if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 10610 || this.$store.getters.xt_user.org.id == 10537){
+       if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 10610 || this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id==0){
           var params = {
             drug_id:DrugId,
             start_time:moment().subtract(15, 'days').format("YYYY-MM-DD")
           }
-          console.log("params-------------",params)
          getDrugTocalCount(params).then(response=>{
            if(response.data.state == 1){
              
             var adviceList = response.data.data.adviceList
 
+            var drug = response.data.data.drug
+              
+            this.scan_code = drug.scan_code
+
+
             var str = ""
             if(adviceList!=null && adviceList.length>0){
               for(let i=0;i<adviceList.length;i++){
@@ -1318,8 +1323,7 @@ export default {
                
                this.newArrList = []
                this.newArrList = arr
-
-
+               console.log("newARRlIST----------",this.newArrList)
             }
               
             this.drug_id = DrugId
@@ -1367,6 +1371,7 @@ export default {
         drug_code:this.textarea,
        }
        console.log("paramss",params)
+
       changeDrugCode(params).then(response=>{
          if(response.data.state == 1){
             this.$message.success("保存成功!")
@@ -1387,25 +1392,19 @@ export default {
        
         var textarea = ""
         textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
+        
 
-      
+        
+
+        
          
-        if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id==0 || this.$store.getters.xt_user.org.id == 10278|| this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10610){
+        if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278|| this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10610){
 
           var drugindentificaitoncode = this.getDrugIdentificationCode(this.drug_id)
-          console.log("drugindentification===================",drugindentificaitoncode)
-
-          var scan_code = this.getDrugScanCode(this.drug_id)
-          
-          console.log("scan_code============",scan_code)
-
+             
           var total_one = 0
           var total_two = 0
 
-          console.log("newArr-------------",this.newArrList)
-
-         
-
           var arr= []
           arr = textarea.split(",")
           var arrList = []
@@ -1449,6 +1448,7 @@ export default {
                    this.$message.error("药品追溯码长度没有满足20位!")
                    is_err_check = true
                  }
+
                  if(drugindentificaitoncode>0){
                   if(arr[i].substring(0,7)!= drugindentificaitoncode){
                     this.$message.error("药品标识码格式不正确,请重新扫码")
@@ -1481,26 +1481,35 @@ export default {
           console.log("数量1--------------",total_one)
           console.log("数量2---------------",total_two)
         
-          console.log("scan_code=====",scan_code)
+        
           
-          if(scan_code>0){
-            if((total_one + total_two)>scan_code){
+          if(this.scan_code>0){
+            if((total_one + total_two)>this.scan_code){
               this.$message.error("扫码次数已经超过限制!")
               arr.splice(i_index,1)
             }
           }
          
-
-
-
          var is_arr = this.hasDuplicates(arr)
 
-         console.log("is_arr-=--------------",is_arr)
-
           this.textarea = arr.join(",")
         }else{
+          // console.log("haaaaaaaaaaaaaaaaaaa",textarea)
+          
+          var arr = textarea.split(",");
+          
+          var lastElement = arr[arr.length - 2];
+
+          if(lastElement.length!=20){
+            this.$message.error("药品追溯码长度没有满足20位!")
+            arr.splice(arr.length-2,1)
+          }
+          console.log("arr-------------",arr)
+         
+          this.textarea = ""
+          this.textarea = arr.join(",")
 
-          this.textarea = textarea
+          // this.textarea = textarea
         }
         
 

src/xt_pages/charging/charging_cz.vue

@@ -13,43 +13,74 @@
               v-model="value1"
               type="daterange"
               range-separator="至"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
               start-placeholder="开始日期"
               end-placeholder="结束日期">
             </el-date-picker>
           </div>
-          <div><el-button type="primary">查询</el-button></div>
+          <div><el-button type="primary" @click="query">查询</el-button></div>
           <el-button type="primary" @click="newcz_show=true">新增</el-button>
         </div>
         <div style="flex: 1;text-align: right;">
-          <!-- <el-button type="primary" @click="new_show=true">新增</el-button> -->
+          
         </div>
       </div>
       <div style="margin:10px 0;">
         <el-table border :data="tableData" style="width: 100%" :header-cell-style="{'text-align':'center'}" :cell-style="{'text-align':'center'}">
           <el-table-column prop="index" label="序号" width="50">
+            <template slot-scope="scope">
+                {{scope.$index + 1}}
+             </template>
           </el-table-column>
           <el-table-column prop="name" label="患者姓名" width="">
+            <template slot-scope="scope">
+                {{getPatientName(scope.row.patient_id)}}
+             </template>
           </el-table-column>
           <el-table-column prop="HD" label="充值时间">
+            <template slot-scope="scope">
+                {{scope.$index + 1}}
+             </template>
           </el-table-column>
           <el-table-column prop="HDF" label="充值类型">
+            <template slot-scope="scope">
+             <span v-if="scope.row.is_type==1">HD</span>
+             <span v-if="scope.row.is_type==2">HDF</span>
+             <span v-if="scope.row.is_type==3">HD+HP</span>
+             <span v-if="scope.row.is_type==4">HP</span>
+             <span v-if="scope.row.is_type==5">其他</span>
+            </template>
           </el-table-column>
           <el-table-column prop="HD+HP" label="充值次数">
+            <template slot-scope="scope">
+               {{ scope.row.count }}
+            </template>
           </el-table-column>
           <el-table-column prop="HP" label="状态">
+             <template slot-scope="scope">
+                <span v-if="scope.row.is_check == 1">已审核</span>
+                <span v-if="scope.row.is_check == 2">未审核</span>
+             </template>
           </el-table-column>
           <el-table-column prop="qita" label="创建人">
+            <template slot-scope="scope">
+                {{ getAdminUser(scope.row.creater) }}
+             </template>
           </el-table-column>
           <el-table-column prop="qita" label="备注">
+            <template slot-scope="scope">
+               {{ scope.row.remark }}
+             </template>
           </el-table-column>
           <el-table-column prop="address" label="操作" width="300">
             <template slot-scope="scope">
-              <span v-if="scope.row.examine==false">
-                <el-button type="primary" @click="cz_click(scope.row)" >反审核</el-button>
+              <span v-if="scope.row.is_check==1">
+                <el-button type="primary" @click="toReturnCheck(scope.row.id)" >反审核</el-button>
               </span>
-              <div v-if="scope.row.examine==true">
-                <el-button type="primary" >审核</el-button>
-                <el-button type="danger">删除</el-button>
+              <div v-if="scope.row.is_check==2">
+                <el-button type="primary" @click="toCheck(scope.row.id)">审核</el-button>
+                <el-button type="danger" @click="deletePatientCount(scope.row.id,scope.$index)">删除</el-button>
               </div>
             </template>
           </el-table-column>
@@ -60,10 +91,10 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="currentPage"
-          :page-sizes="[100, 200, 300, 400]"
-          :page-size="100"
+          :page-sizes="[10, 20, 30, 40,100]"
+          :page-size="10"
           layout="total, sizes, prev, pager, next, jumper"
-          :total="400">
+          :total="total">
         </el-pagination>
       </div>
     </div>
@@ -118,9 +149,10 @@
   </div>
 </template>
 <script>
-  import {getPatientMapList,savePatentCount } from "@/api/patient"
+  import {getPatientMapList,savePatentCount,getPatientCountList,deletePatientCount,checkPatientCount,toReturnCheck } from "@/api/patient"
   import BreadCrumb from "@/xt_pages/components/bread-crumb";
   export default{
+    components: { BreadCrumb },
     data(){
       return{
         input:'',
@@ -135,19 +167,37 @@
         },
         smart_keyword:"",
         currentPage:1,
-        tableData: [{ index: 1, name: '小米', HD: 1, HDF: 1, 'HD+HP': 1, 'qita': 1,examine:false }],
+        tableData: [],
         patient_id:0,
         hd_count:"1",
         hdf_count:"1",
         hdhp_count:"1",
         hp_count:"1",
         other_count:"0",
+        patientList:[],
+        limit:10,
+        page:1,
+        total:0,
+        userList:[]
       }
     },
     methods:{
+      getPatientName(id){
+       var name = ""
+      for(let i=0;i<this.patientList.length;i++){
+        if(id == this.patientList[i].id){
+          name = this.patientList[i].name
+        }
+      }
+      return name
+     },
+      query(){
+        this.getlist()
+      },
       handleSelect(val){
         this.smart_keyword = val.name;
         this.patient_id = val.id
+        this.getlist()
       },
       querySearch(queryString, cb){
         let key = ''
@@ -174,10 +224,12 @@
         row.examine=true
       },
       handleSizeChange(){
-
+        this.limit = limit;
+        this.getList();
       },
       handleCurrentChange(){
-
+        this.page = page;
+        this.getList();
       },
       savePatentCount(){
         var params = {
@@ -191,15 +243,75 @@
         }
        savePatentCount(params).then(response=>{
           if(response.data.state == 1){
-             var patientInCount = response.data.data.patientInCount
+             var msg = response.data.data.msg
+             this.$message.success("保存成功")
              this.newcz_show = false
           }
        }) 
+      },
+      getlist(){
+          var params = {
+            limit:this.limit,
+            page:this.page,
+            patient_id:this.patient_id,
+            start_time:this.start_time,
+            end_time:this.end_time
+          }
+        getPatientCountList(params).then(response=>{
+          if(response.data.state == 1){
+             
+            this.tableData = []
+            this.tableData = response.data.data.list
+
+            this.total = response.data.data.total
+
+            this.patientList = []
+            this.patientList = response.data.data.patient
+            this.userList = []
+            this.userList = response.data.data.userList
+          }
+        })
+      },
+      getAdminUser(creater){
+        var user_name = ""
+        for(let i=0;i<this.userList.length;i++){
+           if(creater == this.userList[i].id){
+              user_name = this.userList[i].name
+           }
+        }
+        return user_name
+      },
+      deletePatientCount(id,index){
+        deletePatientCount(id,index).then(response=>{
+          if(response.data.state == 1){
+            var msg = response.data.data.msg
+            this.$message.error("删除成功!")
+            this.tableData.splice(index,1)
+          }
+        })
+      },
+      toCheck(id){
+         checkPatientCount(id).then(response=>{
+            if(response.data.state == 1){
+              var checkpatientcount =  response.data.data.checkpatientcount
+              this.$message.success("审核成功!")
+              this.getlist()
+            }
+         })
+      },
+      toReturnCheck(id){
+        toReturnCheck(id).then(response=>{
+          if(response.data.state == 1){
+             var checkPatientCount = response.data.data.checkpatientcount
+             this.$message.success("反审核成功!")
+             this.getlist()
+          }
+        })
       }
      
     },
     created(){
-     
+     this.getlist()
     }
   }
 </script>

src/xt_pages/charging/index.vue

@@ -6,8 +6,22 @@
     <div class="app-container">
       <div style="display: flex;margin-bottom: 10px;">
         <div style="flex: 1;">
-          <el-autocomplete class="inline-input" v-model="state1" :fetch-suggestions="querySearch" placeholder="请输入患者姓名"
-            @select="handleSelect"></el-autocomplete>
+          <!-- <el-autocomplete class="inline-input" v-model="state1" :fetch-suggestions="querySearch" placeholder="请输入患者姓名"
+            @select="handleSelect"></el-autocomplete> -->
+
+            <el-autocomplete
+              class="inline-input"
+               v-model.trim="smart_keyword"
+              :fetch-suggestions="querySearch"
+              placeholder="请输入内容"
+              @select="handleSelect"
+              
+            >
+           <i class="el-icon-search el-input__icon" slot="suffix"></i>
+          <template slot-scope="{ item }">
+            <div class="name">{{ item.name }}</div>
+          </template>
+          </el-autocomplete>
         </div>
         <div style="flex: 1;text-align: right;">
           <el-button type="primary">扣减配置</el-button>
@@ -19,18 +33,39 @@
           :cell-style="{'text-align':'center'}
         ">
           <el-table-column prop="index" label="序号" width="50">
+            <template slot-scope="scope">
+                {{scope.$index + 1}}
+             </template>
           </el-table-column>
           <el-table-column prop="name" label="患者姓名" width="">
+            <template slot-scope="scope">
+                {{getPatientName(scope.row.patient_id)}}
+             </template>
           </el-table-column>
           <el-table-column prop="HD" label="HD">
+            <template slot-scope="scope">
+                {{scope.row.hd_count}}
+             </template>
           </el-table-column>
           <el-table-column prop="HDF" label="HDF">
+            <template slot-scope="scope">
+                {{scope.row.hdf_count}}
+             </template>
           </el-table-column>
           <el-table-column prop="HD+HP" label="HD+HP">
+            <template slot-scope="scope">
+                {{scope.row.hdhp_count}}
+             </template>
           </el-table-column>
           <el-table-column prop="HP" label="HP">
+            <template slot-scope="scope">
+                {{scope.row.hp_count}}
+             </template>
           </el-table-column>
           <el-table-column prop="qita" label="其他">
+            <template slot-scope="scope">
+                {{scope.row.other_count}}
+             </template>
           </el-table-column>
           <el-table-column prop="address" label="操作" width="300">
             <template slot-scope="scope">
@@ -107,8 +142,14 @@
         <div style="margin: 10px 0;">
           <el-table border :data="tableData" style="width: 100%" :header-cell-style="{'text-align':'center'}" :cell-style="{'text-align':'center'}">
             <el-table-column prop="index" label="序号" width="">
+              <template slot-scope="scope">
+                {{scope.$index + 1}}
+              </template>
             </el-table-column>
             <el-table-column prop="name" label="患者姓名" width="">
+              <template slot-scope="scope">
+                {{getPatientName(scope.row.patient_id)}}
+              </template>
             </el-table-column>
             <el-table-column prop="HD" label="费用发生时间">
             </el-table-column>
@@ -130,7 +171,11 @@
 </template>
 
 <script>
+import {getPatientMapList,getPatientCountList } from "@/api/patient"
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import { create } from "sortablejs";
 export default {
+  components: { BreadCrumb },
   data() {
     return {
       crumbs: [
@@ -140,33 +185,58 @@ export default {
       value:0,
       restaurants: [{value: '小米' }, { value: '小王' }],
       state1: '',
-      tableData: [{ index: 1, name: '小米', HD: 1, HDF: 1, 'HD+HP': 1, 'qita': 1 }],
+      tableData: [],
       options:[{value:0,label:'全部'},{value:1,label:'充值'},{value:2,label:'扣费'}],
       currentPage:1,
       details_show:false,
+      smart_keyword:"",
+      patient_id:"",
+      limit:10,
+      page:1,
+      total:0,
+      patientList:[]
     }
   },
   methods: {
-    handleSelect() {
-
-    },
-    querySearch(queryString, cb) {
-      console.log('vvvvv',queryString);
-      var restaurants = this.restaurants;
-      var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
-      // 调用 callback 返回建议列表的数据
-      cb(results);
-    },
+    handleSelect(val){
+        this.smart_keyword = val.name;
+        this.patient_id = val.id
+        this.getlist()
+      },
+      querySearch(queryString, cb){
+        let key = ''
+        if (queryString != undefined) {
+          key = queryString
+        }
+        let searchArray = []
+         var  params = {
+          keyword:key
+         }
+        getPatientMapList(params).then(response => {
+          if (response.data.state == 1) {
+            searchArray = response.data.data.patient
+            console.log("searchArray-------------",searchArray)
+            cb(searchArray)
+          } else {
+            this.$message.error(response.data.msg)
+            cb([])
+          }
+        })
+        return searchArray
+      },
+   
     createFilter(queryString) {
       return (restaurant) => {
         return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
       };
     },
-    handleSizeChange(){
-
+  handleSizeChange(){
+      this.limit = limit;
+      this.getList();
     },
     handleCurrentChange(){
-      
+      this.page = page;
+      this.getList();
     },
     details_click(row){
       this.details_show=true
@@ -176,7 +246,38 @@ export default {
     },
     kf_click(){
       this.$router.push({path:'/dialysis/chargin_kf'})
-    }
+    },
+    getlist(){
+      var params = {
+        limit:this.limit,
+        page:this.page,
+        patient_id:this.patient_id
+      }
+    getPatientCountList(params).then(response=>{
+      if(response.data.state == 1){
+        var list =  response.data.data.list
+       
+        this.tableData = []
+        this.tableData = list
+        this.total = response.data.data.total
+        this.patientList = []
+        this.patientList = response.data.data.patient
+
+      }
+    })
+   },
+   getPatientName(id){
+     var name = ""
+     for(let i=0;i<this.patientList.length;i++){
+      if(id == this.patientList[i].id){
+         name = this.patientList[i].name
+      }
+     }
+     return name
+   }
+  },
+ created(){
+    this.getlist()
   }
 }
 </script>

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1471,14 +1471,14 @@
                             }}
                           </td>
                           <td v-if="org_id != 10683">
-                            <span v-if="org_id == 9671 || org_id == 10440 || org_id == 10471">
+                            <span v-if="org_id == 9671 || org_id == 10440 || org_id == 10471 || org_id == 10744">
                               {{
                                 monitor_record.ultrafiltration_volume
                                   ? monitor_record.ultrafiltration_volume
                                   : "0"
                               }}
                             </span>
-                            <span v-if="org_id != 9671 && org_id != 10440 && org_id != 10471">
+                            <span v-if="org_id != 9671 && org_id != 10440 && org_id != 10471 && org_id!=10744">
                               {{
                                 monitor_record.ultrafiltration_volume
                                   ? monitor_record.ultrafiltration_volume

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

@@ -207,7 +207,7 @@
           </el-table-column>
 
           <el-table-column
-            v-if="monitors[0] && monitors[0]['venous_pressure_type'] != 2&&org_id ==10693"
+            v-if="monitors[0] && monitors[0]['venous_pressure_type'] != 2 && org_id ==10693 && org_id == 10744"
             prop="venous_pressure"
             align="center"
             label="静脉压/动脉压(mmHg)"
@@ -784,7 +784,7 @@
                 org_id!=10558 &&
                 org_id!=10517 && 
                 org_id!=10414 && 
-                org_id!=10598 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644 && org_id!=10721 && org_id!=10731) ||
+                org_id!=10598 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644 && org_id!=10721 && org_id!=10731 && org_id!=10744) ||
                 org_id == 9779 ||
                 template_id == 11 ||
                 template_id == 20 ||
@@ -800,7 +800,7 @@
                 org_id == 10395 ||
                 org_id == 10206 ||
                 org_id == 10751 ||
-                org_id == 10752
+                org_id == 10752 
                 )
             "
           >
@@ -820,7 +820,7 @@
             width="100"
             v-if="
               isShow('置换量') &&
-              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551 || org_id ==10558 || org_id ==10517 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id ==10567 || org_id == 10644 || org_id == 10721 || org_id == 10731 || org_id == 10731) &&
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551 || org_id ==10558 || org_id ==10517 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id ==10567 || org_id == 10644 || org_id == 10721 || org_id == 10731 || org_id == 10731 || org_id == 10744) &&
               template_id != 9779 &&
               template_id != 11 &&
               template_id != 20 &&
@@ -2013,7 +2013,7 @@
             :span="8"
             v-if="
               isShow('置换量') &&
-              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id ==10551 || org_id ==10558 || org_id ==10346 || org_id ==10598 || org_id == 10694 || org_id == 10697 || org_id ==10567 || org_id ==10644 || org_id == 10721 || org_id ==10727 || org_id ==10206 || org_id == 10731) &&
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id ==10551 || org_id ==10558 || org_id ==10346 || org_id ==10598 || org_id == 10694 || org_id == 10697 || org_id ==10567 || org_id ==10644 || org_id == 10721 || org_id ==10727 || org_id ==10206 || org_id == 10731 || org_id == 10744) &&
               org_id != 9779 &&
               template_id != 11 &&
               template_id != 20 &&
@@ -2047,7 +2047,7 @@
                 org_id != 9919 &&
                 org_id != 10191 &&
                 org_id != 10551 &&
-                template_id != 43 && org_id!=10558 && org_id!=10346 && org_id!=10598 && org_id!=10414 && org_id !=10694 && org_id != 10697&& org_id != 10567 && org_id!=10644 && org_id!=10206 && org_id!=10731) ||
+                template_id != 43 && org_id!=10558 && org_id!=10346 && org_id!=10598 && org_id!=10414 && org_id !=10694 && org_id != 10697&& org_id != 10567 && org_id!=10644 && org_id!=10206 && org_id!=10731 && org_id!=10744) ||
                 org_id == 9779 ||
                 template_id == 11 ||
                 template_id == 20 ||

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -34,8 +34,8 @@
           <th v-if=" isShow('置换率') && (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410 && org_id!=10617  && org_id!=10677 && org_id !=10702 && org_id !=10721 && org_id !=10727 && org_id !=10206 && org_id!=10751&& org_id!=10752) || org_id == 10558 || org_id ==10598 || org_id ==10414 " width="92px" > 置换率(L/h)  </th>
           <th v-if=" isShow('置换率1')" width="92px" > 置换率(ml/min) </th>
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
-          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752 ) && org_id!=10558 && org_id!=10598  && org_id!=10414 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644 && org_id!=10731" width="92px"  > 置换量(ml)  </th>
-          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id ==10346 || org_id ==10517) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445  && this.$store.getters.xt_user.template_info.org_id != 10751&& this.$store.getters.xt_user.template_info.org_id != 10752) || org_id == 10558 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id == 10567 || org_id == 10644 || org_id == 10731" width="92px" > 置换量(L) </th>
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752 ) && org_id!=10558 && org_id!=10598  && org_id!=10414 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644 && org_id!=10731 && org_id!=10744" width="92px"  > 置换量(ml)  </th>
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id ==10346 || org_id ==10517) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445  && this.$store.getters.xt_user.template_info.org_id != 10751&& this.$store.getters.xt_user.template_info.org_id != 10752) || org_id == 10558 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id == 10567 || org_id == 10644 || org_id == 10731 || org_id == 10744" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('置换量1')" width="92px"  > 置换量(L)  </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
           <th v-if=" isShow('SpO₂') && org_id == 9829" width="92px" > SpO₂(%) </th>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -685,22 +685,7 @@
                         style="margin-left: 10px; flex: 1">
                         置换量：
                         <div class="under_line" style="width: 70px; text-align: center">
-                          <!-- <span v-if="org_id ==10206 "> {{
-                            prescription.replacement_total
-                              ? prescription.replacement_total
-                              : "/"
-                          }}
-                          </span>
-
-                          <span v-if="org_id ==10510 ">
-                            <span v-if="prescription!=null &&( prescription.mode_id ==2 || prescription.mode_id ==5 || presciption.mode_id==12)">{{
-                              afterdialysis.displace_liqui_value
-                              ? afterdialysis.displace_liqui_value
-                              : "/"
-                            }}
-                          </span>
-                          <span v-else>/</span>
-                          </span> -->
+                         
                           <span v-if="org_id != 10206 && org_id != 10510"> {{
                             prescription.displace_liqui_value
                               ? prescription.displace_liqui_value
@@ -1394,7 +1379,7 @@
                           <td width="50" v-if="org_id != 10489">呼吸<br />(次/分)</td>
                           <td width="50">血流量<br />(ml/min)</td>
                           <td width="50"
-                            v-if="org_id == 10478 || org_id == 10598 || org_id == 10510 || org_id == 10735">
+                            v-if="org_id == 10478 || org_id == 10598 || org_id == 10510 || org_id == 10735 || org_id == 10744">
                             动脉压<br />({{
                               monitors[0] &&
                                 monitors[0]["venous_pressure_type"] == 2
@@ -1453,12 +1438,11 @@
                             <span v-if="org_id != 10683">置换量</span>
                             <br />
                             <span
-                              v-if="org_id != 10598 && org_id != 10567 && org_id != 10724 && org_id != 10644 && org_id != 10353 && org_id != 10414">
+                              v-if="org_id != 10598 && org_id != 10567 && org_id != 10724 && org_id != 10644 && org_id != 10353 && org_id != 10414 && org_id!=10744">
                               <span v-if="org_id != 0 && org_id != 10683">(ml)</span>
                               <span v-if="org_id == 10683">(ml/h)</span>
                             </span>
-                            <span
-                              v-if="org_id == 10598 || org_id == 10567 || org_id == 10724 || org_id == 10644 || org_id == 10353 || org_id == 10414">(L)</span>
+                            <span v-if="org_id == 10598 || org_id == 10567 || org_id == 10724 || org_id == 10644 || org_id == 10353 || org_id == 10414 || org_id == 10744">(L)</span>
                           </td>
                           <td width="50" v-if="org_id == 3877 || org_id == 10449">滤前压(mmHg)</td>
                           <td width="50"
@@ -1483,7 +1467,7 @@
                           <td>{{ monitor.pulse_frequency ? monitor.pulse_frequency : "" }}</td>
                           <td v-if="org_id != 10489">{{ monitor.breathing_rate ? monitor.breathing_rate : "" }}</td>
                           <td>{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }}</td>
-                          <td v-if="org_id == 10478 || org_id == 10598 || org_id == 10510 || org_id == 10735">
+                          <td v-if="org_id == 10478 || org_id == 10598 || org_id == 10510 || org_id == 10735 || org_id == 10744">
                             {{
                               monitor.arterial_pressure
                                 ? monitor.arterial_pressure
@@ -1578,10 +1562,11 @@
                           <td v-if="org_id == 10489 || org_id == 10735 || org_id == 10600"><br />
                             {{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : "" }}
                           </td>
+
                           <td v-if="org_id != 10644 && org_id != 10683">
-                            <span v-if="org_id != 9671 && org_id != 10440 && org_id != 10617">{{
-                              monitor.ultrafiltration_volume ?
-                                monitor.ultrafiltration_volume: ""}}</span>
+                            <span v-if="org_id != 9671 && org_id != 10440 && org_id != 10617 && org_id!=10744">
+                              {{monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume: ""}}
+                            </span>
                             <span v-if="org_id == 9671 || org_id == 10440 || org_id == 10617">
                               <span v-if="org_id == 10617 && monindex == 0">{{ monitor.ultrafiltration_volume ?
                                 monitor.ultrafiltration_volume : "/" }}</span>
@@ -1589,8 +1574,12 @@
                                 monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "/" }}</span>
                               <span v-if="org_id == 10617 && (monindex != monitors.length - 1 && monindex != 0)">{{
                                 monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "0" }}</span>
-                              <span v-if="org_id != 10617">{{ monitor.ultrafiltration_volume ?
-                                monitor.ultrafiltration_volume : "0" }}</span>
+                              <span v-if="org_id != 10617">
+                                {{ monitor.ultrafiltration_volume ?monitor.ultrafiltration_volume : "0" }}
+                              </span>
+                            </span>
+                            <span v-if="org_id==10744">
+                              {{ monitor.ultrafiltration_volume ?monitor.ultrafiltration_volume : "0" }}
                             </span>
                           </td>
                           <td width="50"
@@ -4343,7 +4332,7 @@ export default {
         }
 
         //HIS客户显示临时医嘱的地方
-        if (this.org_id == 10510 || this.org_id == 10567 || this.org_id == 10489 || this.org_id == 10644 || this.org_id == 0 || this.org_id == 10724) {
+        if (this.org_id == 10510 || this.org_id == 10567 || this.org_id == 10489 || this.org_id == 10644|| this.org_id == 10724) {
           if (response.data.data.doctorAdevieInfo != null && response.data.data.doctorAdevieInfo.length > 0) {
 
             for (let i = 0; i < response.data.data.doctorAdevieInfo.length; i++) {
@@ -4506,6 +4495,8 @@ export default {
 
         console.log("新时间我哦我哦", this.doctor_advices)
 
+       
+
 
         //过滤口服药
         if (this.org_id == 10265) {
@@ -4560,6 +4551,11 @@ export default {
         }
         // console.log(this.advice_groups);
 
+        if(this.org_id == 10744 || this.org_id == 0){
+          
+          this.doctor_advices.sort((a, b) => a.execution_time - b.execution_time)
+        }
+
         console.log("医嘱列表=--=----------------------------------------------", this.doctor_advices)
       } else {
         this.loading = false;

src/xt_pages/qcd/patientControlAnalysis.vue

@@ -332,7 +332,8 @@ export default {
   methods: {
     handleStartTimeChange(){
       this.getlist()
-    },  handleEndTimeChange(){
+    }, 
+     handleEndTimeChange(){
       this.getlist()
     },
     handleSizeChange(limit) {
@@ -558,24 +559,9 @@ export default {
         if (response.data.state == 1) {
           this.isLoadingTwo = false
           var patients = response.data.data.patients
-
+          console.log("patients----------------",patients)
           this.tablePatients = patients
 
-          //  let dataInfothree = {}
-          //   patients.forEach((item, index) => {
-          //     let { inspect_date } = item
-          //     if (!dataInfothree[inspect_date]) {
-          //       dataInfothree[inspect_date] = {
-          //         inspect_date,
-          //         name: item.name,
-          //         child: [],
-          //         patient_id: item.patient_id,
-          //       }
-          //     }
-          //   })
-          // let patientlist = Object.values(dataInfothree)
-          // console.log("patientlist",patientlist)
-
           var total = response.data.data.total
           this.total = total
           var control = response.data.data.control

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -1032,6 +1032,8 @@ export default {
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else if(this.orgId==10537){
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId==10571){
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else if(this.orgId==10445){
           this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else if(this.orgId==10635){
@@ -1043,13 +1045,13 @@ export default {
         if(this.orgId  == 10265 || this.orgId ==10215 || this.orgId == 9919 || this.orgId == 9671 || this.orgId == 10402 || this.orgId==10138 || this.orgId==10278||this.orgId==10537||this.orgId==10610){
             this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
         }
-        if(this.orgId == 10210 || this.orgId == 9675  || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191 || this.orgId ==10489 || this.orgId == 10375 || this.orgId == 10485 || this.orgId ==10635 || this.orgId ==10726 || this.orgId == 10724 || this.orgId ==10635 || this.orgId ==10724 || this.orgId ==10726 || this.orgId ==10721 || this.orgId == 10633 || this.orgId == 0  || this.orgId == 10387){
+        if(this.orgId == 10210 || this.orgId == 9675  || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191 || this.orgId ==10489 || this.orgId == 10375 || this.orgId == 10485 || this.orgId ==10635 || this.orgId ==10726 || this.orgId == 10724 || this.orgId ==10635 || this.orgId ==10724 || this.orgId ==10726 || this.orgId ==10721 || this.orgId == 10633 || this.orgId == 0  || this.orgId == 10387 || this.orgId == 10571){
           this.tableOut[i].out_count = this.getWarehouseOut(this.tableOut[i].good_id)
         }
         if(this.orgId ==10445){
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
         }
-        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0&& this.orgId!=10402 && this.orgId != 10489 && this.orgId!=10375 && this.orgId!=10485&&this.orgId!=0&&this.orgId!=10138&&this.orgId!=10278&&this.orgId!=10537&&this.orgId!=10610 &&this.orgId!=10445 &&  this.orgId !=10635  &&  this.orgId !=10724 &&  this.orgId !=10726  &&  this.orgId !=10721 && this.orgId!=10633 && this.orgId!=0&& this.orgId!=10387){
+        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0&& this.orgId!=10402 && this.orgId != 10489 && this.orgId!=10375 && this.orgId!=10485&&this.orgId!=0&&this.orgId!=10138&&this.orgId!=10278&&this.orgId!=10537&&this.orgId!=10610 &&this.orgId!=10445 &&  this.orgId !=10635  &&  this.orgId !=10724 &&  this.orgId !=10726  &&  this.orgId !=10721 && this.orgId!=10633 && this.orgId!=0&& this.orgId!=10387&& this.orgId!=10571){
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
         }
         this.tableOut[i].manufacturer_name = this.getManufacturerNameOne(this.tableOut[i].manufacturer)

src/xt_pages/user/doctorAdvice.vue

@@ -3651,6 +3651,7 @@ export default {
 
     selectAdvice(selection, row) {
       console.log("row322232322323",this.adviceType)
+      console.log("adviceTableData",this.adviceTableData)
       if (this.adviceType != 3) {
         this.lstableData = [];
       } else if (this.adviceType != 1) {
@@ -4553,19 +4554,26 @@ export default {
       });
     },
     // 获取勾选中的行
-    getPrintInfo(ids) {
-      console.log("ids",ids)
-      console.log("23332332323232",this.adviceType,"33333333",this.stopType)
-
-      getPrintInfo({ids:ids},this.adviceType,this.stopType).then(response => {
+    getPrintInfo(ids,his) {
+      // console.log("ids",ids)
+      // console.log("23332332323232",this.adviceType,"33333333",this.stopType)
+      console.log("his================",his)
+      var his_str =his.join(",")
+      getPrintInfo({ids:ids},this.adviceType,this.stopType,his_str).then(response => {
         if (response.data.state === 1) {
           var doctoradvice = response.data.data.doctoradvice;
           console.log("doctoradvice", doctoradvice);
+          this.lstableData = []
+          var hisdoctoradvice = response.data.data.hisdoctoradvice
+
+          this.lstableData.push(...hisdoctoradvice)
+
+          console.log("hahahahah",hisdoctoradvice)
 
           this.dataAdvice = doctoradvice;
           if (this.adviceType === 3 || this.adviceType === 2 || this.adviceType == 4) {
 
-            this.lstableData = this.dataAdvice;
+            this.lstableData.push(...this.dataAdvice);
 
           } else if (this.adviceType === 1) {
             this.cqtableData = doctoradvice;
@@ -4918,13 +4926,15 @@ export default {
       for (const i in this.multipleSelection) {
         arr.push(this.multipleSelection[i]);
         group.push(this.multipleSelection[i].groupno);
+        ids.push(this.multipleSelection[i].id)
        
       }
       grouptwo.push(this.getdata(group));
       // console.log('组号', group)
       // console.log('组号2', grouptwo)
       // console.log('ids', ids)
-      this.getPrintInfo(group);
+     
+      this.getPrintInfo(group,ids);
     }
   },
   components: {

src/xt_pages/workforce/printOne.vue

@@ -691,11 +691,13 @@ export default {
     getZoneName(id) {
       var name = ''
       for (let i = 0; i < this.partitionArr.length; i++) {
+
         if (id == this.partitionArr[i].id) {
           name = this.partitionArr[i].name
         }
       }
-
+      console.log("id=-========",id)
+      console.log("name-=----",name)
       return name
     },
     getBloodAccess(id) {