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

src/api/fapiao.js

@@ -11,7 +11,7 @@ export function getOrderFapiaoList(params){
 
 export function getFapiaoList(params){
   return request({
-    url:"/api/gdfapiao/list",
+    url:"/api/fapiao/list",
     methods:"get",
     params:params
   })

src/api/patient.js

@@ -1624,4 +1624,15 @@ export function getPatientCountFlowList(params){
     method:"get",
     params:params
   })
-}
+}
+
+
+export function getPatientCountFlowById(params){
+  
+   return request({
+    url:"/api/patient/getpatientcountflowbyid",
+    method:"Get",
+    params:params,
+   })
+}
+

src/xt_pages/charging/charging_collect.vue

@@ -23,6 +23,8 @@
           <el-date-picker
            @change="changeTime"
             v-model="value1"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
             type="daterange"
             range-separator="至"
             start-placeholder="开始日期"
@@ -40,23 +42,43 @@
             </el-option>
           </el-select>
         </div>
-        <div><el-button type="primary">查询</el-button></div>
+        <div><el-button type="primary" @click="getQuery">查询</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">
+                <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">HDF</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">
+                {{getModeCount(scope.row.patient_id,scope.row.mode_id,scope.row.is_type) }}
+             </template>
           </el-table-column>
           <el-table-column prop="address" label="操作" width="300">
             <template slot-scope="scope">
-              <el-button type="primary" @click="mingx_click(scope.row)" >详情</el-button>
+              <el-button type="primary" @click="mingx_click(scope.row.patient_id,scope.row.mode_id,scope.row.is_type)" >详情</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -66,10 +88,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>
@@ -84,15 +106,24 @@
           <div> 
             <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>
           </div>
           <div>
             日期查询:
             <el-date-picker
+              @change="changeTimeOne"
+               format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
               v-model="value1"
               type="daterange"
               range-separator="至"
@@ -103,7 +134,7 @@
           </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"
@@ -114,34 +145,63 @@
           </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">
+                v-for="item in mode_options"
+                :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="queryCount">查询</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 border :data="tableList" 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.record_date) }}
+               </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>
@@ -150,7 +210,8 @@
   </div>
 </template>
 <script>
