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

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

@@ -638,6 +638,14 @@ export const xt_asyncRouterMap = [
         name: 'Inspection',
         meta: { title: 'inspection', noCache: true }
       },
+      {
+        path: '/patients/newinspection',
+        component: () => import('@/xt_pages/user/newInspection'),
+        hidden: true,
+        is_menu: false,
+        name: 'newInspection',
+        meta: { title: 'newInspection', noCache: true }
+      },
       {
         path: '/',
         component: () => import('@/xt_pages/user/courseOfDisease'),

src/xt_pages/data/components/consumables.vue

@@ -81,14 +81,14 @@
         >点击导出
         </el-button>
 
-        <!-- <el-button
+       <!-- <el-button
           style="margin-left:10px;"
           @click="jiaoBen()"
           class="filter-item"
           type="primary"
           size="small"
         >脚本
-        </el-button> -->
+        </el-button>  -->
       </div>
 
     <el-table

src/xt_pages/dialysis/batch_print/batch_print_order_forty.vue

@@ -490,7 +490,7 @@
                                 <td width="20">mg</td>
                                 <td width="10">)</td>
                                 <td width="100">
-                                    <label-box :isChecked="record.prescription.anticoagulant==3?true:false" showValue='低分子肝素'></label-box> 
+                                    <label-box :isChecked="record.prescription.anticoagulant==3 || record.prescription.anticoagulant==6 || record.prescription.anticoagulant==7?true:false" showValue='低分子肝素'></label-box> 
                                 </td>
                                 
                                 <td width="10">(</td>

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

@@ -1511,8 +1511,10 @@ export default {
 
       if(predialysis != null && predialysis.id == 0){
         if (last_after != null) {
-          for (var key in last_after){
-            if (key != 'actual_treatment_hour' && key != 'actual_treatment_minute' && key != 'weight_loss' && key != 'weight_after'  && key != 'systolic_blood_pressure' && key != 'diastolic_blood_pressure' && key != 'pulse_frequency'  && key != 'actual_ultrafiltration'  ){
+          
+          if(this.$store.getters.xt_user.template_info.org_id==10101){
+            for (var key in last_after){
+            if (key != 'actual_treatment_hour' && key != 'actual_treatment_minute' && key != 'weight_loss' && key != 'weight_after'  && key != 'systolic_blood_pressure' && key != 'diastolic_blood_pressure' && key != 'pulse_frequency' ){
               this.$set(
                 this.form,
                 key,
@@ -1521,6 +1523,20 @@ export default {
 
             }
           }
+          }else{
+            for (var key in last_after){
+            if (key != 'actual_treatment_hour' && key != 'actual_treatment_minute' && key != 'weight_loss' && key != 'weight_after'  && key != 'systolic_blood_pressure' && key != 'diastolic_blood_pressure' && key != 'pulse_frequency'  && key != 'actual_ultrafiltration'  ){
+              this.$set(
+                this.form,
+                key,
+                last_after[key]
+              )
+
+             }
+           }
+          }
+        
+
         }
         // 5.15
         if(last_after.id > 0){

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

@@ -387,7 +387,7 @@
                 org_id == 10599 || 
                 org_id == 10612 ||
                 org_id == 10617 ||
-                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635 || org_id ==10702) &&
+                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id ==10090) &&
                 org_id!=10387
             "
           >
@@ -458,7 +458,7 @@
               && org_id!=10432 && org_id!=10445
               && org_id!=10410 && org_id!=10495 &&
                org_id!=10485 && org_id!=10395 && org_id!=10375
-               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635  && org_id!=10702)
+               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635  && org_id!=10702  && org_id!=10090)
               || org_id == 10387
             "
           >
@@ -529,7 +529,7 @@
                 org_id == 10410 ||
                 org_id == 10495  ||
                 org_id == 10395
-                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635 || org_id ==10702)
+                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635 || org_id ==10702 || org_id == 10090)
                 && org_id!=10387
             "
           >
@@ -584,7 +584,7 @@
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 && org_id!=10495
-              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635  && org_id!=10702) ||
+              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635  && org_id!=10702 && org_id!=10090) ||
               org_id == 10387
             "
           >
@@ -1681,7 +1681,7 @@
                 org_id== 10432 ||
                 org_id== 10445 ||
                 org_id== 10410 ||
-                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697 || org_id ==10635 || org_id ==10702) &&
+                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id == 10090) &&
                 org_id!=10387
             "
           >
@@ -1729,7 +1729,7 @@
               org_id!=10445 &&
               org_id!=10410 &&
               org_id!=10485 &&
-              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697 && org_id!=10635 && org_id!=10702)
+              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697 && org_id!=10635 && org_id!=10702 && org_id!=10090)
               || org_id == 10387
             "
           >
@@ -1802,7 +1802,7 @@
                 org_id == 10599 ||
                 org_id ==10612 || 
                 org_id ==10617 || 
-                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id == 10635 || org_id == 10702)
+                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id == 10635 || org_id == 10702 || org_id == 10090)
                 && org_id!=10387 && org_id!=10694
             "
           >
@@ -1875,7 +1875,8 @@
               org_id!=10693 &&
               org_id!=10697 &&
               org_id!=10635 &&
