Merge branch '20220812' of http://git.shengws.com/csx/Vue_New into 20220812

src/api/dialysis.js

@@ -331,3 +331,11 @@ export function getDialysisSetting(params) {
     params: params
   })
 }
+
+export function getDialysisParameter(params) {
+  return request({
+    url: '/api/patient/getdialysisparameter',
+    method: 'get',
+    params: params
+  })
+}

src/router/index_路由未分离前.js

@@ -818,12 +818,12 @@ export const xt_asyncRouterMap = [
         name: 'otherCancelStockOrder',
         meta: { title: 'otherCancelStockOrder', noCache: true }
       },
-      // {
-      //   path: '/stock/query',
-      //   component: () => import('@/xt_pages/stock/stockQuery'),
-      //   name: 'stockQuery',
-      //   meta: { title: 'stockQuery' }
-      // },
+      {
+        path: '/stock/query',
+        component: () => import('@/xt_pages/stock/stockQuery'),
+        name: 'stockQuery',
+        meta: { title: 'stockQuery' }
+      },
       {
         path: '/stock/detail',
         component: () => import('@/xt_pages/stock/stockDetailIndex'),

src/router/modules/drugs.js

@@ -12,12 +12,12 @@ export default {
     isChild: true
   },
   children: [
-    // {
-    //   path: '/stock/drugs/stock/query',
-    //   component: () => import('@/xt_pages/stock/drugs/query'),
-    //   name: 'drugsQuery',
-    //   meta: { title: 'drugsQuery', noCache: true }
-    // },
+    {
+      path: '/stock/drugs/stock/query',
+      component: () => import('@/xt_pages/stock/drugs/query'),
+      name: 'drugsQuery',
+      meta: { title: 'drugsQuery', noCache: true }
+    },
     {
       path: '/stock/drugs/drugNewQuery',
       component: () => import('@/xt_pages/stock/drugs/drugNewQuery'),

src/xt_pages/dialysis/details/consumable/dialysisParameter.vue

@@ -58,24 +58,140 @@
           color: '#606266'
         }"
       >
-        <el-table-column
-          align="center"
-          type="selection"
-          width="55">
+        <el-table-column align="center"  type="selection" width="55">
+           <template slot-scope="scope">
+             
+           </template>
         </el-table-column>
-        <el-table-column
-          align="center"
-          prop="name"
-          v-for="(item,index) in good_types"
-          :key="index"
-          :label="item"
-        >
-          <template slot-scope="scope">
-            <span>{{scope.row.good_type[index].name}}</span>
-          </template>
+        <el-table-column align="center" label="序号" width="55">
+           <template slot-scope="scope">
+             {{scope.$index + 1}}
+           </template>
+        </el-table-column>
+         <el-table-column align="center" label="透析机号" width="55">
+           <template slot-scope="scope">
+              {{scope.row.device_number.number}}
+           </template>
+        </el-table-column>
+        <el-table-column align="center" label="姓名" width="55">
+           <template slot-scope="scope">
+            {{scope.row.patient.name}}
+           </template>
+        </el-table-column>
+        <el-table-column align="center" label="住院(门诊)号" width="55">
+           <template slot-scope="scope">
+
+           </template>
+        </el-table-column>
+        <el-table-column align="center" label="透前体重" width="55">
+           <template slot-scope="scope">
+             {{scope.row.assessment_befor_dislysis.weight_before}}
+           </template>
+        </el-table-column>
+         <el-table-column align="center" label="干体重" width="55">
+           <template slot-scope="scope">
+            {{scope.row.assessment_befor_dislysis.dry_weight}}
+           </template>
+        </el-table-column>
+         <el-table-column align="center" label="透前血压" width="55">
+           <template slot-scope="scope">
+            <span v-if="scope.row.assessment_befor_dislysis.systolic_blood_pressure>0">{{scope.row.assessment_befor_dislysis.systolic_blood_pressure}}</span>
+            <span v-if="scope.row.assessment_befor_dislysis.diastolic_blood_pressure>0">/{{scope.row.assessment_befor_dislysis.diastolic_blood_pressure}}</span> 
+           </template>
+        </el-table-column>
+         <el-table-column align="center" label="目标脱水量" width="55">
+           <template slot-scope="scope">
+             <span v-if="scope.row.dialysis_prescription.target_ultrafiltration>0">{{scope.row.dialysis_prescription.target_ultrafiltration}}</span>
+           </template>
+        </el-table-column>
+        <el-table-column align="center" label="超率总量" width="55">
+           <template slot-scope="scope">
+
+           </template>
+        </el-table-column>
+        <el-table-column align="center" label="抗凝剂(首剂)(维持)(总量)" width="100">
+           <template slot-scope="scope">
+             <span>{{getAnticoagualnt(scope.row.dialysis_prescription.anticoagulant)}}</span>
+             <span>{{getAnticoagualnt(scope.row.dialysis_prescription.anticoagulant)}}</span>
+             <span>{{getAnticoagualnt(scope.row.dialysis_prescription.anticoagulant)}}</span>
+             <span v-if="scope.row.dialysis_prescription.anticoagulant_shouji > 0">(scope.row.dialysis_prescription.anticoagulant_shouji)</span>
+             <span v-if="scope.row.dialysis_prescription.anticoagulant_weichi > 0">(scope.row.dialysis_prescription.anticoagulant_weichi)</span>
+             <span v-if="scope.row.dialysis_prescription.anticoagulant_zongliang > 0">(scope.row.dialysis_prescription.anticoagulant_zongliang)</span>
+           </template>
+        </el-table-column>
+
+        <el-table-column align="center" label="透析时长" width="100">
+           <template slot-scope="scope">
+             <span v-if="scope.row.dialysis_duration >0">{{scope.row.dialysis_duration}}</span>
+           </template>
+        </el-table-column>
+
+       <el-table-column align="center" label="设备型号" width="100">
+           <template slot-scope="scope">
+             <span></span>
+           </template>
+        </el-table-column>
+
+        <el-table-column align="center" label="透析器/灌流器" width="100">
+           <template slot-scope="scope">
+             <span>{{scope.row.dialysis_prescription.dialyzer_perfusion_apparatus}}</span>
+             <span>{{scope.row.dialysis_prescription.dialysis_dialyszers}}</span>
+             <span>{{scope.row.dialysis_prescription.dialysis_irrigation}}</span>
+           </template>
+        </el-table-column>
+
+       
+
+        <el-table-column align="center" label="置换总量" width="100">
+           <template slot-scope="scope">
+             <span>{{scope.row.dialysis_prescription.replacement_total}}</span>
+           </template>
+        </el-table-column>
+       
+
+        <el-table-column align="center" label="钾" width="100">
+           <template slot-scope="scope">
+             <span>{{scope.row.dialysis_prescription.kalium}}</span>
+           </template>
+        </el-table-column>
+
+        <el-table-column align="center" label="钠" width="100">
+           <template slot-scope="scope">
+             <span>{{scope.row.dialysis_prescription.sodium}}</span>
+           </template>
+        </el-table-column>
+
+
 
+        <el-table-column align="center" label="钙" width="100">
+           <template slot-scope="scope">
+             <span>{{scope.row.dialysis_prescription.calcium}}</span>
+           </template>
         </el-table-column>
 
+        <el-table-column align="center" label="碳酸氢盐" width="100">
+           <template slot-scope="scope">
+              <span>{{scope.row.dialysis_prescription.bicarbonate}}</span>
+           </template>
+        </el-table-column>
+
+        <el-table-column align="center" label="血管通路" width="100">
+           <template slot-scope="scope">
+             <span>{{getBloodAccessOption(scope.row.dialysis_prescription.blood_access)}}</span>
+           </template>
+        </el-table-column>
+
+       <el-table-column align="center" label="封管液" width="100">
+           <template slot-scope="scope">
+             
+           </template>
+        </el-table-column>
+
+        <el-table-column align="center" label="葡萄糖" width="100">
+           <template slot-scope="scope">
+             {{scope.row.dialysis_prescription.amylaceum}}
+           </template>
+        </el-table-column>
       </el-table>
 
       <el-dialog
@@ -131,8 +247,9 @@
 
 
 <script>
-  import { GetAllZone,saveDialysisSetting,getDialysisSetting } from '@/api/dialysis'
+  import { GetAllZone,saveDialysisSetting,getDialysisSetting,getDialysisParameter } from '@/api/dialysis'
   import { uParseTime } from "@/utils/tools";
+  import { getDataConfig } from '@/utils/data'
   import store from "@/store";
   export default {
     components: {
@@ -207,12 +324,13 @@
         kalium:false,
         displace_liqui_value:false,
         bicarbonate:false,
-        glucose:false
+        glucose:false,
+        blood_access_option:[],
       }
     },
     created() {
+       this.blood_access_option  = getDataConfig('hemodialysis', 'vascular_access_desc')
        var filedList = store.getters.xt_user.fileds
-       console.log("哈哈哈哈",filedList)
        var newArr = [
         {value:999999,filed_name_cn:"姓名"},
         {value:888888,filed_name_cn:"透析号"},
@@ -227,7 +345,7 @@
         }
         this.predialysisConditionOptions = newArr
        }
-      console.log("newArr23232323232wo",newArr)
+     
       this.getAllZone()
       let date = uParseTime(new Date(), "{y}-{m}-{d}")
       var newDate = new Date();
@@ -250,7 +368,13 @@
 
       },
       getlist(){
-
+        getDialysisParameter(this.query).then(response=>{
+            if(response.data.state == 1){
+              var list = response.data.data.list
+              this.list = list
+              this.total = response.data.data.total
+            }
+        }) 
       },
       handleSizeChange(val) {
         this.query.limit = val;
@@ -376,7 +500,6 @@
         return jsonData.map(v => filterVal.map(j => v[j]));
       },
      toDialog(){
-      console.log("触发222222222222222我v")
       getDialysisSetting().then(response=>{
         if(response.data.state == 1){
            this.dialogVisible = true
@@ -632,10 +755,10 @@
           this.gaijiliang = 1
         }
         if(this.kalium == false){
-          kalium = 2
+          kalium_set = 2
         }
         if(this.kalium == true){
-          kalium = 1
+          kalium_set = 1
         }
         if(this.displace_liqui_value == false){
           displace_liqui_value_set = 2
@@ -679,12 +802,66 @@
           bicarbonate_set:bicarbonate_set,
           glucose_set:glucose_set,
         }
+        console.log("patam223232332",params)
        saveDialysisSetting(params).then(response=>{
          if(response.data.state == 1){
            var dialysisSetting = response.data.data.dialysisSetting
+           this.$message.success("保存成功!")
            this.dialogVisible = false
          }
        })
+     },
+     getAnticoagualnt(id){
+       var name = ""
+       if(id == 1){
+         name = "无肝素"
+       }
+       if(id == 2){
+        name = "普通肝素"
+       }
+       if(id == 3){
+         name ="低分子肝素"
+       }
+       if(id == 4){
+         name ="阿加曲班"
+       }
+       if(id == 5){
+         name ="枸橼酸钠"
+       }
+       if(id == 6){
+         name ="低分子肝素钙"
+       }
+       if(id == 7){
+         name ="低分子肝素钠"
+       }
+       if(id == 8){
+         name ="依诺肝素"
+       }
+       if(id == 9){
+         name ="达肝素"
+       }
+       if(id == 10){
+         name ="体外抗凝"
+       }
+       if(id == 11){
+         name ="那屈肝素"
+       }
+       if(id == 12){
+         name ="无抗凝剂"
+       }
+       if(id == 13){
+         name ="那屈肝素钙"
+       }
+       return name
+     },
+     getBloodAccessOption(id){
+       var name = ""
+       for(let i=0;i<this.blood_access_option.length;i++){
+         if(id == this.blood_access_option[i].id){
+            name = this.blood_access_option[i].name
+         }
+       }
+       return name
      }
     }
   }

src/xt_pages/outpatientDoctorStation/template/printThree.vue

@@ -49,8 +49,16 @@
             <div style="width: 20%;"></div>
             <div style="width: 33%; display: flex">
               医保类型：
-              <span class="under_line">
-               
+              <span class="under_line" v-if="item.patient.reimbursement_way_id == 20">
+               {{'医保一档'}}
+              </span>
+              <span class="under_line" v-if="item.patient.reimbursement_way_id == 21">
+               {{'医保二档'}}
+              </span>
+              <span class="under_line" v-if="item.patient.reimbursement_way_id == 22">
+               {{'医保三档'}}
+              </span>
+              <span class="under_line" v-if="item.patient.reimbursement_way_id != 20 && item.patient.reimbursement_way_id != 21 && item.patient.reimbursement_way_id != 22">
               </span>
             </div>
           </div>

src/xt_pages/stock/drugs/components/drugQuery.vue

@@ -31,13 +31,13 @@
          </div>
         
          <div>
-          <!-- <el-button
+          <el-button
             size="small"
             class="filter-item"
             type="primary"
             @click="toCheck"
             >脚本
-          </el-button> -->
+          </el-button>
           <el-button
             size="small"
             class="filter-item"
@@ -170,9 +170,9 @@
             <el-table-column label="总库存量" align="center">
              <template slot-scope="scope">
                 <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info) > 0">
