hah阿凡达

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

@@ -1532,4 +1532,69 @@ export function toReturnCheck(id,params){
     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,
+  })
 }

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -538,6 +538,7 @@ export default {
       console.log("state--",this.state)
       this.currentRow = val;
       console.log("this.currentRow", this.currentRow);
+    
       if (this.state == 1) {
         this.getpatientdetails(0);
       }
@@ -839,6 +840,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,
@@ -847,6 +854,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 =[]
@@ -876,7 +884,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);
         }

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>
+          <!-- <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_cz.vue

@@ -10,6 +10,7 @@
           <div>
             日期查询:
             <el-date-picker
+              @change="changeTime"
               v-model="value1"
               type="daterange"
               range-separator="至"
@@ -182,6 +183,11 @@
       }
     },
     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++){

src/xt_pages/charging/index.vue

@@ -6,9 +6,7 @@
     <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"
@@ -28,7 +26,7 @@
         </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'}
         ">
@@ -39,39 +37,54 @@
           </el-table-column>
           <el-table-column prop="name" label="患者姓名" width="">
             <template slot-scope="scope">
-                {{getPatientName(scope.row.patient_id)}}
+                {{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>
@@ -81,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>
@@ -96,19 +109,22 @@
       >
       <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次数:{{ patient.hd_count }}</div>
+          <div>HDF次数:{{ patient.hdf_count }}</div>
+          <div>HD+HP次数:{{ patient.hdhp_count }}</div>
+          <div>HP次数: {{ patient.hp_count }}</div>
+          <div>其他次数:{{ patient.other_count }}</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="结束日期"
@@ -117,27 +133,27 @@
           </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'}">
@@ -152,28 +168,63 @@
               </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-scop="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>
   </div>
 </template>
 
 <script>
-import {getPatientMapList,getPatientCountList } from "@/api/patient"
+import {getPatientMapList,getPatientCountMapList,getPatientCountFlow  } from "@/api/patient"
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import { create } from "sortablejs";
+import { uParseTime } from "@/utils/tools";
+import patient from "../../router/modules/patient";
 export default {
   components: { BreadCrumb },
   data() {
@@ -186,7 +237,20 @@ export default {
       restaurants: [{value: '小米' }, { value: '小王' }],
       state1: '',
       tableData: [],
-      options:[{value:0,label:'全部'},{value:1,label:'充值'},{value:2,label:'扣费'}],
+      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:"",
@@ -194,10 +258,42 @@ export default {
       limit:10,
       page:1,
       total:0,
-      patientList:[]
+      patientList:[],
+      page_one:1,
+      limit_one:10,
+      total_one:0,
+      start_time:"",
+      end_time:"",
+      is_type:0,
+      mode_id:0,
+      patient:{}
     }
   },
   methods: {
+    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}')
+      }
+    },
+    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
@@ -230,16 +326,50 @@ export default {
         return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
       };
     },
-  handleSizeChange(){
+  handleSizeChange(limit){
       this.limit = limit;
-      this.getList();
+      this.getlist();
     },
-    handleCurrentChange(){
+    handleCurrentChange(page){
       this.page = page;
-      this.getList();
+      this.getlist();
+    },
+    handleSizeChangeOne(limit){
+      this.limit_one = limit;
+      this.getlist();
     },
-    details_click(row){
+    handleCurrentChangeOne(page){
+      this.page_one = page;
+      this.getlist();
+    },
+    queryList(){
+      this.details_click(this.patient_id)
+    },
+    details_click(patient_id){
+      this.patient_id = 0
+      this.patient_id = patient_id
       this.details_show=true
+         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){
+           var list = response.data.data.list
+           this.tableList = []
+           this.tableList = 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'})
@@ -253,12 +383,12 @@ export default {
         page:this.page,
         patient_id:this.patient_id
       }
-    getPatientCountList(params).then(response=>{
+    getPatientCountMapList(params).then(response=>{
       if(response.data.state == 1){
         var list =  response.data.data.list
        
-        this.tableData = []
-        this.tableData = list
+        this.tableList = []
+        this.tableList = list
         this.total = response.data.data.total
         this.patientList = []
         this.patientList = response.data.data.patient

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 || org_id == 10744">
+                            <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 && org_id!=10744">
+                            <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/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

@@ -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/template/DialysisPrintOrderSix.vue

@@ -693,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">
@@ -728,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">
                         血流量：
@@ -917,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">
@@ -934,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">
                           {{
@@ -943,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">
                         干体重：
@@ -1564,7 +1566,7 @@
                           </td>
 
                           <td v-if="org_id != 10644 && org_id != 10683">
-                            <span v-if="org_id != 9671 && org_id != 10440 && org_id != 10617 && org_id!=10744">
+                            <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">
@@ -1578,7 +1580,7 @@
                                 {{ monitor.ultrafiltration_volume ?monitor.ultrafiltration_volume : "0" }}
                               </span>
                             </span>
-                            <span v-if="org_id==10744">
+                            <span v-if="org_id==10744 || org_id == 10726">
                               {{ monitor.ultrafiltration_volume ?monitor.ultrafiltration_volume : "0" }}
                             </span>
                           </td>

src/xt_pages/dialysis/template/DialysisPrintOrdereightytwo.vue

@@ -1164,13 +1164,16 @@ 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]) 
             }
+           }
           }
+       
           
           if (tableAdvice.length === 0) {
             var obj = { advice_name: '', start_time: '' }

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/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"