-              org_id!=10702
+              org_id!=10702 &&
+              org_id!=10090
               )
               || org_id == 10387 || org_id == 10694
             "

src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue

@@ -576,7 +576,7 @@
                   <td width="20">mg</td>
                   <td width="10">)</td>
                   <td width="100">
-                      <label-box :isChecked="prescription.anticoagulant==3?true:false" showValue='低分子肝素'></label-box> 
+                      <label-box :isChecked="prescription.anticoagulant==3 || prescription.anticoagulant==6 || prescription.anticoagulant==7?true:false" showValue='低分子肝素'></label-box> 
                   </td>
                   
                   <td width="10">(</td>

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -743,7 +743,7 @@ export default {
         }
         if (
           this.org_id == 10138 ||
-          this.org_id == 10278 ||  this.org_id == 10610 || this.org_id == 10537 || this.org_id == 0
+          this.org_id == 10278 ||  this.org_id == 10610 || this.org_id == 10537
         ) {
           getPrivateExpenses(params).then((response) => {
             if (response.data.state == 0) {
@@ -893,6 +893,9 @@ export default {
               // that.info["department"] = response.data.data.department;
               // that.info["health_card_no"] = response.data.data.health_card_no;
 
+
+
+
               that.info['bed_cost_total'] = response.data.data.bedCostTotal
               that.info['bed_cost_self_total'] =
                 response.data.data.bedCostSelfTotal
@@ -1201,6 +1204,9 @@ export default {
               that.info['material_cost_part_self_total'] =
                 response.data.data.materialCostPartSelfTotal
 
+
+
+
               that.info['western_medicine_cost_total'] =
                 response.data.data.westernMedicineCostTotal
               that.info['western_medicine_cost_self_total'] =
@@ -1590,6 +1596,30 @@ export default {
                   that.info['department'] = response.data.data.department
                   that.info['health_card_no'] = response.data.data.health_card_no
 
+
+                  if(response.data.data.zcCostTotal){
+                    that.info['zc_cost_total'] =
+                      response.data.data.zcCostTotal
+                  }else{
+                    that.info['zc_cost_total'] = 0
+                  }
+
+                  if(response.data.data.zcCostSelfTotal){
+                    that.info['zc_cost_self_total'] =
+                      response.data.data.zcCostSelfTotal
+                  }else{
+                    that.info['zc_cost_self_total'] = 0
+                  }
+
+
+                  if(response.data.data.zcCostPartSelfTotal){
+                    that.info['zc_cost_part_self_total'] =
+                      response.data.data.zcCostPartSelfTotal
+                  }else{
+                    that.info['zc_cost_part_self_total'] = 0
+                  }
+
+
                   that.info['bed_cost_total'] = response.data.data.bedCostTotal
                   that.info['bed_cost_self_total'] =
                     response.data.data.bedCostSelfTotal
@@ -1648,6 +1678,27 @@ export default {
                     response.data.data.treatCostSelfTotal
                   that.info['treat_cost_part_self_total'] =
                     response.data.data.treatCostPartSelfTotal
+
+                  if(response.data.data.zcCostTotal){
+                    that.info['zc_cost_total'] =
+                      response.data.data.zcCostTotal
+                  }else{
+                    that.info['zc_cost_total'] = 0
+                  }
+                  if(response.data.data.zcCostSelfTotal){
+                    that.info['zc_cost_self_total'] =
+                      response.data.data.zcCostSelfTotal
+                  }else{
+                    that.info['zc_cost_self_total'] = 0
+                  }
+                  if(response.data.data.zcCostPartSelfTotal){
+                    that.info['zc_cost_part_self_total'] =
+                      response.data.data.zcCostPartSelfTotal
+                  }else{
+                    that.info['zc_cost_part_self_total'] = 0
+                  }
+
+
                   that.info['date'] = response.data.data.date
                   that.info['number'] = response.data.data.number
                   that.info['order_infos'] = response.data.data.order_infos
@@ -1698,6 +1749,8 @@ export default {
                     response.data.data.otherSelfTotal
                   that.info['dia_config'] = response.data.data.dia_config
 
+
+
                   //org_id 10485,此代码为阳春恒健血液透析中心结算单模版数据处理逻辑
                   var list = []
                   //获取所有项目类型进行去重
@@ -1855,12 +1908,7 @@ export default {
                   }
                   that.info['funds'] = funds
 
-                  that.info['zc_cost_total'] =
-                    response.data.data.zcCostTotal
-                  that.info['zc_cost_self_total'] =
-                    response.data.data.zcCostSelfTotal
-                  that.info['zc_cost_part_self_total'] =
-                    response.data.data.zcCostPartSelfTotal
+
 
                 }
               })

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -260,7 +260,7 @@
           parseFloat(info.operation_cost_self_total) + parseFloat(info.other_cost_self_total) +
           parseFloat(info.material_cost_self_total) + parseFloat(info.western_medicine_cost_self_total) +
           parseFloat(info.chinese_traditional_medicine_cost_self_total) + parseFloat(info.check_cost_self_total) +
-          parseFloat(info.laboratory_cost_self_total) + parseFloat(info.treat_cost_self_total) + parseFloat(info.zc_cost_total)).toFixed(2)}}
+          parseFloat(info.laboratory_cost_self_total) + parseFloat(info.treat_cost_self_total) + parseFloat(info.zc_cost_self_total)).toFixed(2)}}
         </td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_part_self_total) +
           parseFloat(info.operation_cost_part_self_total) + parseFloat(info.other_cost_part_self_total) +

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -291,6 +291,12 @@
             <span v-if="scope.row.is_total == 0"> {{ scope.row.batch_number }}</span>
           </template>
         </el-table-column>
