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

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/dialysis.js

@@ -575,4 +575,13 @@ export function getPatientBefor(params){
     method:"Get",
     params:params,
   })
+}
+
+export function getPatientDialysisSolutionByPatientId(params){
+ 
+  return request({
+    url:"/api/schedule/getpatientdialysissolutionbypatientid",
+    method:"Get",
+    params:params,
+  })
 }

src/api/patient.js

@@ -1495,4 +1495,133 @@ 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
+  })
+}
+
+export function savePatientOutCount(params){
+
+  return request({
+    url:"/api/patient/savepatientoutcount",
+    method:"Get",
+    params:params,
+  })
+}
+
+export function getPatientOutCountList(params){
+  
+  return request({
+    url:"/api/patient/getpatientoutcountlist",
+    method:"get",
+    params:params
+  })
+}
+
+
+export function DeletePatientOutCount(id,params){
+
+  return request({
+    url:"/api/patient/deletepatientoutcount?id="+id,
+    method:"Get",
+    params:params,
+  })
+}
+
+
+export function checkPatientOutCount(id,params){
+  
+  return request({
+    url:"/api/patient/checkpatientoutcount?id="+id,
+    method:"get",
+    params:params
+  })
+}
+
+export function returnPatientOutList(id,params){
+  
+  return request({
+    url:"/api/patient/returnpatientoutlist?id="+id,
+    method:"get",
+    params:params
+  })
+}
+
+export function getPatientCountMapList(params){
+  
+  return request({
+    url:"/api/patient/getpatientcountmaplist",
+    method:"get",
+    params:params,
+  })
+}
+
+export function getPatientCountFlow(params){
+
+  return request({
+    url:"/api/patient/getpatientcountflow",
+    method:"get",
+    params:params,
+  })
+}
+
+export function getDialysisOrderSetting(params){
+  
+  return request({
+    url:"/api/patient/getdialysisordersetting",
+    method:"Get",
+    params:params,
+  })
+}
+
+export function savePatientOrderSetting(params){
+
+  return request({
+    url:"/api/patient/savepatientordersetting",
+    method:"get",
+    params:params
+  })
+}
+
+export function getPatientCountFlowList(params){
+
+  return request({
+    url:"/api/patient/getpatientcountflowlist",
+    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:""
     };
   },
  
@@ -537,10 +538,15 @@ export default {
       console.log("state--",this.state)
       this.currentRow = val;
       console.log("this.currentRow", this.currentRow);
+    
       if (this.state == 1) {
+        this.tableData = []
+        this.patients = {}
         this.getpatientdetails(0);
       }
       if (this.state == 2) {
+        this.patients = {}
+        this.tableData = []
         this.getpatientdetails(1);
       }
     },
@@ -838,6 +844,12 @@ export default {
     },
     //获取患者信息详情
     getpatientdetails(val) {
+      // const loading = this.$loading({
+      //   lock: true,
+      //   text: "Loading",
+      //   spinner: "el-icon-loading",
+      //   background: "rgba(0, 0, 0, 0.7)",
+      // });
       console.log("val2332323223",this.currentRow)
       var params = {
         patient_id: this.currentRow.PatientID,
@@ -846,6 +858,7 @@ export default {
       };
       getpharmacycontent(params).then((res) => {
         if (res.data.state == 1) {
+          //  loading.close()
            var list = res.data.data.list;
            console.log("hhhhawoowowow",res.data.data)
            this.baseList =[]
@@ -859,6 +872,7 @@ export default {
             diagnose:res.data.data.patients.diagnose,
             zhixing:res.data.data.patients.created_time
           }
+          this.patients = {}
           this.patients =obj
           if(this.$store.getters.xt_user.org.id == 10188 || this.$store.getters.xt_user.org.id == 10217 || this.$store.getters.xt_user.org.id == 10387 ||  this.$store.getters.xt_user.org.id == 0  ||  this.$store.getters.xt_user.org.id == 10480  ){
             this.tableData = []
@@ -875,7 +889,8 @@ export default {
             this.tableData = []
             this.tableData = list
           }
-          console.log("tableDatawoowow",this.tableData)
+          // console.log("tableDatawoowow",this.tableData)
+          // loading.close()
         } else {
           this.$message.error(res.data.msg);
         }
@@ -1268,17 +1283,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 +1337,7 @@ export default {
                
                this.newArrList = []
                this.newArrList = arr
-
-
+               console.log("newARRlIST----------",this.newArrList)
             }
               
             this.drug_id = DrugId
@@ -1367,6 +1385,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 +1406,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 +1462,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 +1495,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/Pharmacy/print/patientPrintTwo.vue

@@ -147,6 +147,7 @@ export default {
       this.times = times
       this.visibility = true;
       console.log("val",val)
+      this.tableData = []
       this.tableData = val
       this.Doctor = val[0].Doctor
       this.name = data.Name

src/xt_pages/charging/chargin_kf.vue

@@ -6,18 +6,34 @@
     <div class="app-container">
       <div style="display: flex;">
         <div style="flex: 2;display: flex;justify-content: space-around;">
-          <div > <el-input v-model="input" placeholder="请输入内容"></el-input></div>
+         
+          <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>
             日期查询:
             <el-date-picker
+             @change="changeTime"
               v-model="value1"
               type="daterange"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
               range-separator="至"
               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="newkf_show=true">新增</el-button>
         </div>
         <div style="flex: 1;text-align: right;">
@@ -27,30 +43,59 @@
       <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">
+                {{getTime(scope.row.record_date)}}
+             </template>
           </el-table-column>
           <el-table-column prop="HDF" label="扣费类型">
+            <template slot-scope="scope">
+               <span v-if="scope.row.mode_id ==1">HD</span>
+               <span v-if="scope.row.mode_id ==2">HDF</span>
+               <span v-if="scope.row.mode_id ==3">HD+HP</span>
+               <span v-if="scope.row.mode_id ==4">HP</span>
+               <span v-if="scope.row.mode_id ==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="cz_click(scope.row.id)" >反审核</el-button>
+              </span>
+              <span v-if="scope.row.is_check==2">
+                <el-button type="primary" @click="checkPatientOutCount(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>
+              <el-button type="danger" @click="DeletePatientOutCount(scope.row.id,scope.$index)">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -60,10 +105,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,50,100,200]"
+          :page-size="10"
           layout="total, sizes, prev, pager, next, jumper"
-          :total="400">
+          :total="total">
         </el-pagination>
       </div>
     </div>
@@ -78,30 +123,36 @@
           <el-form-item label="患者姓名:">
             <el-autocomplete
               class="inline-input"
-              v-model="state1"
+               v-model.trim="smart_keyword"
               :fetch-suggestions="querySearch"
               placeholder="请输入内容"
               @select="handleSelect"
-            ></el-autocomplete>
+              
+            >
+           <i class="el-icon-search el-input__icon" slot="suffix"></i>
+          <template slot-scope="{ item }">
+            <div class="name">{{ item.name }}</div>
+          </template>
+          </el-autocomplete>
           </el-form-item>
           <el-form-item label="透析模式:">
-            <el-select v-model="value" placeholder="请选择">
+            <el-select v-model="mode_id" placeholder="请选择">
               <el-option
                 v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
+                :key="item.mode_id"
+                :label="item.mode_name"
+                :value="item.mode_id">
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="次数:">
-            <el-input v-model="formLabelAlign.type"></el-input>
+            <el-input v-model="formLabelAlign.count" type="number"></el-input>
           </el-form-item>
           <el-form-item label="备注:">
-            <el-input type="textarea" :rows="2" v-model="formLabelAlign.type"></el-input>
+            <el-input type="textarea" :rows="2" v-model="formLabelAlign.remark"></el-input>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="newkf_show = false">确 定</el-button>
+            <el-button type="primary" @click="savePatientOutCount">确 定</el-button>
             <el-button @click="newkf_show = false">取 消</el-button>
           </el-form-item>
         </el-form>
@@ -110,6 +161,10 @@
   </div>
 </template>
 <script>
+
+import { uParseTime } from "@/utils/tools";
+import {getPatientMapList,savePatientOutCount,getPatientOutCountList,DeletePatientOutCount,checkPatientOutCount,returnPatientOutList} from "@/api/patient"
+import { resetOptions } from "showdown";
   export default{
     data(){
       return{
@@ -121,20 +176,94 @@
         newkf_show:false,
         labelPosition:'right',
         formLabelAlign:{
-
+          count:"1",
+          remark:""
         },
         currentPage:1,
         value:'',
-        options:[],
-        tableData: [{ index: 1, name: '小米', HD: 1, HDF: 1, 'HD+HP': 1, 'qita': 1 ,examine:false}],
+        options:[
+          {mode_id:1,mode_name:"HD"},
+          {mode_id:2,mode_name:"HDF"},
+          {mode_id:3,mode_name:"HD+HP"},
+          {mode_id:4,mode_name:"HP"},
+          {mode_id:5,mode_name:"其他"}
+        ],
+        tableData: [],
+        smart_keyword:"",
+        patient_id:"",
+        mode_id:"",
+        limit:10,
+        page:1,
+        total:0,
+        patientList:[],
+        userList:[]
+    
       }
     },
     methods:{
+      query(){
+        this.getlist()
+      },
+      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
+      },
+      getTime(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
+      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
+     },
+      handleSelect(val){
+        this.smart_keyword = val.name;
+        this.patient_id = val.id
+      },
       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
+            cb(searchArray)
+          } else {
+            this.$message.error(response.data.msg)
+            cb([])
+          }
+        })
+        return searchArray
       },
-      cz_click(row){
-        row.examine=true
+      cz_click(id){
+        returnPatientOutList(id).then(response=>{
+           if(response.data.state == 1){
+             var msg =  response.data.data.msg
+             this.$message.success("保存成功!")
+             this.getlist()
+           }
+        })
       },
       handleSizeChange(){
 
@@ -142,6 +271,86 @@
       handleCurrentChange(){
 
       },
+      savePatientOutCount(){
+        if(this.patient_id == 0){
+           this.$message.error("请选择患者")
+           return false
+        }
+        if(this.formLabelAlign.count == 0){
+           this.$message.error("请输入次数")
+           return false
+        }
+        if(this.mode_id == 0){
+           this.$message.error("请选择模式")
+           return false
+        }
+          var params = {
+            patient_id:this.patient_id,
+            count:this.formLabelAlign.count,
+            remark:this.formLabelAlign.remark,
+            mode_id:this.mode_id,
+          }
+        savePatientOutCount(params).then(response=>{
+           if(response.data.state == 1){
+              var msg = response.data.data.msg
+              this.$message.success("保存成功!")
+              this.newkf_show = false
+              this.getlist()
+           }
+        })
+      },
+      changeTime(val){
+       
+        this.start_time = val[0]
+        this.end_time = val[1]
+        this.getlist()
+      },
+      getlist(){
+       
+         var params = {
+          page:this.page,
+          limit:this.limit,
+          patient_id:this.patient_id,
+          start_time:this.start_time,
+          end_time:this.end_time,
+         }
+        getPatientOutCountList(params).then(response=>{
+          if(response.data.state ==1){
+            var list = response.data.data.list
+            this.tableData =[]
+            this.tableData = list
+            var total = response.data.data.total
+            this.total = total
+
+            this.patientList = response.data.data.patient
+           
+            this.userList = response.data.data.userList
+          
+          }
+        })
+      },
+      DeletePatientOutCount(id,index){
+          
+        DeletePatientOutCount(id,index).then(response=>{
+           
+          if(response.data.state == 1){
+            var msg =  response.data.data.msg
+            this.$message.success("删除成功!")
+            this.tableData.splice(index,1)
+          }
+        })
+      },
+      checkPatientOutCount(id){
+        checkPatientOutCount(id).then(response=>{
+          if(response.data.state == 1){
+              this.$message.success("保存成功!")
+              this.getlist()
+          }
+        })
+      }
+    },
+    created(){
+      this.getlist()
     }
   }
 </script>

src/xt_pages/charging/charging_collect.vue

@@ -3,10 +3,25 @@
     <div class="position"></div>
     <div class="app-container">
       <div style="display: flex;justify-content: space-around;">
-        <div > <el-input v-model="input" placeholder="请输入内容"></el-input></div>
+        <div> 
+          <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>
           日期查询:
           <el-date-picker
+           @change="changeTime"
             v-model="value1"
             type="daterange"
             range-separator="至"
@@ -16,7 +31,7 @@
         </div>
         <div>
           费用类型:
-          <el-select v-model="value" placeholder="请选择">
+          <el-select v-model="is_type" placeholder="请选择">
             <el-option
               v-for="item in options"
               :key="item.value"
@@ -135,6 +150,7 @@
   </div>
 </template>
 <script>
+import {getPatientMapList,getPatientCountFlowList} from "@/api/patient"
   export default{
     data(){
       return{
@@ -145,10 +161,47 @@
         state1:'',
         collect_show:false,
         options:[{value:0,label:'全部'},{value:1,label:'充值'},{value:2,label:'扣费'}],
-        tableData: [{ index: 1, name: '小米', HD: 1, HDF: 1, 'HD+HP': 1, 'qita': 1 ,examine:false}],
+        tableData: [],
+        start_time:"",
+        end_time:"",
+        smart_keyword:"",
+        patient_id:0,
+        limit:10,
+        page:1,
+        is_type:0,
+        total:0,
       }
     },
     methods:{
+      handleSelect(val){
+        this.smart_keyword = val.name;
+        this.patient_id = val.id
+      },
+      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
+            cb(searchArray)
+          } else {
+            this.$message.error(response.data.msg)
+            cb([])
+          }
+        })
+        return searchArray
+      },
+      changeTime(val){
+       this.start_time = val[0]
+       this.end_time = val[1]
+       this.getlist()
+     },
       mingx_click(){
         this.collect_show = true
       },
@@ -164,6 +217,30 @@
       handleCurrentChange(){
 
       },
+      getlist(){
+        var params = {
+          start_time:this.start_time,
+          end_time:this.end_time,
+          patient_id:this.patient_id,
+          limit:this.limit,
+          page:this.page,
+          is_type:this.is_type,
+        }
+        getPatientCountFlowList(params).then(response=>{
+          if(response.data.state == 1){
+             var list = response.data.data.list
+             this.tableData =[]
+             this.tableData = list
+             var total = response.data.data.total
+
+             this.total = total
+          }
+        })
+      }
+    },
+    created(){
+      this.getlist()
     }