-                   <span v-if="scope.row.total_count<=scope.row.drug_stock_limit" style="color:red">{{getSumCount(scope.row.drug_stock_count,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}<i class="el-icon-warning"></i></span> 
+                   <span v-if="scope.row.total_count<=scope.row.drug_stock_limit_count" style="color:red">{{getSumCount(scope.row.drug_stock_count,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}<i class="el-icon-warning"></i></span> 
                    
-                   <span v-if="scope.row.total_count >scope.row.drug_stock_limit">{{getSumCount(scope.row.drug_stock_count,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
+                   <span v-if="scope.row.total_count >scope.row.drug_stock_limit_count">{{getSumCount(scope.row.drug_stock_count,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
                 </div>
               </template>
             </el-table-column>

src/xt_pages/stock/drugs/components/expiryDateDrugQuery.vue

@@ -506,6 +506,7 @@ export default {
     if(val == 4){
        var time = this.addDate(this.getTime(this.nowtime),180)
        this.start_time = time
+       this.getlist()
     }
     //1年以后
     if(val == 5){

src/xt_pages/stock/query/expiryDateQuery.vue

@@ -530,6 +530,7 @@ export default {
     if(val == 4){
        var time = this.addDate(this.getTime(this.nowtime),180)
        this.start_time = time
+       this.getlist()
     }
     //1年以后
     if(val == 5){

src/xt_pages/stock/query/goodNewQuery.vue

@@ -31,7 +31,7 @@
           <el-button  type="primary" icon="el-icon-search" @click="seach">搜索</el-button>
          </div>
           <div>
-            <!-- <el-button size="small" type="primary" @click="toClickTwo">脚本</el-button> -->
+            <el-button size="small" type="primary" @click="toClickTwo">脚本</el-button>
             <el-button size="small" type="primary" @click="exportList">导出</el-button>
             <el-button size="small" type="primary" @click="toPrint">打印</el-button>
           </div>