-import {getPatientMapList,getPatientCountFlowList} from "@/api/patient"
+import {getPatientMapList,getPatientCountFlowList,getPatientCountFlowById} from "@/api/patient"
+import {uParseTime } from "@/utils/tools";
   export default{
     data(){
       return{
@@ -170,9 +231,56 @@ import {getPatientMapList,getPatientCountFlowList} from "@/api/patient"
         page:1,
         is_type:0,
         total:0,
+        patientList:[],
+        userList:[],
+        flowList:[],
+        start_time:"",
+        end_time:"",
+        tableList:[],
+        patient:{},
+        mode_id:0,
+        mode_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:"其他"}
+        ],
       }
     },
     methods:{
+      getTime(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
+      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
+      },
       handleSelect(val){
         this.smart_keyword = val.name;
         this.patient_id = val.id
@@ -202,20 +310,38 @@ import {getPatientMapList,getPatientCountFlowList} from "@/api/patient"
        this.end_time = val[1]
        this.getlist()
      },
-      mingx_click(){
-        this.collect_show = true
-      },
-      querySearch(){
-
-      },
-      handleSelect(){
-
+     changeTimeOne(){
+      this.start_time = val[0]
+      this.end_time = val[1]
+     },
+      mingx_click(patient_id,mode_id,is_type){
+          var params = {
+           patient_id:patient_id,
+           mode_id:mode_id,
+           is_type:is_type,
+           start_time:this.start_time,
+           end_time:this.end_time,
+          }
+          getPatientCountFlowById(params).then(response=>{
+            if(response.data.state == 1){
+              this.collect_show = true
+              var tableList =  response.data.data.list
+              this.tableList = []
+              this.tableList = tableList
+              this.patient = response.data.data.patient
+              this.userList = []
+              this.userList = response.data.data.userList
+            }
+        })
+       
       },
-      handleSizeChange(){
-
+      handleSizeChange(limit){
+        this.limit = limit;
+        this.getlist();
       },
-      handleCurrentChange(){
-
+      handleCurrentChange(page){
+        this.page = page;
+        this.getlist();
       },
       getlist(){
         var params = {
@@ -229,12 +355,77 @@ import {getPatientMapList,getPatientCountFlowList} from "@/api/patient"
         getPatientCountFlowList(params).then(response=>{
           if(response.data.state == 1){
              var list = response.data.data.list
+             console.log("list==============",list)
              this.tableData =[]
              this.tableData = list
              var total = response.data.data.total
-
              this.total = total
+             var patientList = response.data.data.patient
+             console.log("patient=============",patientList)
+             this.patientList = []
+             this.patientList = patientList
+             var userList = response.data.data.userList
+             this.userList = userList
+             this.flowList = response.data.data.flowList
+          }
+        })
+      },
+      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
+     },
+     getModeCount(patient_id,mode_id,is_type){
+        var count = 0 
+        var newArr= []
+        for(let i=0;i<this.flowList.length;i++){
+           if(patient_id == this.flowList[i].patient_id && mode_id == this.flowList[i].mode_id && is_type == this.flowList[i].is_type){
+               newArr.push(this.flowList[i])
+           }
+        }
+
+        for(let i=0;i<newArr.length;i++){
+            count+=newArr[i].count
+        }
+        if(count>0){
+          return count
+        }else{
+          return ""
+        }
+     },
+     queryCount(){
+       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
+      },
+      getQuery(){
+        var params = {
+           patient_id:this.patient_id,
+           mode_id:this.mode_id,
+           is_type:this.is_type,
+           start_time:this.start_time,
+           end_time:this.end_time,
           }
+          getPatientCountFlowById(params).then(response=>{
+            if(response.data.state == 1){
+              var tableList =  response.data.data.list
+              this.tableList = []
+              this.tableList = tableList
+              this.patient = response.data.data.patient
+              this.userList = []
+              this.userList = response.data.data.userList
+            }
         })
       }
     },

src/xt_pages/charging/charging_cz.vue

@@ -152,6 +152,7 @@
 <script>
   import {getPatientMapList,savePatentCount,getPatientCountList,deletePatientCount,checkPatientCount,toReturnCheck } from "@/api/patient"
   import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import { start } from "nprogress";
   export default{
     components: { BreadCrumb },
     data(){
@@ -179,7 +180,9 @@
         limit:10,
         page:1,
         total:0,
-        userList:[]
+        userList:[],
+        start_time:"",
+        end_time:"",
       }
     },
     methods:{

src/xt_pages/dialysis/batch_print/batch_print_order_twentyEight.vue

@@ -1400,7 +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 />L/h</td>
+                    <td width="60" style="line-height:20px" v-if="org_id == 10015">置换液流量<br />ml/min</td>
                     <td width="" style="line-height: 20px">病情变化及处理</td>
                   </tr>
 
@@ -1491,7 +1491,7 @@
                         monitor.conductivity ? monitor.conductivity : ""
                       }}
                     </td>
-                    <td>
+                    <td v-if="org_id == 10015">
                      &nbsp;{{ monitor.displacement_flow_quantity ? monitor.displacement_flow_quantity : "" }}
                     </td>
                     <td>

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -1749,6 +1749,35 @@ export default {
           }
       }
 
+      if( this.$store.getters.xt_user.org.id == 10745 ){
+          var year = date.getFullYear()
+          var month = date.getMonth() + 1
+          var day = date.getDate()
+
+          var hours = date.getHours()
+          var minites = date.getMinutes()
+
+          if (month < 10) {
+            month = '0' + month
+          }
+          if (day < 10) {
+            day = '0' + day
+          }
+          if (hours < 10) {
+            hours = '0' + hours
+          }
+          if (minites < 10) {
+            minites = '0' + minites
+          }
+          if (this.schedulePatient.schedule_type == 1) {
+            this.groupForm.start_time = year + '-' + month + '-' + day + ' ' + '6:30'
+          } else if (this.schedulePatient.schedule_type == 2) {
+            this.groupForm.start_time= year + '-' + month + '-' + day + ' ' + '11:30'
+          } else if (this.schedulePatient.schedule_type == 3) {
+           this.groupForm.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
+          }
+      }
+
       if(this.$store.getters.xt_user.org.id == 10579  || this.$store.getters.xt_user.org.id == 10585 || this.$store.getters.xt_user.org.id == 10587 || this.$store.getters.xt_user.org.id == 10597 || this.$store.getters.xt_user.org.id == 10551 || this.$store.getters.xt_user.org.id == 10679 || this.$store.getters.xt_user.org.id == 10693 ||  this.$store.getters.xt_user.org.id == 10694 || this.$store.getters.xt_user.org.id == 10702 || this.$store.getters.xt_user.org.id == 10495 || this.$store.getters.xt_user.org.id == 10742){
         var date = new Date()
           var year = date.getFullYear()

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

@@ -3290,6 +3290,14 @@ mu
               minites = '0' + minites
             }
             this.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
+           }else if(this.$store.getters.xt_user.org.id == 10745){
+              if (schedual.schedule_type == 1) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '6:30'
+            } else if (schedual.schedule_type == 2) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '11:30'
+            } else if (schedual.schedule_type == 3) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
+            }
            } else {
             if (schedual.schedule_type == 1) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '07:00'

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyEight.vue

@@ -879,7 +879,7 @@
               <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 />L/h</td>
+              <td width="60" style="line-height:20px" v-if="org_id == 10015">置换液流量<br />ml/min</td>
               <!-- <td width="60">钠浓度<br/>mmol/L</td>
           <td width="80">透析液温度<br/>℃</td>
           <td width="60">置换率<br/>ml/min</td> -->
@@ -936,7 +936,7 @@
               <td>
                 &nbsp;{{ monitor.conductivity ? monitor.conductivity : "" }}
               </td>
-              <td>
+              <td v-if="org_id == 10015">
                 &nbsp;{{ monitor.displacement_flow_quantity ? monitor.displacement_flow_quantity : "" }}
               </td>
               <!-- <td>&nbsp;{{monitor.sodium_concentration}}</td>

src/xt_pages/eleFaPiao/fapiao.vue

@@ -101,6 +101,18 @@
         </el-table-column>
 
 
+        <el-table-column
+          align="center"
+          width="100"
+          prop="name"
+          label="结算时间"
+        >
+          <template slot-scope="scope">
+            {{scope.row.orders[0].setl_time}}
+          </template>
+        </el-table-column>
+
+
         <el-table-column align="center" width="90" prop="name" label="开票员">
           <template slot-scope="scope">
             {{scope.row.creator}}
@@ -125,7 +137,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="name" label="操作">
+        <el-table-column align="center" prop="name" label="操作" v-if="this.$store.getters.xt_user.org_id != 10318 &&  this.$store.getters.xt_user.org_id != 0">
           <template slot-scope="scope">
 
             <el-button v-if="scope.row.id > 0 && scope.row.is_red_washed == 0" size="mini" type="primary"
@@ -141,6 +153,34 @@
 <!--            </el-button>-->
           </template>
         </el-table-column>
+
+
+        <el-table-column align="center" prop="name" label="操作" v-if="this.$store.getters.xt_user.org_id == 10318 ||  this.$store.getters.xt_user.org_id == 0">
+          <template slot-scope="scope">
+
+            <el-button v-if="scope.row.id > 0 && scope.row.is_red_washed == 0 && scope.row.fapiao_status == '2'" size="mini" type="primary"
+                       @click="BWhongchong(scope.row)" v-loading="red_loading" >
+              红冲
+            </el-button>
+            <el-button size="mini" type="primary" v-if="scope.row.id > 0 && scope.row.is_red_washed == 0 && scope.row.fapiao_status == '2'"
+                       @click="bwyulan(scope.row)">
+              下载
+            </el-button>
+
+<!--            <el-button v-if="scope.row.id > 0 && scope.row.is_red_washed == 0" size="mini" type="primary"-->
+<!--                       @click="hongchong(scope.row)">-->
+<!--              红冲-->
+<!--            </el-button>-->
+<!--            <el-button size="mini" type="primary" v-if="scope.row.id > 0 && scope.row.is_red_washed == 0"-->
+<!--                       @click="yulan(scope.row)">-->
+<!--              下载-->
+<!--            </el-button>-->
+            <!--            <el-button size="mini" type="primary" @click="download(scope.row)"  v-if="scope.row.id > 0 && scope.row.is_red_washed == 0">-->
+            <!--              下载-->
+            <!--            </el-button>-->
+          </template>
+        </el-table-column>
+
       </el-table>
       <el-pagination
         @size-change="handleSizeChange"
@@ -189,6 +229,8 @@ export default {
   },
   data() {
     return {
+      red_loading:false,
+      search_input: '',
       staff:"",
       admins:[],
       orderObj: {},
@@ -255,6 +297,75 @@ export default {
   },
 
   methods: {
+    bwyulan(row){
+      var  id = row.id
+      let params = {
+        "id":id,
+        "admin_user_id":this.$store.getters.xt_user.user.id,
+      }
+      var that = this;
+      axios.get('http://127.0.0.1:9532/api/download',{params:params}).then(function(response) {
+        if (response.data.state == 0) {
+          that.$message.error(response.data.data.msg);
+          return false
+        } else {
+          if(response.data.data.failed_code == -10){
+            that.$confirm(response.data.data.msg, '错误信息', {
+              confirmButtonText: '确 定',
+              type: 'warning'
+            }).then(() => {
+
+            }).catch(() => {
+            })
+          }else{
+            that.$message.success(response.data.data.msg)
+          }
+        }
+      }).catch(function(error) {
+
+      })
+    },
+    BWhongchong(row){
+      var  id = row.id
+      this.red_loading = true
+      let params = {
+        "id":id,
+        "admin_user_id":this.$store.getters.xt_user.user.id,
+      }
+
+      var that = this;
+      axios.get('http://127.0.0.1:9532/api/bwfapiao/red',{params:params}).then(function(response) {
+        if (response.data.state == 0) {
+          that.red_loading = false
+
+          that.$message.error(response.data.data.msg);
+          return false
+        } else {
+          that.red_loading = false
+          if(response.data.data.failed_code == -10){
+            that.$confirm(response.data.data.msg, '错误信息', {
+              confirmButtonText: '确 定',
+              type: 'warning'
+            }).then(() => {
+
+            }).catch(() => {
+            })
+          }else{
+            that.$message.success(response.data.data.msg)
+            that.getHisOrderList()
+          }
+
+        }
+      }).catch(function(error) {
+      })
+
+
+    },
+    searchAction(){
+      this.getHisOrderList()
+
+
+    },
     getData(patient_id){
       this.patient_id = patient_id
       this.getHisOrderList()

src/xt_pages/hospitalStation/batchStatementTemplate/hospitalBatchPrint.vue

@@ -108,9 +108,9 @@
         <td colspan="2" v-if="info.order.insutype == '392'">城乡居民大病医疗保险</td>
         <td colspan="2" v-if="info.order.insutype == '510'">生育保险</td>
         <td>入院第一诊断</td>
-        <td colspan="3">{{info.diagnosis}}</td>
+        <td colspan="3">{{"慢性肾功能不全（血透治疗）"}}</td>
         <td>出院第一诊断</td>
-        <td colspan="4">{{info.diagnosis}}</td>
+        <td colspan="4">{{"慢性肾功能不全（血透治疗）"}}</td>
 
 
       </tr>