+
+        <el-table-column label="药品追溯码" align="center">
+          <template slot-scope="scope">
+             {{ scope.row.drug_code }}
+          </template>
+        </el-table-column>
         <el-table-column label="仓库名称" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.is_total == 0">

src/xt_pages/stock/selfPreparedMedicine/selfPatientDrugFlow.vue

@@ -0,0 +1,315 @@
+<template>
+    <div class="main-contain">
+      <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+      </div>
+      <div class="app-container ">
+        <div class="cell clearfix">
+         药品名称:<span>{{getName(this.$route.query.drug_id)}}</span>&nbsp;
+         库存: {{this.$route.query.overCount}}{{ drug.min_unit }}
+         规格:<span>{{drug.dose}}{{drug.dose_unit}}*{{drug.min_number}}{{drug.min_unit}}/{{drug.max_unit}}</span>&nbsp;
+         厂家:<span>{{this.$route.query.manufacturer}}</span>&nbsp;
+        </div>
+        <div class="cell clearfix">
+          <span>日期查询:</span>
+          <el-date-picker
+              size="small"
+              v-model="start_time"
+              prefix-icon="el-icon-date"
+              :editable="false"
+              style="width: 196px;"
+              type="date"
+              placeholder="选择日期时间"
+              align="right"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              @change="startTimeChange"
+             ></el-date-picker>-
+              <el-date-picker
+                size="small"
+                v-model="end_time"
+                prefix-icon="el-icon-date"
+                :editable="false"
+                style="width: 196px;margin-right:10px;"
+                type="date"
+                placeholder="选择日期时间"
+                align="right"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+                @change="endTimeChange"
+            ></el-date-picker>
+  
+          <span>出入库方式:</span>
+          <el-select v-model="stock_type" style="width:160px;margin-right:10px;" placeholder="请选择" @change="changeDrug">
+              <el-option
+                v-for="(item,index) in stockType"
+                :key="index"
+                :label="item.name"
+                :value="item.id">
+              </el-option>
+          </el-select>
+          
+          <!-- <span>
+            <el-button type="primary" size="small" @click="toExprot">导出</el-button>
+  
+            <el-button type="primary" size="small" @click="toTongBu">同步</el-button>
+          </span> -->
+          
+        </div>
+        
+         <el-table
+          :data="tableList"
+          border
+          style="width: 100%">
+          <el-table-column prop="date" label="序号" width="180" align="center">
+             <template  slot-scope="scope">
+                {{scope.$index + 1}}
+             </template>
+          </el-table-column>
+          <el-table-column prop="drug_type" label="出入库方式" width="180" align="center">
+             <template slot-scope="scope">
+               <span v-if="scope.row.consumable_type == 1">手动入库</span>
+               <span v-if="scope.row.consumable_type == 2">手动出库</span>
+               <span v-if="scope.row.consumable_type == 3">自动出库</span>
+               <span v-if="scope.row.consumable_type == 4">手动退库</span>
+               <span v-if="scope.row.consumable_type == 7">自动退库</span>
+               <span v-if="scope.row.consumable_type == 5">报损数量</span>
+               <span v-if="scope.row.consumable_type == 10">盘盈</span>
+               <span v-if="scope.row.consumable_type == 11">盘亏</span>
+               <span v-if="scope.row.consumable_type == 12">调拨出库</span>
+               <span v-if="scope.row.consumable_type == 13">调拨入库</span>
+               <span v-if="scope.row.consumable_type == 15">结算出库</span>
+               <span v-if="scope.row.consumable_type == 20">处方出库</span>
+             </template>
+          </el-table-column>
+          <el-table-column prop="drug_name" label="出/入库单据编码" align="center">
+             <template slot-scope="scope">
+               <span v-if="scope.row.consumable_type == 1">{{scope.row.warehousing_order}}</span>
+                <span v-if="scope.row.consumable_type == 2 || scope.row.consumable_type == 3 || scope.row.consumable_type == 12 || scope.row.consumable_type == 15 || scope.row.consumable_type==20">{{scope.row.warehouse_out_order_number}}</span>
+                <span v-if="scope.row.consumable_type == 4 || scope.row.consumable_type == 7">{{scope.row.cancel_order_number}}</span>
+                <span v-if="scope.row.consumable_type == 5">{{scope.row.warehouse_out_order_number}}</span>
+                <span v-if="scope.row.consumable_type == 10 || scope.row.consumable_type == 11 || scope.row.consumable_type == 13">{{scope.row.warehousing_order}}</span>
+             </template>
+          </el-table-column>
+          <el-table-column prop="drug_name" label="出库日期" align="center">
+             <template slot-scope="scope">
+               {{getTime(scope.row.ctime,"{y}-{h}-{d}")}}
+             </template>
+          </el-table-column>
+          <el-table-column prop="drug_name" label="操作日期" align="center">
+             <template slot-scope="scope">
+               {{getTime(scope.row.operate_time,"{y}-{h}-{d}")}}
+             </template>
+          </el-table-column>
+        
+          <el-table-column prop="drug_name" label="数量&单位" align="center">
+             <template slot-scope="scope">
+                <span v-if="scope.row.consumable_type != 2 &&  scope.row.consumable_type != 3 && scope.row.consumable_type != 5 && scope.row.consumable_type != 7">{{scope.row.count}}{{scope.row.max_unit}}</span>
+                <span v-if="(scope.row.consumable_type == 2 || scope.row.consumable_type == 3 || scope.row.consumable_type == 5 || scope.row.consumable_type == 7) && parseInt(scope.row.count/scope.row.drug.min_number) >0">{{parseInt(scope.row.count/scope.row.drug.min_number)}}{{scope.row.drug.max_unit}}</span>
+                <span v-if="(scope.row.consumable_type == 2 || scope.row.consumable_type == 3 || scope.row.consumable_type == 5 || scope.row.consumable_type == 7) && scope.row.count%scope.row.drug.min_number >0">{{scope.row.count%scope.row.drug.min_number}}{{scope.row.drug.min_unit}}</span>
+             </template>
+          </el-table-column>
+  
+       
+        
+           <el-table-column prop="drug_name" label="有效期" align="center">
+             <template slot-scope="scope">
+                {{getTime(scope.row.expire_date,"{y}-{h}-{d}")}}
+              
+             </template>
+          </el-table-column>
+         
+          <el-table-column prop="drug_name" label="使用人" align="center">
+             <template slot-scope="scope">
+               <span > {{getPatientName(scope.row.patient_id)}}</span>
+             </template>
+          </el-table-column>
+          <!-- <el-table-column prop="drug_name" label="剩余库存" align="center">
+             <template slot-scope="scope">
+                 {{ scope.row.over_count }} {{ drug.min_unit }}
+             </template>
+          </el-table-column> -->
+          <el-table-column prop="remark" label="备注" align="center">
+             <template slot-scope="scope">
+               <span > {{scope.row.remark}}</span>
+             </template>
+          </el-table-column>
+         </el-table>
+         
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :page-sizes="[10, 50, 100,500,1000]"
+          :page-size="10"
+          background
+          align="right"
+          style="margin-top:20px;"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+        >
+        </el-pagination>
+      </div>
+  
+      <setting-dialog
+        ref="dialog"
+      ></setting-dialog>
+  
+    </div>
+  </template>
+
+  <script>
+
+  import { uParseTime } from '@/utils/tools'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import { getSelfDrugFlow }  from '@/api/drug/drug'
+  export default {
+    components: {
+      BreadCrumb
+    },
+    data(){
+      return{
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/drugs/stock/query', name: '药品库存查询' },
+          { path:'/drugstock/in/drugstockflow',name:'库存流水'}
+        ],
+        keywords: '',
+        total: 0,
+        multipleSelection: [],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        start_time: '',
+        end_time: '',
+        page: 1,
+        limit: 10,
+        goodType: [],
+        goodInfo: [],
+        tempArr: [],
+        sameRowArr: [],
+        WarehouseInfo: {
+          loading: false,
+          warehouseInfoDate: []
+        },
+        tableData:[],
+        drug_category:0,
+        stock_type:0,
+        drugCategory:[
+          {id:0,name:"全部"}
+        ],
+        drugTypeList:[],
+        tableList:[],
+        manufacturerList:[],
+        list:[],
+        stockType:[
+          {id:0,name:"全部"},
+          {id:1,name:"手动入库"},
+          {id:2,name:"手动出库"},
+          {id:3,name:"自动出库"},
+          {id:4,name:"手动退库"},
+          {id:10,name:"盘盈"},
+          {id:11,name:"盘亏"},
+          {id:12,name:"调拨出库"},
+          {id:13,name:"调拨入库"},
+          {id:15,name:"结算出库"}
+        ],
+        outList:[],
+        countList:[],
+        outCountList:[],
+        autoCountList:[],
+        drugOutList:[],
+        total:0,
+        houseList:[],
+        patientList:[],
+        drug:{},
+        patients:[]
+      }
+    },
+    created(){
+      this.getlist()
+    },
+    methods:{
+      startTimeChange: function(val) {
+      this.tableList = []
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      
+      if (time > 0) {
+        this.$message.error("开始时间不能大于结束时间");
+        this.start_time = "";
+      } else {
+         
+         this.getlist()
+     
+      }
+    },
+    endTimeChange: function(val) {
+      this.tableList = []
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.getlist()
+      }
+     },
+     changeDrug(val){
+       this.tableList= []
+       this.stock_type = val
+       this.getlist()
+      },
+      handleSizeChange(val) {
+        this.limit = val
+        this.getlist()
+      },
+      handleCurrentChange(val) {
+        this.page = val
+        this.getlist()
+      },
+      getlist(){
+        var params = {
+             drug_id:this.$route.query.drug_id,
+             start_time:this.start_time,
+             end_time:this.end_time,
+             page:this.page,
+             limit:this.limit,
+             patient_id:this.$route.query.patient_id,
+         }
+        getSelfDrugFlow(params).then(response=>{
+           if(response.data.state ==1){
+              var list = response.data.data.list
+             
+              this.tableList =list
+              var total =  response.data.data.total
+              this.total = total
+              this.drug =response.data.data.drug
+              this.patientList= response.data.data.patients
+           }
+        })
+      },
+      getName(drug_id){
+        var name = ""
+        if(drug_id == this.drug.id){
+           name = this.drug.drug_name
+        }
+        return 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
+     },
+    }
+  }
+</script>