+    
   }
 </script>

src/xt_pages/charging/charging_cz.vue

@@ -10,46 +10,78 @@
           <div>
             日期查询:
             <el-date-picker
+              @change="changeTime"
               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 +92,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 +150,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 +168,42 @@
         },
         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:{
+      changeTime(val){
+        this.start_time = val[0]
+        this.end_time = val[1]
+        this.getlist()
+      },
+      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 +230,12 @@
         row.examine=true
       },
       handleSizeChange(){
-
+        this.limit = limit;
+        this.getList();
       },
       handleCurrentChange(){
-
+        this.page = page;
+        this.getList();
       },
       savePatentCount(){
         var params = {
@@ -191,15 +249,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,37 +6,85 @@
     <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.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>
+          <el-button type="primary" @click="toSetting">扣减配置</el-button>
         </div>
       </div>
       <div>
-        <el-table border :data="tableData" style="width: 100%" 
+        <el-table border :data="tableList" 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.id)}}
+             </template>
           </el-table-column>
           <el-table-column prop="HD" label="HD">
+            <template slot-scope="scope">
+              <span v-if="scope.row.hd_count>0">
+                {{scope.row.hd_count}}
+              </span>
+               
+             </template>
           </el-table-column>
           <el-table-column prop="HDF" label="HDF">
