新分支

src/api/common/common.js

@@ -548,3 +548,12 @@ export function getRolloutCount(params) {
   })
 }
 
+
+export function getPatientInspectionList(params){
+  
+  return request({
+    url:"/com/api/getpatientinspectionlist",
+    method:"get",
+    params:params
+  })
+}

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyOne.vue

@@ -135,8 +135,14 @@
             </div>
         </div>
         <div class="row">
+          血管通路部位
+          <div class="inline_block under_line" style="width:200px;text-align: left;">
+            {{ predialysis.blood_access_part_id }}
+          </div>
+       
           血管通路 
-          <div class="inline_block under_line" style="width:92%;text-align: left;">
+          <div class="inline_block under_line" style="width:200px;text-align: left;">
+            
             {{ predialysis.blood_access_part_opera_name?predialysis.blood_access_part_opera_name:"/" }}
             <!-- <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('内瘘-左') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('内瘘-右') > -1 ? true : false" showValue="内瘘"></label-box>
             （<label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('内瘘-左') > -1 ? true : false" showValue="左"></label-box>
@@ -161,6 +167,7 @@
             &nbsp; -->
           </div>
         </div>
+       
         <div class="row">
           导管
           <div class="inline_block under_line" style="width:200px;text-align: left;">

src/xt_pages/qcd/patientControlAnalysis.vue

@@ -77,6 +77,7 @@
         </div>
         <div>
           <el-button type="primary" size="small" style="margin-bottom: 10px;" @click="toExportList">导出</el-button>
+          <el-button type="primary" size="small" style="margin-bottom: 10px;" @click="getPatientInspectionList">导出2</el-button>
           <el-table :data="tableData" v-loading="isLoadingTwo" border style="width: 100%"
                     :row-style="{ color: '#303133' }"
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
@@ -161,7 +162,8 @@ import {
   getCurrentOrgPatients,
   getNormData,
   getPatientContorlAnalysis,
-  getPatientsControl
+  getPatientsControl,
+  getPatientInspectionList
 } from '@/api/common/common'
 
 export default {
@@ -843,6 +845,20 @@ export default {
     formatJson(filterVal, jsonData) {
       return jsonData.map((v) => filterVal.map((j) => v[j]));
     },
+    getPatientInspectionList(){
+       var params ={
+        startime:this.listQuery.start_time,
+        endtime: this.listQuery.end_time
+       }
+       getPatientInspectionList(params).then(response=>{
+          if(response.data.state ==1){
+            var list = response.data.data.list
+            console.log("list----------",list)
+          }
+       })
+     
+        
+    }
   },
   created() {
     var nowDate = new Date()
@@ -872,6 +888,8 @@ export default {
     //获取统计图数据
     this.getCartogramlist()
 
+   
+
   }
 }
 </script>

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -268,7 +268,7 @@ export default {
               if(this.org_id ==10210){
                 list[i].stockIn = list[i].GoodStartFlowInfo.over_count
               }else{
-                console.log("good_id",list[i].id)
+               
                 console.log("入库",this.getAllStockIn(list[i].StWarehousingInfoTwo))
                 console.log("盘盈",this.getAllStockInFlow(list[i].WareStartInStockFlow))
                 console.log("出库",this.getAllOutStockIn(list[i].WarehouseOutInfoTenty) )

src/xt_pages/user/evaluationtool/OHpressuresore.vue

@@ -458,6 +458,8 @@ export default {
       this.zsgy_open=0
       this.baocun_open=1
       this.cancel_num=1
+
+     1
       getPedPatientFallAssessmentById(this.id).then(response=>{
         if(response.data.state ==1){