src/xt_pages/user/components/PatientSidebar.vue

@@ -180,10 +180,10 @@ export default {
               name: '1-10',
               label: '出院小结'
             },
-            {
-              name: '1-12',
-              label: '转归记录'
-            }
+            // {
+            //   name: '1-12',
+            //   label: '转归记录'
+            // }
 
           ]
         },
@@ -281,6 +281,10 @@ export default {
             },
           ]
         },
+        {
+          name: '7',
+          label: '转归记录',
+        },
 
       ],
       name:""
@@ -334,8 +338,6 @@ export default {
         this.$router.push({path:'/patient/patient/'+this.id+'/hospitalSummary'})
       } else if(name == '1-11'){
         this.$router.push({path:'/patient/patient/'+this.id+'/firstDisease'})
-      }else if(name == '1-12'){
-        this.$router.push({path:'/patient/patient/'+this.id+'/lapsoSummary'})
       } else if(name == '3-1'){
         this.$router.push({ path: '/patients/sickhistory?id=' + this.id })
 
@@ -386,6 +388,8 @@ export default {
         this.$router.push({path:'/patients/patient/' + this.id+'/Muscleforce'})
       }else if(name == '6-1'){
         this.$router.push({path: '/patients/patient/' + this.id+ '/Informedconsent'})
+      }else if(name == '7'){
+        this.$router.push({path:'/patient/patient/'+this.id+'/lapsoSummary'})
       }
 
     },