+            <template slot-scope="scope">
+              <span v-if="scope.row.hdf_count>0">
+                {{scope.row.hdf_count}}
+              </span>
+               
+             </template>
           </el-table-column>
           <el-table-column prop="HD+HP" label="HD+HP">
+            <template slot-scope="scope">
+              <span v-if="scope.row.hdhp_count>0">
+                {{scope.row.hdhp_count}}
+              </span>
+              
+             </template>
           </el-table-column>
           <el-table-column prop="HP" label="HP">
+            <template slot-scope="scope">
+              <span v-if="scope.row.hp_count>0">
+                {{scope.row.hp_count}}
+              </span>
+               
+             </template>
           </el-table-column>
           <el-table-column prop="qita" label="其他">
+            <template slot-scope="scope">
+              <span v-if="scope.row.other_count>0">
+                {{scope.row.other_count}}
+              </span>
+              
+             </template>
           </el-table-column>
           <el-table-column prop="address" label="操作" width="300">
             <template slot-scope="scope">
               <el-button type="primary" @click="cz_click">充值</el-button>
               <el-button type="primary" @click="kf_click">扣费</el-button>
-              <el-button type="primary" @click="details_click(scope.row)">流水详情</el-button>
+              <el-button type="primary" @click="details_click(scope.row.id)">流水详情</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -46,10 +94,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,60,100,200,400,800,1000]"
+          :page-size="10"
           layout="total, sizes, prev, pager, next, jumper"
-          :total="400">
+          :total="total">
         </el-pagination>
       </div>
     </div>
@@ -61,19 +109,40 @@
       >
       <div>
         <div style="display: flex;justify-content: space-around;width: 60%;margin-bottom: 10px;">
-          <div>患者姓名:小米</div>
-          <div>HD次数:</div>
-          <div>HDF次数:</div>
-          <div>HD+HP次数:</div>
-          <div>HP次数:</div>
-          <div>其他次数:</div>
+          <div>患者姓名:{{ patient.name }}</div>
+          <div>HD次数:
+            <span v-if="patient.hd_count>0">
+              {{ patient.hd_count }}
+            </span> 
+          </div>
+          <div>HDF次数:
+            <span v-if="patient.hdf_count>0">{{ patient.hdf_count }}</span> 
+          </div>
+          <div>HD+HP次数:
+            <span v-if="patient.hdhp_count>0">
+              {{ patient.hdhp_count }}
+            </span> 
+          </div>
+          <div>HP次数: 
+            <span v-if="patient.hp_count>0">
+              {{ patient.hp_count }}
+            </span> 
+          </div>
+          <div>其他次数:
+            <span v-if="patient.other_count>0">
+              {{ patient.other_count }}
+            </span>
+          </div>
         </div>
         <div style="display: flex;justify-content: space-around;">
           <div>
             日期查询:
             <el-date-picker
+             @change="changeTime"
               v-model="value1"
               type="daterange"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
@@ -82,55 +151,112 @@
           </div>
           <div>
             费用类型:
-            <el-select v-model="value" placeholder="请选择" style="width: 100px;">
+            <el-select v-model="is_type" placeholder="请选择" style="width: 100px;">
               <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
+                v-for="item in type_options"
+                :key="item.id"
+                :label="item.is_type"
+                :value="item.id">
               </el-option>
             </el-select>
           </div>
           <div>
             透析模式:
-            <el-select v-model="value" placeholder="请选择" style="width: 100px;">
+            <el-select v-model="mode_id" placeholder="请选择" style="width: 100px;">
               <el-option
                 v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
+                :key="item.mode_id"
+                :label="item.mode_name"
+                :value="item.mode_id">
               </el-option>
             </el-select>
           </div>
-          <div><el-button type="primary">查询</el-button></div>
+          <div><el-button type="primary" @click="queryList">查询</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="">
+              <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">
+                {{getTime(scope.row.ctime)}}
+              </template>
             </el-table-column>
             <el-table-column prop="HD" label="费用类别">
+              <template slot-scope="scope">
+                  <span v-if="scope.row.is_type==1">充值</span>
+                  <span v-if="scope.row.is_type==2">扣费</span>
+              </template>
             </el-table-column>
             <el-table-column prop="HDF" label="透析类型">
+              <template slot-scope="scope">
+                 <span v-if="scope.row.mode_id==1">HD</span>
+                 <span v-if="scope.row.mode_id==2">HDF</span>
+                 <span v-if="scope.row.mode_id==3">HD+HP</span>
+                 <span v-if="scope.row.mode_id==4">HP</span>
+                 <span v-if="scope.row.mode_id==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="address" label="创建人">
+              <template slot-scope="scope">
+                {{ getAdminUser(scope.row.creater) }}
+              </template>
             </el-table-column>
             <el-table-column prop="address" label="备注">
+              <template slot-scope="scope">
+                  {{ scope.row.remark }}
+              </template>
             </el-table-column>
           </el-table>
         </div>
+        <div style="margin-top: 10px;text-align: right;">
+        <el-pagination
+          @size-change="handleSizeChangeOne"
+          @current-change="handleCurrentChangeOne"
+          :current-page="currentPage"
+          :page-sizes="[10, 20, 30, 40,60,100,200,400,800,1000]"
+          :page-size="10"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total_one">
+        </el-pagination>
+      </div>
       </div>
     </el-dialog>
+
+    <el-dialog title="设置" :visible.sync="editDialogVisible" width="30%">
+        <span style="font-size: 17px">是否开启下机自动扣减</span>
+        <span style="display: block; padding: 18px 25px">
+          <el-radio v-model="is_open" label="1">是</el-radio>
+          <el-radio v-model="is_open" label="2">否</el-radio>
+        </span>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="editDialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="SaveSetting">保 存</el-button>
+        </span>
+      </el-dialog>
   </div>
 </template>
 
 <script>