@@ -528,8 +532,6 @@ export default {
         })
       }else if(patientKey == '1-11'){
        this.$router.push({path: '/patients/patient/' + this.id + '/firstDisease'})
-      }else if(patientKey == '1-12'){
-        this.$router.push({path:'/patient/patient/'+this.id+'/lapsoSummary'})
       }else if (patientKey == '1-5') {
         this.$router.push({ path: '/patients/rescue?id=' + this.id })
       } else if (patientKey == '2-1') {
@@ -550,6 +552,8 @@ export default {
         })
       } else if (patientKey == '3-1') {
         this.$router.push({ path: '/patients/sickhistory?id=' + this.id })
+      }else if(patientKey == '7'){
+        this.$router.push({path:'/patient/patient/'+this.id+'/lapsoSummary'})
       }
 
      }else{

src/xt_pages/user/lapsoSummary.vue

@@ -1,23 +1,25 @@
 <template>
     <div class="patient-container">
-      <patient-sidebar :id="patientID" defaultActive="1-12" v-on:tran-patient="onTranPatient"></patient-sidebar>
+      <patient-sidebar :id="patientID" defaultActive="7" v-on:tran-patient="onTranPatient"></patient-sidebar>
       <div class="patient-app-container advice-container app-container">
         <div style="display:flex;justify-content: space-between;align-items: center;margin-bottom: 12px;">
            <span style="font-weight:bold;">转归记录列表</span>
            <el-button size="medium" type="primary" @click="dialogVisible =true">新增</el-button>
         </div>
         <el-table class="oictable" :data="tableData" border style="width:100%">
-        <el-table-column prop="start_time" label="转出日期" align="center">
+        <el-table-column prop="start_time" label="日期" align="center">
             <template slot-scope="scope">
               <span>{{ getTime(scope.row.record_date)}}</span>
             </template>
        </el-table-column>
         <el-table-column prop="blood_access_part_opera_id" label="转归类型" align="center">
           <template slot-scope="scope">
-             <span v-if="scope.row.lapse_type == 1">转出</span>
-             <span v-if="scope.row.lapse_type == 2">院内转诊</span>
+             <span v-if="scope.row.lapse_type == 1">转入</span>
+             <span v-if="scope.row.lapse_type == 2">转出</span>
+             <span v-if="scope.row.lapse_type == 3">死亡</span>
+             <span v-if="scope.row.lapse_type == 4">院内转诊</span>
           </template>
-       </el-table-column>
+        </el-table-column>
        <el-table-column prop="blood_access_part_id" label="转归分类" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.lapse_class == 1">终止透析</span>
@@ -29,7 +31,7 @@
             <span v-if="scope.row.lapse_class == 7">变更透析医院</span>
           </template>
        </el-table-column>
-        <el-table-column prop="inflow_pass" label="转归原因"  align="center">
+        <el-table-column prop="inflow_pass" label="原因"  align="center">
            <template slot-scope="scope">
               {{ scope.row.lapse_reason }}
            </template>
@@ -78,7 +80,7 @@
           :total="total"></el-pagination>
   
         <el-dialog
-            title="新增"
+            title="新增转归记录"
             :visible.sync="dialogVisible"
             width="65%"
             center>
@@ -98,17 +100,56 @@
                  </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="24">
+            <el-row :gutter="24" v-if="lapseto == 1">
+                <el-col :span="24">
+                    <el-form-item label="转归类型:"> 
+                        <el-radio-group style="padding: 10px;" v-model="lapse_type">
+                            <el-radio  label="2">转出</el-radio>
+                            <el-radio  label="3">死亡</el-radio>
+                            <el-radio  label="4">院内转诊</el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <el-row :gutter="24" v-if="lapseto == 2">
                 <el-col :span="24">
                     <el-form-item label="转归类型:"> 
                         <el-radio-group style="padding: 10px;" v-model="lapse_type">
-                            <el-radio  label="1">转出</el-radio>
-                            <el-radio  label="2">院内转诊</el-radio>
+                            <el-radio  label="1">转入</el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+
+            <el-row :gutter="24" v-if="lapse_type == 3">
+                <el-col :span="24">
+                    <el-form-item label="住院/门诊:"> 
+                      <el-radio-group style="padding: 10px;" v-model="his_type">
+                            <el-radio  label="1">门诊</el-radio>
+                            <el-radio  label="2">住院</el-radio>
                       </el-radio-group>
                     </el-form-item>
                 </el-col>
             </el-row>
 
+
+            <el-row :gutter="24" v-if="lapse_type == 3 && his_type==2">
+                <el-col :span="24">
+                    <el-form-item label="病区:"> 
+                       <el-input style="width: 200px" v-model="his_zone"></el-input> 
+                    </el-form-item>
+                </el-col>
+            </el-row>
+
+            <el-row :gutter="24" v-if="lapse_type == 3 && his_type==2">
+                <el-col :span="24">
+                    <el-form-item label="床号:"> 
+                        <el-input style="width: 200px" v-model="his_bed"></el-input> 
+                    </el-form-item>
+                </el-col>
+            </el-row>
+
+          
             <el-row :gutter="24">
                 <el-col :span="24">
                     <el-form-item label="转归分类:"> 
@@ -120,22 +161,26 @@
                             <el-radio  label="5">转腹膜透析</el-radio>
                             <el-radio  label="6">其他</el-radio>
                             <el-radio  label="7">变更透析医院</el-radio>
+                            <el-radio  label="8">住院</el-radio>
+                            <el-radio  label="9">转血透科</el-radio>
                       </el-radio-group>
                     </el-form-item>
                 </el-col>
             </el-row>
 
+            
+
             <el-row :gutter="24">
                 <el-col :span="24">
-                    <el-form-item label="转出原因:"> 
-                        <el-input style="width: 300px;height: 50px;"  type="textarea" v-model="lapse_reason"></el-input>
+                    <el-form-item label="原因:"> 
+                        <el-input style="width: 300px;height: 100px;"  type="textarea" v-model="lapse_reason"></el-input>
                     </el-form-item>
                 </el-col>
             </el-row>
 
             <el-row :gutter="24">
                 <el-col :span="24">
-                    <el-form-item label="转出日期:"> 
+                    <el-form-item label="日期:"> 
                         <el-date-picker
                             v-model="record_date"
                             type="date"
@@ -180,7 +225,7 @@
 
 
         <el-dialog
-            title="编辑"
+            title="编辑转归记录"
             :visible.sync="editDialogVisible"
             width="65%"
             center>
@@ -204,13 +249,42 @@
                 <el-col :span="24">
                     <el-form-item label="转归类型:"> 
                         <el-radio-group style="padding: 10px;" v-model="lapse_type">
-                            <el-radio  label="1">转出</el-radio>
-                            <el-radio  label="2">院内转诊</el-radio>
+                            <el-radio  label="2">转出</el-radio>
+                            <el-radio  label="3">死亡</el-radio>
+                            <el-radio  label="4">院内转诊</el-radio>
+                           
                       </el-radio-group>
                     </el-form-item>
                 </el-col>
             </el-row>
 
+            <el-row :gutter="24" v-if="lapse_type == 3">
+                <el-col :span="24">
+                    <el-form-item label="住院/门诊:"> 
+                      <el-radio-group style="padding: 10px;" v-model="his_type">
+                            <el-radio  label="1">门诊</el-radio>
+                            <el-radio  label="2">住院</el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+
+            <el-row :gutter="24" v-if="lapse_type == 3 && his_type==2">
+                <el-col :span="24">
+                    <el-form-item label="病区:"> 
+                       <el-input style="width: 200px" v-model="his_zone"></el-input> 
+                    </el-form-item>
+                </el-col>
+            </el-row>
+
+            <el-row :gutter="24" v-if="lapse_type == 3 && his_type==2">
+                <el-col :span="24">
+                    <el-form-item label="床号:"> 
+                        <el-input style="width: 200px" v-model="his_bed"></el-input> 
+                    </el-form-item>
+                </el-col>
+            </el-row>
+
             <el-row :gutter="24">
                 <el-col :span="24">
                     <el-form-item label="转归分类:"> 
@@ -222,22 +296,26 @@
                             <el-radio  label="5">转腹膜透析</el-radio>
                             <el-radio  label="6">其他</el-radio>
                             <el-radio  label="7">变更透析医院</el-radio>
+                            <el-radio  label="8">住院</el-radio>
+                            <el-radio  label="9">转血透科</el-radio>
                       </el-radio-group>
                     </el-form-item>
                 </el-col>
             </el-row>
 
+         
+
             <el-row :gutter="24">
                 <el-col :span="24">
-                    <el-form-item label="转出原因:"> 
-                        <el-input style="width: 300px;height: 50px;"  type="textarea" v-model="lapse_reason"></el-input>
+                    <el-form-item label="原因:"> 
+                        <el-input style="width: 300px;height: 100px;"  type="textarea" v-model="lapse_reason"></el-input>
                     </el-form-item>
                 </el-col>
             </el-row>
 
             <el-row :gutter="24">
                 <el-col :span="24">
-                    <el-form-item label="转出日期:"> 
+                    <el-form-item label="日期:"> 
                         <el-date-picker
                             v-model="record_date"
                             type="date"
@@ -392,7 +470,11 @@
           page:1,
           total:0,
           id:0,
-          admin_user_id:this.$store.getters.xt_user.user.id
+          admin_user_id:this.$store.getters.xt_user.user.id,
+          lapseto:0,
+          his_type:"1",
+          his_zone:"",
+          his_bed:"",
         }
       },
       methods: {
@@ -445,7 +527,13 @@
         getPatientById(id).then(response=>{
            if(response.data.state ==1){
              var patient = response.data.data.patients
-            
+             if(patient.lapseto == 1){
+               this.lapse_type="2"
+             }
+             if(patient.lapseto == 2){
+               this.lapse_type="1"
+             }
+             this.lapseto = patient.lapseto
              this.dialysis_no = patient.dialysis_no
              this.name = patient.name
              
@@ -460,7 +548,44 @@
           }
         })
       },
+      getLapseType(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 = "转血透科"
+        }
+
+        return name
+
+      },
       savePatientLapse(){
+          if(this.lapse_type!=1 && this.lapse_reason == ""){
+             this.$message.error("转出或者死亡原因不能为空!")
+             return false
+          }
           var params = {
             patient_id:this.patientID,
             lapse_type:parseInt(this.lapse_type),
@@ -469,6 +594,10 @@
             record_date:this.record_date,
             admin_user_id:this.admin_user_id,
             remark:this.remark,
+            lapse_type_name:this.getLapseType(this.lapse_type),
+            his_bed:this.his_bed,
+            his_type: parseInt(this.his_type),
+            his_zone:this.his_zone,
           }
           console.log("params=====",params)
         savePatientLapse(params).then(response=>{
@@ -509,6 +638,9 @@
              this.record_date = this.getTime(lapsorecord.record_date)
              this.remark = lapsorecord.remark
              this.admin_user_id = lapsorecord.admin_user_id
+             this.his_bed = lapsorecord.his_bed
+             this.his_zone = lapsorecord.his_zone
+             this.his_type = lapsorecord.his_type
              this.id = lapsorecord.id
              this.editDialogVisible = true
            
@@ -517,16 +649,25 @@
 
       },
       updatePatientLapse(){
+        if (this.lapse_type !=1 &&this.lapse_reason == ""){
+             this.$message.error("转出或者死亡原因不能为空!")
+             return false
+        }
         var params = {
             patient_id:this.patientID,
             lapse_type:parseInt(this.lapse_type),
             lapse_class:parseInt(this.lapse_class), 
+            lapse_type_name:this.getLapseType(this.lapse_type),
             lapse_reason:this.lapse_reason,
             record_date:this.record_date,
             admin_user_id:this.admin_user_id,
             remark:this.remark,
             id:this.id,
+            his_bed:this.his_bed,
+            his_type:parseInt(this.his_type),
+            his_zone:this.his_zone,
           }
+         
         updatePatientLapseRecord(params).then(response=>{
            if(response.data.state== 1){
              var record = response.data.data.record

src/xt_pages/user/patients.vue

@@ -466,6 +466,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="140">
           <template slot-scope="scope">
+           
             <el-tooltip
               class="item"
               effect="dark"
@@ -478,6 +479,7 @@
                 size="small"
                 @click="OpenSetLapseto(scope.row, scope.$index)"
               ></el-button>
+              
             </el-tooltip>
             <el-tooltip
               class="item"
@@ -1421,15 +1423,18 @@
         )
       },
       OpenSetLapseto(row, index) {
-        // if(row.lapseto == 1){
-        //   this.lapeseto = "转出"
-        // }
-        // if(row.lapseto == 2){
-        //   this.lapeseto = "留治"
-        // }
-        // if(row.lapeseto == 3){
-        //   this.lapeseto = "死亡"
-        // }
+        //  this.$router.push({path:"/patients/patient/"+row.id})
+        // this.$router.push({path:'/patient/patient/'+row.id+'/lapsoSummary'})
+       
+        if(row.lapseto == 1){
+          this.lapeseto = "转出"
+        }
+        if(row.lapseto == 2){
+          this.lapeseto = "留治"
+        }
+        if(row.lapeseto == 3){
+          this.lapeseto = "死亡"
+        }
         this.patient = row
         this.currentIndex = index
         this.lapsetoForm.lapseto_time = ''

src/xt_pages/workforce/remind_print.vue

@@ -33,6 +33,8 @@
                   <td width="50" v-if="printObj.mode == 1">透析模式</td>
                   <td width="100" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">透析器/灌流器</td>
                   <td width="100" v-if="printObj.anticoagulant==1">抗凝剂(商品名称)</td>
+                  <td width="30" v-if="printObj.anticoagulant_zongliang == 1">首剂</td>
+                  <td width="30" v-if="printObj.anticoagulant_zongliang == 1">维持</td>
                   <td width="30" v-if="printObj.anticoagulant_zongliang == 1">总量</td>
                   <td width="">血管通路</td>
                   <td width="300" v-if="printObj.doctor_advice == 1">长期医嘱</td>
@@ -79,6 +81,33 @@
                     (<span>{{main_collection.prescription.antioxidant_commodity_name}}</span>)
                   </span>
                 </td>
+                <td v-if="printObj.anticoagulant_zongliang == 1">
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_shouji?main_collection.dialysissolution.anticoagulant_shouji+'mg':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 2">{{main_collection.dialysissolution.anticoagulant_shouji?main_collection.dialysissolution.anticoagulant_shouji+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 3">{{main_collection.dialysissolution.anticoagulant_shouji?main_collection.dialysissolution.anticoagulant_shouji+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 4">{{main_collection.dialysissolution.anticoagulant_shouji?main_collection.dialysissolution.anticoagulant_shouji+'mg':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 5">{{main_collection.dialysissolution.anticoagulant_shouji?main_collection.dialysissolution.anticoagulant_shouji+'mg':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 6">{{main_collection.dialysissolution.anticoagulant_shouji?main_collection.dialysissolution.anticoagulant_shouji+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 7">{{main_collection.dialysissolution.anticoagulant_shouji?main_collection.dialysissolution.anticoagulant_shouji+'iu':''}}</span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 8">{{main_collection.dialysissolution.anticoagulant_shouji?main_collection.dialysissolution.anticoagulant_shouji+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 9">{{main_collection.dialysissolution.anticoagulant_shouji?main_collection.dialysissolution.anticoagulant_shouji+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 10">{{main_collection.dialysissolution.anticoagulant_shouji?main_collection.dialysissolution.anticoagulant_shouji+'iu':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 11">{{main_collection.dialysissolution.anticoagulant_shouji?main_collection.dialysissolution.anticoagulant_shouji+'iu':''}}</span>
+                </td>
+
+                <td v-if="printObj.anticoagulant_zongliang == 1">
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_weichi?main_collection.dialysissolution.anticoagulant_weichi+'mg/h':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 2">{{main_collection.dialysissolution.anticoagulant_weichi?main_collection.dialysissolution.anticoagulant_weichi+'iu/h':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 3">{{main_collection.dialysissolution.anticoagulant_weichi?main_collection.dialysissolution.anticoagulant_weichi+'iu/h':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 4">{{main_collection.dialysissolution.anticoagulant_weichi?main_collection.dialysissolution.anticoagulant_weichi+'mg/h':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 5">{{main_collection.dialysissolution.anticoagulant_weichi?main_collection.dialysissolution.anticoagulant_weichi+'mg/h':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 6">{{main_collection.dialysissolution.anticoagulant_weichi?main_collection.dialysissolution.anticoagulant_weichi+'iu/h':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 7">{{main_collection.dialysissolution.anticoagulant_weichi?main_collection.dialysissolution.anticoagulant_weichi+'iu/h':''}}</span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 8">{{main_collection.dialysissolution.anticoagulant_weichi?main_collection.dialysissolution.anticoagulant_weichi+'iu/h':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 9">{{main_collection.dialysissolution.anticoagulant_weichi?main_collection.dialysissolution.anticoagulant_weichi+'iu/h':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 10">{{main_collection.dialysissolution.anticoagulant_weichi?main_collection.dialysissolution.anticoagulant_weichi+'iu/h':''}}</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 11">{{main_collection.dialysissolution.anticoagulant_weichi?main_collection.dialysissolution.anticoagulant_weichi+'iu/h':''}}</span>
+                </td>
               
                 <td v-if="printObj.anticoagulant_zongliang == 1">
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-    store.dispatch('VerifyConfigList', []).then(() => {
-      next()
-    })
-  }
-  if (store.getters.permission_routers === undefined) {
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
-      next()
-    })
-  } else {
-    next()
-  }
-  return
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //   store.dispatch('VerifyConfigList', []).then(() => {
+  //     next()
+  //   })
+  // }
+  // if (store.getters.permission_routers === undefined) {
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //     next()
+  //   })
+  // } else {
+  //   next()
+  // }
+  // return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))