+import {getPatientMapList,getPatientCountMapList,getPatientCountFlow,getDialysisOrderSetting,savePatientOrderSetting  } from "@/api/patient"
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import { uParseTime } from "@/utils/tools";
+import patient from "../../router/modules/patient";
 export default {
+  components: { BreadCrumb },
   data() {
     return {
       crumbs: [
@@ -140,43 +266,205 @@ export default {
       value:0,
       restaurants: [{value: '小米' }, { value: '小王' }],
       state1: '',
-      tableData: [{ index: 1, name: '小米', HD: 1, HDF: 1, 'HD+HP': 1, 'qita': 1 }],
-      options:[{value:0,label:'全部'},{value:1,label:'充值'},{value:2,label:'扣费'}],
+      tableData: [],
+      tableList:[],
+      type_options:[
+        {id:0,is_type:"全部"},
+        {id:1,is_type:"充值"},
+        {id:2,is_type:"扣费"},
+      ],
+      options:[
+       {mode_id:0,mode_name:"全部"},
+       {mode_id:1,mode_name:"HD"},
+       {mode_id:2,mode_name:"HDF"},
+       {mode_id:3,mode_name:"HD+HP"},
+       {mode_id:4,mode_name:"HP"},
+       {mode_id:5,mode_name:"其他"}
+      ],
       currentPage:1,
       details_show:false,
+      smart_keyword:"",
+      patient_id:"",
+      limit:10,
+      page:1,
+      total:0,
+      patientList:[],
+      page_one:1,
+      limit_one:10,
+      total_one:0,
+      start_time:"",
+      end_time:"",
+      is_type:0,
+      mode_id:0,
+      patient:{},
+      editDialogVisible:false,
+      is_open:"2",
     }
   },
   methods: {
-    handleSelect() {
-
+    toSetting(){
+      getDialysisOrderSetting().then(response=>{
+        if(response.data.state == 1){
+           var order =  response.data.data.order
+           if(order!=undefined && order.id>0){
+            this.is_open =order.is_open.toString()
+           }
+           
+        }
+      })
+      this.editDialogVisible = true
+    },
+    SaveSetting(){
+      var params = {
+        is_open:parseInt(this.is_open) 
+      }
+      savePatientOrderSetting(params).then(response=>{
+        if(response.data.state == 1){
+          var order = response.data.data.order
+          this.$message.success("保存成功!")
+          this.editDialogVisible = false
+          
+        }
+      })
+    },
+    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
+    },
+    getTime(val) {
+      if(val < 0){
+        return ""
+      }
+      if(val == ""){
+      return ""
+      }else {
+      return uParseTime(val, '{y}-{m}-{d}')
+      }
     },
-    querySearch(queryString, cb) {
-      console.log('vvvvv',queryString);
-      var restaurants = this.restaurants;
-      var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
-      // 调用 callback 返回建议列表的数据
-      cb(results);
+    changeTime(val){
+      this.start_time = val[0]
+      this.end_time = val[1]
+      this.getlist()
     },
+    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(limit){
+      this.limit = limit;
+      this.getlist();
+    },
+    handleCurrentChange(page){
+      this.page = page;
+      this.getlist();
+    },
+    handleSizeChangeOne(limit){
+      this.limit_one = limit;
+      this.getlist();
+    },
+    handleCurrentChangeOne(page){
+      this.page_one = page;
+      this.getlist();
     },
-    handleCurrentChange(){
-      
+    queryList(){
+      this.details_click(this.patient_id)
     },
-    details_click(row){
-      this.details_show=true
+    details_click(patient_id){
+        this.patient_id = 0
+        this.patient_id = patient_id
+         var params = {
+          patient_id:patient_id,
+          start_time:this.start_time,
+          end_time:this.end_time,
+          is_type:this.is_type,
+          mode_id:this.mode_id,
+         }
+      getPatientCountFlow(params).then(response=>{
+         if(response.data.state == 1){
+           this.details_show=true
+           var list = response.data.data.list
+           this.tableData = []
+           this.tableData = list
+           var total = response.data.data.total
+           this.total_one = total
+           var patient= response.data.data.patient
+           this.patient = patient
+           this.userList = []
+           this.userList =  response.data.data.userList
+         }
+      })
+     
     },
     cz_click(){
       this.$router.push({path:'/dialysis/charging_cz'})
     },
     kf_click(){
       this.$router.push({path:'/dialysis/chargin_kf'})
-    }
+    },
+    getlist(){
+      var params = {
+        limit:this.limit,
+        page:this.page,
+        patient_id:this.patient_id
+      }
+    getPatientCountMapList(params).then(response=>{
+      if(response.data.state == 1){
+        var list =  response.data.data.list
+       
+        this.tableList = []
+        this.tableList = 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_eightyTwo.vue

@@ -1013,14 +1013,17 @@ export default {
               if(this.records[x].his_advices.length>0){
                 console.log(this.records, "this.records");
                 const arr = this.records[x].his_advices
-                for(let i in arr ){
+                if(this.org_id!=10727){
+                  for(let i in arr ){
                   if(arr[i].delivery_way == '口服' || 
                     arr[i].delivery_way == '中药口服' ||
                     arr[i].delivery_way == '舌下含服'
                   ){
                     arr.splice(i,1)
                   }
+                 }
                 }
+               
               }
               // this.records[x].his_advices =advice
             }

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -829,7 +829,7 @@
                         </div>
                         kg
                       </div>
-                      <div class="inline_block" style="flex: 1" v-if="org_id != 10469">
+                      <div class="inline_block" style="flex: 1" v-if="org_id != 10469 && org_id!=10745">
                         <span v-if="org_id != 10683">计划超滤量：</span>
                         <span v-if="org_id == 10683">预脱：</span>
                         <div class="under_line" style="width: 100px; text-align: center">
@@ -846,9 +846,10 @@
                           v-if="org_id != 10395 && org_id != 9829 && org_id != 10440 && org_id != 10469 && org_id != 10460 && org_id != 10624 && org_id != 10644">L</span>
                       </div>
 
-                      <div class="inline_block" style="flex: 1" v-if="org_id == 10469 || org_id == 10598">
-                        <span v-if="org_id != 10683">计划超滤量：</span>
+                      <div class="inline_block" style="flex: 1" v-if="org_id == 10469 || org_id == 10598 || org_id == 10745">
+                        <span v-if="org_id != 10683 && org_id!=10745">计划超滤量：</span>
                         <span v-if="org_id == 10683">预脱：</span>
+                        <span v-if="org_id == 10745">处方脱水量</span>
                         <div class="under_line" style="width: 100px; text-align: center">
                           {{
                             record.prescription &&
@@ -857,8 +858,8 @@
                               : "/"
                           }}
                         </div>
-                        <span v-if="org_id != 10598 && org_id != 10471"> ml</span>
-                        <span v-if="org_id == 10598 || org_id == 10471"> L</span>
+                        <span v-if="org_id != 10598 && org_id != 10471 && org_id!=10745"> ml</span>
+                        <span v-if="org_id == 10598 || org_id == 10471 || org_id == 10745"> L</span>
                       </div>
                       <div class="inline_block" style="flex: 1">
                         干体重：
@@ -1471,14 +1472,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 || org_id == 10726">
                               {{
                                 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 && org_id!=10726">
                               {{
                                 monitor_record.ultrafiltration_volume
                                   ? monitor_record.ultrafiltration_volume

src/xt_pages/dialysis/batch_print/batch_print_order_twentyEight.vue

@@ -1400,6 +1400,7 @@
                     <td width="60" style="line-height: 20px">
                       电导度<br />mS/cm
                     </td>
+                    <td width="60" style="line-height:20px" v-if="org_id == 10015">置换液流量<br />ml/h</td>
                     <td width="" style="line-height: 20px">病情变化及处理</td>
                   </tr>
 
@@ -1490,7 +1491,9 @@
                         monitor.conductivity ? monitor.conductivity : ""
                       }}
                     </td>
-
+                    <td>
+                     &nbsp;{{ monitor.displacement_flow_quantity ? monitor.displacement_flow_quantity : "" }}
+                    </td>
                     <td>
                       &nbsp;{{ monitor.symptom }} &nbsp;{{
                         monitor.dispose

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -719,6 +719,13 @@
           align="center"
           width="120"
         ></el-table-column>
+
+        <el-table-column
+          label="透析器/灌流器"
+          prop="dialysis_dialyszers_name"
+          align="center"
+          width="120"
+        ></el-table-column>
         <el-table-column
           prop="start_time"
           label="上机时间"
@@ -2070,7 +2077,17 @@ export default {
               SchedualPatientsTable["sch_time_int"] = response.data.data.schedule[i].schedule_date;
               SchedualPatientsTable["sch_time"] = parseTime(response.data.data.schedule[i].schedule_date,"{y}-{m}-{d}");
               SchedualPatientsTable["mode_id"] = response.data.data.schedule[i].mode_id
+                
+              if(response.data.data.schedule[i].prescription.dialyzer_perfusion_apparatus !=""){
+                SchedualPatientsTable["dialysis_dialyszers_name"] = response.data.data.schedule[i].prescription.dialyzer_perfusion_apparatus 
+              }
+
+              if(response.data.data.schedule[i].prescription.dialyzer_perfusion_apparatus ==""){
+                SchedualPatientsTable["dialysis_dialyszers_name"] = response.data.data.schedule[i].prescription.dialysis_dialyszers + response.data.data.schedule[i].prescription.dialysis_irrigation 
+              }
+             
 
+              
               if(response.data.data.schedule[i].patient!=null){
                  SchedualPatientsTable["dialysis_no"] = response.data.data.schedule[i].patient.dialysis_no;
                  SchedualPatientsTable["name"] =  response.data.data.schedule[i].patient.name;
@@ -3066,10 +3083,10 @@ export default {
          }
          console.log("监测统计",this.SchedualPatientsTableData)
 
-         const multiHeader = [['序号','机号','排班日期','上机时间','透析号','姓名','透析模式','目标超滤量','透前血压','干体重','透前称重','透后称重','监测时间','','','','','','','透中血压','','','','','','','体温','','','','','','','呼吸','','','','','','','脉搏','','','','','','']]
-         const header = ['','','','','','','','','','','','','第1次','第2次','第3次','第4次','第5次','第6次','第7次','第1次','第2次','第3次','第4次','第5次','第6次','第7次','第1次','第2次','第3次','第4次','第5次','第6次','第7次','第1次','第2次','第3次','第4次','第5次','第6次','第7次','第1次','第2次','第3次','第4次','第5次','第6次','第7次',]
-         const merges = ['A1:A2', 'B1:B2', 'C1:C2', 'D1:D2', 'E1:E2','F1:F2','G1:G2','H1:H2', 'I1:I2','J1:J2','K1:K2','L1:L2','M1:S1','T1:Z1','AA1:AG1','AH1:AN1','AO1:AU1']
-        const filterVal = ['index', 'number', 'sch_time', 'start_time', 'dialysis_no', 'name', 'mode_name', 'target_ultrafiltration', 'pressure_name', 'dry_weight', 'dialysis_before_weight', 'dialysis_after_weight','start_time_one','start_time_two','start_time_three','start_time_four','start_time_five','start_time_six','start_time_seven','blood_press_one','blood_press_two','blood_press_three','blood_press_four','blood_press_five','blood_press_six','blood_press_seven','temperature_one','temperature_two','temperature_three','temperature_four','temperature_five','temperature_six','temperature_seven','breathing_rate_one','breathing_rate_two','breathing_rate_three','breathing_rate_four','breathing_rate_five','breathing_rate_six','breathing_rate_seven','pulse_frequency_one','pulse_frequency_two','pulse_frequency_three','pulse_frequency_four','pulse_frequency_five','pulse_frequency_six','pulse_frequency_seven']
+         const multiHeader = [['序号','机号','排班日期','上机时间','透析号','姓名','透析模式','目标超滤量','透前血压','干体重','透前称重','透后称重','监测时间','','','','','','','透中血压','','','','','','','体温','','','','','','','呼吸','','','','','','','脉搏','','','','','','','透析器/灌流器']]
+         const header = ['','','','','','','','','','','','','第1次','第2次','第3次','第4次','第5次','第6次','第7次','第1次','第2次','第3次','第4次','第5次','第6次','第7次','第1次','第2次','第3次','第4次','第5次','第6次','第7次','第1次','第2次','第3次','第4次','第5次','第6次','第7次','第1次','第2次','第3次','第4次','第5次','第6次','第7次','']
+         const merges = ['A1:A2', 'B1:B2', 'C1:C2', 'D1:D2', 'E1:E2','F1:F2','G1:G2','H1:H2', 'I1:I2','J1:J2','K1:K2','L1:L2','M1:S1','T1:Z1','AA1:AG1','AH1:AN1','AO1:AU1','AV1']
+        const filterVal = ['index', 'number', 'sch_time', 'start_time', 'dialysis_no', 'name', 'mode_name', 'target_ultrafiltration', 'pressure_name', 'dry_weight', 'dialysis_before_weight', 'dialysis_after_weight','start_time_one','start_time_two','start_time_three','start_time_four','start_time_five','start_time_six','start_time_seven','blood_press_one','blood_press_two','blood_press_three','blood_press_four','blood_press_five','blood_press_six','blood_press_seven','temperature_one','temperature_two','temperature_three','temperature_four','temperature_five','temperature_six','temperature_seven','breathing_rate_one','breathing_rate_two','breathing_rate_three','breathing_rate_four','breathing_rate_five','breathing_rate_six','breathing_rate_seven','pulse_frequency_one','pulse_frequency_two','pulse_frequency_three','pulse_frequency_four','pulse_frequency_five','pulse_frequency_six','pulse_frequency_seven','dialysis_dialyszers_name']
 
          const data = this.formatJson(filterVal, this.SchedualPatientsTableData)
          const filename = '监测数据'

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

@@ -1540,7 +1540,7 @@
 </template>
 
 <script>
-  import { CreateGroupAdvice, GetSolution, postPrescription, postSoulution,saveInformation,getPatientRecordList,getPatientBefor } from '@/api/dialysis'
+  import { CreateGroupAdvice, GetSolution, postPrescription, postSoulution,saveInformation,getPatientRecordList,getPatientBefor,getPatientDialysisSolutionByPatientId } from '@/api/dialysis'
   import { getDataConfig } from '@/utils/data'
   import { calculateAnticoagulantZL, uParseTime,replacementFlow } from '@/utils/tools'
   import store from '@/store'
@@ -3346,6 +3346,11 @@ mu
           this.getPatientBefor()
         }
 
+        // if(this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id==10480){
+            
+        //   this.getPatientDialysisSolutionByPatientId()
+        // } 
+
        
 
 
@@ -4887,7 +4892,6 @@ mu
       }
     },
     changePrescription(id) {
-      console.log("id233223232323232323",id)
       if(id != 2 && id!=5 && id!= 12&&id!=34 &&id!=35&&id!=35&&id!=36&&id!=37){
         this.dialysisPrescription.displace_liqui_value = ""
         this.dialysisPrescription.displace_liqui_part = ""
@@ -5237,6 +5241,15 @@ mu
          }
       })
     },
+    getPatientDialysisSolution(){
+        var params = {
+          patient_id:patient_id,
+          record_date:record_date
+        }
+      getPatientDialysisSolution(params).then(response=>{
+
+      })
+    },
     unique(arr) {
       const res = new Map()
       return arr.filter((arr) => !res.has(arr.name) && res.set(arr.name, 1))
@@ -5273,7 +5286,27 @@ mu
             this.infoDialogVisible = false
           }
       })
-     }
+    },
+    // getPatientDialysisSolutionByPatientId(){
+    //    var patient_id = 0
+    //    var record_date =""
+    //    if(this.$route.query.patient_id!=undefined){
+    //     patient_id =this.$route.query.patient_id
+    //     record_date = uParseTime(this.$route.query.date, '{y}-{m}-{d}')
+    //    }else{
+    //     patient_id = this.patient.id
+    //     record_date = this.record_date
+    //    }
+    //    var params = {
+    //     patient_id:patient_id,
+    //     record_date:record_date
+    //    }
+    //   getPatientDialysisSolutionByPatientId(params).then(response=>{
+    //      if(response.data.state == 1){
+    //        var dialysisSolution = response.data.data.dialysisSolution
+    //      }
+    //   })
+    // }
   },
 
     watch: {

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 ||
@@ -2062,7 +2062,7 @@
                 org_id ==10432 ||
                 org_id ==10445 ||
                 org_id == 10395 || org_id == 10751 || org_id == 10752) &&
-                org_id!=10694 && org_id!=10697 && org_id!=10721 && org_id!=10727
+                org_id!=10694 && org_id!=10697 && org_id!=10721 && org_id!=10727 && org_id!=10744
             "
           >
             <el-form-item label="置换量(ml)：" :prop="isName('置换量')"

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
@@ -708,7 +693,8 @@
                           }}
                           </span>
                         </div>
-                        L
+                        <span v-if="org_id != 10726">L</span> 
+                        <span v-if="org_id == 10726">ml</span> 
                       </div>
 
                       <div v-if="org_id != 10598" class="inline_block" style="margin-left: 10px; flex: 1">
@@ -743,7 +729,8 @@
                           }}
                           </span>
                         </div>
-                        L
+                       <span v-if="org_id == 10726">ml</span>
+                       <span v-if="org_id != 10726">L</span>
                       </div>
                       <div class="inline_block" style="margin-left: 10px; flex: 1" v-if="org_id != 10683">
                         血流量：
@@ -932,7 +919,7 @@
                         </div>
                         kg
                       </div>
-                      <div class="inline_block" style="flex: 1" v-if="org_id != 10469">
+                      <div class="inline_block" style="flex: 1" v-if="org_id != 10469 && org_id!=10745">
                         <span v-if="org_id != 10683">计划超滤量：</span>
                         <span v-if="org_id == 10683">预脱：</span>
                         <div class="under_line" style="width: 100px; text-align: center">
@@ -949,7 +936,7 @@
                       </div>
 
 
-                      <div class="inline_block" style="flex: 1" v-if="org_id == 10469 || org_id == 10598">
+                      <div class="inline_block" style="flex: 1" v-if="org_id == 10469 || org_id == 10598 || org_id== 10745">
                         处方脱水量：
                         <div class="under_line" style="width: 100px; text-align: center">
                           {{
@@ -958,8 +945,8 @@
                               : "/"
                           }}
                         </div>
-                        <span v-if="org_id != 10598"> ml</span>
-                        <span v-if="org_id0 = 10598"> L</span>
+                        <span v-if="org_id != 10598 && org_id!=10745"> ml</span>
+                        <span v-if="org_id == 10598 || org_id == 10745"> L</span>
                       </div>
                       <div class="inline_block" style="flex: 1">
                         干体重：
@@ -1394,7 +1381,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 +1440,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 +1469,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 +1564,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&& org_id!=10726">
+                              {{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 +1576,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 || org_id == 10726">
+                              {{ monitor.ultrafiltration_volume ?monitor.ultrafiltration_volume : "0" }}
                             </span>
                           </td>
                           <td width="50"
@@ -4343,7 +4334,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 +4497,8 @@ export default {
 
         console.log("新时间我哦我哦", this.doctor_advices)
 
+       
+
 
         //过滤口服药
         if (this.org_id == 10265) {
@@ -4560,6 +4553,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/dialysis/template/DialysisPrintOrderTwentyEight.vue

@@ -878,6 +878,8 @@
               <td width="40" style="line-height:20px">机温<br />℃</td>
               <td width="60" style="line-height:20px">血流量<br />ml/min</td>
               <td width="60" style="line-height:20px">电导度<br />mS/cm</td>
+
+              <td width="60" style="line-height:20px" v-if="org_id == 10015">置换液流量<br />ml/h</td>
               <!-- <td width="60">钠浓度<br/>mmol/L</td>
           <td width="80">透析液温度<br/>℃</td>
           <td width="60">置换率<br/>ml/min</td> -->
@@ -934,6 +936,9 @@
               <td>
                 &nbsp;{{ monitor.conductivity ? monitor.conductivity : "" }}
               </td>
+              <td>
+                &nbsp;{{ monitor.displacement_flow_quantity ? monitor.displacement_flow_quantity : "" }}
+              </td>
               <!-- <td>&nbsp;{{monitor.sodium_concentration}}</td>
           <td>&nbsp;{{monitor.dialysate_temperature}}</td>
           <td>&nbsp;{{monitor.replacement_rate}}</td> -->

src/xt_pages/dialysis/template/DialysisPrintOrdereightytwo.vue

@@ -1164,13 +1164,21 @@ export default {
           var doctorAdevieInfo = response.data.data.advices
           console.log('var tableAdvice',tableAdvice);
           var tableAdvice = []
-          for(let i in doctorAdevieInfo){
+          if(this.org_id!=10727){
+           for(let i in doctorAdevieInfo){
             if(doctorAdevieInfo[i].delivery_way != '口服' && 
-            doctorAdevieInfo[i].delivery_way != '中药口服' &&
-            doctorAdevieInfo[i].delivery_way != '舌下含服'){
+              doctorAdevieInfo[i].delivery_way != '中药口服' &&
+              doctorAdevieInfo[i].delivery_way != '舌下含服'){
               tableAdvice.push(doctorAdevieInfo[i]) 
             }
+           }
+          }else{
+            for(let i in doctorAdevieInfo){
+              tableAdvice.push(doctorAdevieInfo[i])
+            }
+           
           }
+       
           
           if (tableAdvice.length === 0) {
             var obj = { advice_name: '', start_time: '' }

src/xt_pages/outpatientCharges/allListPrint.vue

@@ -13,10 +13,10 @@
     </template>
 <!--  -->
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne  v-if="org_id != 10215  && org_id !=9671&&org_id !=9675&& org_id !=10515 && org_id !=10489 && org_id !=10644 && org_id !=0" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printOne>
+      <printOne  v-if="org_id != 10215  && org_id !=9671&&org_id !=9675&& org_id !=10515 && org_id !=10489 && org_id !=10644" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printOne>
       <summary-print v-if="org_id == 10215|| org_id ==9671 ||org_id ==9675" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></summary-print>
       <printTwo v-if="org_id==10515 " :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printTwo>
-      <printthree  v-if="org_id == 10489 || org_id == 0" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printthree>
+      <printthree  v-if="org_id == 10489" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printthree>
       <printFour v-if="org_id == 10644 " :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printFour>
       <!--      <list-print-two :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></list-print-two>-->
     </div>
@@ -63,7 +63,7 @@
     methods: {
       getTimes(time) {
         return uParseTime(time, '{y}-{m}-{d} {h}:{i}')
-      }, 
+      },
       getInfo(order_id) {
         let params = {
           id: order_id
@@ -147,7 +147,7 @@
                   }
                   advice.push(adv)
                 }
-               
+
                 if(order_info[i].project.good_info.good_name !=''){
                   const god={
                     // advice_name:order_info[i].advice.advice_name,
@@ -225,7 +225,7 @@
               }
 
               chrgitm_lvs = [...advice,...good,...project]
-              
+
               for(let i in this.list){
                 for(let j in chrgitm_lvs){
                   if(this.list[i].is_total ==2){
@@ -242,8 +242,8 @@
             }
           }
         })
-        
-      }, 
+
+      },
       getquchong(arr){
         for(let i=0;i<arr.length;i++){
           for(let j=i+1;j<arr.length;j++){
@@ -305,6 +305,8 @@
             for (let a = 0; a < details.length; a++) {
               if (new_drug_ids[i].id == details[a].advice.drug_id && new_drug_ids[i].price == details[a].advice.price) {
                 obj['name'] = details[a].advice.advice_name
+                obj['code'] = details[a].advice.drug.medical_insurance_number
+
                 // obj['spec'] = details[a].advice.drug.drug_spec
                 obj['spec'] =   details[a].advice.drug.dose +   details[a].advice.drug.dose_unit+"*" +  details[a].advice.drug.min_number +   details[a].advice.drug.min_unit+"/"+ details[a].advice.drug.max_unit
                 obj['unit'] = details[a].advice.prescribing_number_unit
@@ -329,6 +331,8 @@
                if( details[a].project.type == 2){
                  obj['name'] = details[a].project.project.project_name
                  obj['spec'] = ''
+                 obj['code'] = details[a].project.project.medical_code
+
                   // obj['spec'] = details[a].project.project.project_name
                  obj['unit'] = details[a].project.project.unit
 
@@ -336,6 +340,7 @@
                }else if(details[a].project.type == 3){
                  obj['name'] = details[a].project.good_info.good_name
                 //  obj['spec'] = ''
+                 obj['code'] = details[a].project.good_info.medical_insurance_number
                  obj['spec'] = details[a].project.good_info.specification_name
                  obj['unit'] = details[a].project.good_info.packing_unit
 

src/xt_pages/outpatientCharges/allListTemplate/printOne.vue

@@ -7,7 +7,7 @@
         <div>透析号：{{ patient.dialysis_no }}</div>
         <div>性别：{{ patient.gender == 1 ? '男' : '女' }}</div>
         <div>年龄：{{ patient.age }} 岁</div>
-        <div v-if="$store.getters.xt_user.org_id  == 10644 || 
+        <div v-if="$store.getters.xt_user.org_id  == 10644 ||
               $store.getters.xt_user.org_id  == 0">开方日期：{{ getTimes(order.settle_accounts_date) }}
           <!-- {{ hospital.in_hosptial_time }} 至
           {{ hospital.out_hosptial_time }} -->
@@ -16,28 +16,32 @@
       </div>
       <table class="allListTable" border="1">
         <tr>
+          <td style="width:10%">医保编码</td>
           <td style="width:10%">类别</td>
-          <td style="width:40%">项目名称</td>
+          <td style="width:30%">项目名称</td>
           <td style="width:10%">规格</td>
+          <td style="width:5%">单位</td>
           <td style="width:10%">单价(元)</td>
           <td style="width:10%">数量</td>
           <td style="width:10%">金额(元)</td>
+          <td style="width:40%">医保类型</td>
+
           <!-- <td style="width:10%" v-if="org_id==10489 ||org_id==0">报销等级</td> -->
         </tr>
         <template v-for='item in list.slice(index * 13,(index * 13) + pageArr[index])'>
           <tr v-if="item.is_total == 2">
+            <td style="width:10%">{{ item.code }}</td>
             <td style="width:10%">{{ item.med_chrgitm_type }}</td>
-            <td style="width:40%">{{ item.name }}</td>
+            <td style="width:30%">{{ item.name }}</td>
             <td style="width:10%">{{ item.spec }}</td>
+            <td style="width:5%">{{ item.unit }}</td>
             <td style="width:10%">{{ (item.price).toFixed(2) }}</td>
             <td style="width:10%">{{ item.count }}{{ item.unit }}</td>
             <td style="width:10%">{{ (item.price * item.count).toFixed(2) }}</td>
-            <!-- <td style="width:10%" v-if="org_id==10489 ||org_id==0">
-              {{item.chrgitm_lv!=''?getMedicineInsuranceType(item.chrgitm_lv): '丙类' }}
-            </td> -->
+            <td style="width:10%">{{item.medicine_insurance_kind}}</td>
           </tr>
           <tr>
-            <td colspan="6" style="text-align:right;" v-if="item.is_total == 1">合计：{{ item.total }}元</td>
+            <td colspan="9" style="text-align:right;" v-if="item.is_total == 1">合计：{{ item.total }}元</td>
           </tr>
         </template>
       </table>

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -15,7 +15,7 @@
       size="small" type="success"
       @click="showclick = !showclick">{{ showclick==false ? '白纸' : '发票' }}</el-button>
     </template>
-    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375 && org_id != 10567 && org_id != 10188 && org_id != 10633"><!--&& org_id != 10188 && org_id != 0-->
+    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375 && org_id != 10567  && org_id != 10724 && org_id != 10188 && org_id != 10633"><!--&& org_id != 10188 && org_id != 0-->
         <div class='dialysisPage'>
           <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387 && org_id != 10480 && org_id != 0" >
             <printOne v-if="org_id != 10088 && org_id != 10510 && org_id != 0" :paramsObj="invoiceParams"></printOne>
@@ -51,7 +51,7 @@
       </div>
     </div>
 
-    <div class="app-container" v-if="org_id == 10567 ">
+    <div class="app-container" v-if="org_id == 10567  || org_id == 10724">
       <div class='dialysisPage'>
         <printfourteen :paramsObj="invoiceParams"></printfourteen>
       </div>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -119,7 +119,7 @@
 
             <el-button v-loading="loadingone" size="small"
                        @click="open(40)"
-                       v-if="org_id == 10191 || org_id == 10318 || org_id == 10567  || org_id == 10375 || org_id == 10480 || org_id == 10721 || org_id == 10724"
+                       v-if="org_id == 10191 || org_id == 10318 || org_id == 10567  || org_id == 10375 || org_id == 10480 || org_id == 10721 || org_id == 10724 || org_id == 9478"
                        type="primary">登陆
             </el-button>
 
@@ -3582,7 +3582,7 @@ export default {
         }
 
         if (this.hisPatientInfo.id_card_type == 1) {
-          if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10510 && this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10106 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id !=  10318 && this.$store.getters.xt_user.org_id !=  10210 && this.$store.getters.xt_user.org_id !=  10375 &&  this.$store.getters.xt_user.org_id !=  10480 &&  this.$store.getters.xt_user.org_id !=  10387  &&  this.$store.getters.xt_user.org_id !=  10598 &&  this.$store.getters.xt_user.org_id !=  10721 &&   this.$store.getters.xt_user.org_id !=  10726 &&   this.$store.getters.xt_user.org_id !=  10567 &&  this.$store.getters.xt_user.org_id !=  10697 &&   this.$store.getters.xt_user.org_id !=  10724 &&   this.$store.getters.xt_user.org_id !=  10571 &&   this.$store.getters.xt_user.org_id !=  10633) {
+          if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10510 && this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10106 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id !=  10318 && this.$store.getters.xt_user.org_id !=  10210 && this.$store.getters.xt_user.org_id !=  10375 &&  this.$store.getters.xt_user.org_id !=  10480 &&  this.$store.getters.xt_user.org_id !=  10387  &&  this.$store.getters.xt_user.org_id !=  10598 &&  this.$store.getters.xt_user.org_id !=  10721 &&   this.$store.getters.xt_user.org_id !=  10726 &&   this.$store.getters.xt_user.org_id !=  10567 &&  this.$store.getters.xt_user.org_id !=  10697 &&   this.$store.getters.xt_user.org_id !=  10724 &&   this.$store.getters.xt_user.org_id !=  10571 &&   this.$store.getters.xt_user.org_id !=  10633 && this.$store.getters.xt_user.org_id !=  9478) {
             this.pwdFormVisible = true
             this.pwd = ''
           } else {
@@ -3761,6 +3761,7 @@ export default {
         this.newLoading = true
         var that = this
         let form = {}
+        form['acct_used_flag'] = this.form.acct_used_flag
         form['id'] = this.patientInfo.id
         form['his_patient_id'] = this.hisPatientInfo.id
         form['record_time'] = this.record_date

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -20,6 +20,7 @@
           org_id == 10138 ||
           org_id == 9504 ||
           org_id == 10028 ||
+          org_id == 10744 ||
           org_id == 10278 ||
           org_id == 10610 ||
           org_id==10537
@@ -33,7 +34,7 @@
           v-if="org_id == 10138 || org_id == 10278 || org_id ==10610 || org_id==10537"
         ></printThree>
         <printFour
-          v-if="org_id == 9504 || org_id == 10028 || org_id == 10088 "
+          v-if="org_id == 9504 || org_id == 10028 || org_id == 10088  || org_id == 10744"
           :info="info"
           :paramsObj="paramsObj"
           :balanceAccounts="balanceAccounts"
@@ -73,14 +74,14 @@
       <printSeventheen  :info="info" v-if=" org_id == 10721"></printSeventheen>
       <printeighteen :info="info" v-if=" org_id == 10726"></printeighteen>
       <printOne :info="info" v-if=" org_id != 9990 && org_id !=0 &&
-            org_id != 10138 && org_id != 9504 && org_id != 10028 &&
+            org_id != 10138 && org_id != 9504 && org_id != 10028  && org_id != 10744 &&
             org_id != 10610 && org_id !=10537 && org_id !=10697 &&
             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 != 10721 &&org_id != 10633 &&org_id != 10731 && org_id != 10726 && this.paramsObj.balance_accounts_type == 1">
       </printOne>
       <privateChargePrint :info="info" v-if="org_id != 9990 && org_id !=0 &&
-            org_id != 10138 && org_id != 9504 &&  org_id != 10028 && org_id !=10697 &&
+            org_id != 10138 && org_id != 9504 &&  org_id != 10028 && org_id != 10744  && org_id !=10697 &&
             org_id != 10278 && org_id != 10610 && org_id !=10537 && org_id != 10387 &&
             org_id != 10191 &&org_id != 10210 &&org_id != 10485  &&org_id != 10480 &&
             org_id != 10510 &&org_id != 10633 && org_id != 10721 && org_id != 10726  && this.paramsObj.balance_accounts_type == 2">
@@ -442,7 +443,7 @@ export default {
         }, 500)
       } else if (
         this.$store.getters.xt_user.org_id == 9504 ||
-        this.$store.getters.xt_user.org_id == 10028
+        this.$store.getters.xt_user.org_id == 10028 ||   this.$store.getters.xt_user.org_id == 10744
       ) {
         const style =
           '@media print {.printTitle{font-size: 20px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;font-size:12px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;font-size:12px;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none;font-size:12px;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;font-size:12px;}.actionBar div{width:150px;}}'
@@ -840,7 +841,7 @@ export default {
               // console.log('this.num', this.num)
             }
           })
-        } else if (this.org_id == 10028  || this.org_id == 9504) {
+        } else if (this.org_id == 10028  || this.org_id == 9504 || this.org_id == 10744) {
           getPrivateExpenses(params).then((response) => {
             if (response.data.state == 0) {
               // this.$message.error(response.data.msg)

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -301,6 +301,11 @@
         <td colspan="3" style="text-align:left;padding-left:10px;">个人账户支付</td>
         <td colspan="3">{{info.acct_pay}}</td>
       </tr>
+      <tr>
+        <td colspan="3" style="text-align:left;padding-left:10px;">个人共济支付</td>
+        <td colspan="3">{{info.acct_mulaid_pay}}</td>
+
+      </tr>
       <tr>
         <td>收款人:</td>
         <td colspan="2">{{info.charge_admin.user_name}}</td>

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -541,7 +541,9 @@
             if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
               console.log('123',scope.row.drug.dose,scope.row.execution_frequency,scope.row.drug.min_unit)
               // 单次用量single_dose，用量单位single_dose_unit，用法delivery_way，频率execution_frequency 总量prescribing_number，规格drug.dose
-              scope.row.prescribing_number = Math.ceil((parseInt(scope.row.single_dose) * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / parseInt(this.getdrugdose(scope.row.drug.dose)) ) //  / scope.row.drug.dose
+              scope.row.prescribing_number = Math.ceil((parseFloat(scope.row.single_dose) * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / parseFloat(this.getdrugdose(scope.row.drug.dose)) ) //  / scope.row.drug.dose
+              console.log("prescribing_number=====",scope.row.prescribing_number)
+             
             } else {
               console.log(1234,scope.row.drug.dose)
               scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / (scope.row.drug.dose*1) / (scope.row.drug.min_number*1))//

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/stock/drugs/drugBatchNumber.vue

@@ -134,8 +134,8 @@
         </el-table-column>
         <el-table-column prop="drug_name" label="该批次剩余库存" align="center">
           <template slot-scope="scope">
-           <span v-if="scope.row.stock_max_number >0">{{ scope.row.stock_max_number }}{{drug.max_unit}}</span> 
-           <span v-if="scope.row.stock_min_number >0">{{scope.row.stock_min_number}}{{drug.min_unit}}</span>
+           <span v-if="scope.row.stock_max_number >0">{{ scope.row.stock_max_number }}{{scope.row.max_unit}}</span> 
+           <span v-if="scope.row.stock_min_number >0">{{scope.row.stock_min_number}}{{scope.row.min_unit}}</span>
           </template>
         </el-table-column>
          <el-table-column prop="remake" label="备注" align="center">

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/user/dryWeight.vue

@@ -7,6 +7,7 @@
         干体重:<el-input style="width:100px" v-model="dryweight" :disabled="true"></el-input>&nbsp;
          <el-button size="medium" type="primary" @click="dialogVisible =true" v-show="addShow">新增</el-button>
          <el-button size="medium" type="primary" @click="dialogVisible =true" v-show="adjustShow">调整</el-button>
+         <el-button type="primary" size="medium" @click="exportList">导出</el-button>
       </div>
       <el-table  :data="tableData" border style="width:100%">
       <el-table-column     prop="date"    label="时间"      align="center">
@@ -125,6 +126,33 @@
       }
     },
     methods: {
+      exportList(){
+      import('@/vendor/Export2Excel').then(excel => {
+      
+      
+          if(this.tableData!=null && this.tableData.length > 0){
+            for(let i=0;i<this.tableData.length;i++){
+              this.tableData[i].index = i+1
+              this.tableData[i].record_date =  this.CreateTime(this.tableData[i].ctime)
+            }
+         }
+         
+
+         const tHeader = ['序号','时间','调整值','干体重','医生','备注']
+         const filterVal = ['index','record_date', 'adjusted_value', 'dry_weight','user_name','remarks']
+        
+         const data = this.formatJson(filterVal, this.tableData)
+         
+         excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '干体重'
+         })
+       })
+      },
+      formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]));
+      },
       clickuseradvicecell(row, column, cell, event) {
       },
       onTranPatient: function(tranPatient) {

src/xt_pages/user/weight.vue

@@ -7,6 +7,8 @@
             <span>当前时间 : <el-input  style="width:180px" v-model="current_date" disabled></el-input></span>
             <span class="weight">干体重 : <el-input  v-model="current_weight" style="width:180px;" disabled></el-input></span>
             <el-button class="Adjust" type="primary" icon="el-icon-refresh" size="medium" @click="dialogFormVisible = true">调整</el-button>
+
+           
         </div> 
       <el-table
       :data="weightList"

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) {