518合并代码

src/api/dialysis_record.js

   })
 }
 
-export function finishDialysis(patient_id, schedule_date, end_time, nurse_id, mode) {
+export function finishDialysis(patient_id, schedule_date, end_time, nurse_id, mode, puncture_point_haematoma, internal_fistula, catheter, cruor) {
   var params = {
     patient_id: patient_id,
     date: schedule_date,
     nurse: nurse_id,
     end_time: end_time,
-    mode: mode
+    mode: mode,
+    puncture_point_haematoma: puncture_point_haematoma,
+    internal_fistula: internal_fistula,
+    catheter: catheter,
+    cruor: cruor
   }
   return request({
     url: '/api/dialysis/finish',

src/lang/zh.js

     completeOrder: '购买结果',
     orderRecord: '订单详情',
     recordList: '订单记录',
-    // stockManage: '耗材管理',
+    stockManage: '耗材管理',
     supplyManage: '采购管理',
     supplyList: '供应商管理',
     goodType: '商品类型',
     schedule_print: '排班打印',
 
     // 药房管理
-    PatientDispensing:'患者发药',
-    DrugDispensing:'药品发药',
-    DispensingDetails:'发药明细',
+    PatientDispensing: '患者发药',
+    DrugDispensing: '药品发药',
+    DispensingDetails: '发药明细',
     // ConsumablesManagement:'耗材管理',
-    MedicianManagement:'药品管理',
+    MedicianManagement: '药品管理',
 
     otherManagement: '其他管理',
     drugsExpiryDate: '药品有效期预警',

src/xt_pages/Pharmacy/DrugDispensing.vue

           <div class="list">
             <el-date-picker
               style="width: 300px"
-              v-model="datepick"
+              v-model="start_time"
               type="date"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
               placeholder="选择日期"
             >
             </el-date-picker>
           </div>
 
           <el-table
+            v-if="state == 1"
             :height="tableHeight"
             :data="tableData"
             border
             style="width: 100%"
+            highlight-current-row
+            ref="singleTable"
+            @current-change="handleCurrentChange"
           >
             <el-table-column prop="name" label="名称" width="100">
+               <template slot-scope="scope">
+                {{scope.row.drug_name}}
+              </template>
             </el-table-column>
             <el-table-column prop="specifications" label="规格" width="100">
+              <template slot-scope="scope">
+                {{scope.row.dose}}{{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
+              </template>
             </el-table-column>
             <el-table-column prop="stock" label="库存" width="100">
+               <template slot-scope="scope">
+                {{getWarehoseInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <el-table
+            v-if="state == 2"
+            :height="tableHeight"
+            :data="tableData"
+            border
+            style="width: 100%"
+            highlight-current-row
+            ref="singleTable"
+          >
+            <el-table-column prop="name" label="名称" width="100">
+               <template slot-scope="scope">
+                {{scope.row.drug_name}}
+              </template>
+            </el-table-column>
+            <el-table-column prop="specifications" label="规格" width="100">
+              <template slot-scope="scope">
+                {{scope.row.dose}}{{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
+              </template>
+            </el-table-column>
+            <el-table-column prop="stock" label="库存" width="100">
+               <template slot-scope="scope">
+                {{getWarehoseInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}
+              </template>
             </el-table-column>
           </el-table>
         </div>
             >
             <el-table-column type="selection" width="55"> </el-table-column>
             <el-table-column type="index" label="序号" width="120" align="center">
+              <template slot-scope="scope">
+                {{scope.$index + 1}}
+              </template>
             </el-table-column>
             <el-table-column prop="name" label="患者名称" width="180" align="center">
+                <template slot-scope="scope">
+                 {{getPatientName(scope.row.patient_id)}}
+              </template>
             </el-table-column>
             <el-table-column prop="name" label="单次用量" width="170" align="center">
+               <template  slot-scope="scope">
+                 {{scope.row.single_dose}}
+               </template>
             </el-table-column>
             <el-table-column prop="name" label="用法" width="160" align="center">
+               <template  slot-scope="scope">
+                 {{scope.row.delivery_way}}
+               </template>
             </el-table-column>
             <el-table-column prop="name" label="频率" width="160" align="center">
+                <template  slot-scope="scope">
+                 {{scope.row.execution_frequency}}
+               </template>
             </el-table-column>
             <el-table-column prop="name" label="天数" width="160" align="center">
+               <template  slot-scope="scope">
+                 {{scope.row.day}}
+               </template>
             </el-table-column>
             <el-table-column prop="name" label="总量" width="160" align="center">
+                <template  slot-scope="scope">
+                 {{scope.row.prescribing_number}}
+               </template>
             </el-table-column>
             <el-table-column prop="name" label="数据来源" width="162" align="center">
+                <template  slot-scope="scope">
+                 <span v-if="scope.row.type == 1">血透</span>
+                 <span v-if="scope.row.type == 2">HIS</span>
+               </template>
             </el-table-column>
           </el-table>
         </div>
 <script>
 import drugPrint from "./print/drugPrint.vue";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import { getTodayAdviceList,getPharmacyBaseDrug,updatePharmacyBaseDrug } from "@/api/his/advice";
+const moment = require('moment')
 export default {
   components: {
     BreadCrumb,
       tableData: [],
       tableData_list: [],
       multipleSelection: [],
+      start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+      patientList:[],
+      keywords:"",
     };
   },
 
   methods: {
+     searchAction() {
+      this.getlist();
+    },
     // 跳转打印页面
     toPrint() {
       // this.$router.push({ path: "/Pharmacy/print/patientPrint" });
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
+    getlist(){
+      var params = {
+        start_time:this.start_time,
+        keywords:this.keywords,
+      }  
+      getTodayAdviceList(params).then(response=>{
+         if(response.data.state == 1){
+           var list =  response.data.data.list
+           this.$refs.singleTable.setCurrentRow(list[0])
+           this.tableData = list
+         }
+      }) 
+    }, 
+   getWarehoseInfo(arr, max_unit, min_unit, min_number) {
+      var total = 0;
+      var max_str = "";
+      var min_str = "";
+      if (arr.length > 0) {
+        for (let i = 0; i < arr.length; i++) {
+          total += parseInt(arr[i].stock_max_number+ arr[i].stock_min_number);
+        }
+      }
+      if (total < min_number) {
+        min_str = total + min_unit;
+      }
+      if (total == 0) {
+        min_str = "";
+        max_str = "";
+      }
+      if (total >= min_number) {
+        if (parseInt(total / min_number) != 0) {
+          max_str = parseInt(total / min_number) + max_unit;
+        }
+        if (total % min_number != 0) {
+          min_str = (total % min_number) + min_unit;
+        }
+      }
+      return max_str + min_str;
+    },
+
+    handleCurrentChange(row) {
+      this.getPharmacyBaseDrug(row.id)
+    },
+    getPharmacyBaseDrug(drug_id){
+      var params = {
+        start_time:this.start_time,
+        drug_id:drug_id,
+      }
+      getPharmacyBaseDrug(params).then(response=>{
+        if(response.data.state == 1){
+           var advicelist = response.data.data.advicelist
+           for(let i=0;i<advicelist.length;i++){
+             advicelist[i].type = 1
+             advicelist[i].day = " "
+             this.tableData_list.push(advicelist[i])
+           }
+           var hisAdviceList = response.data.data.hisAdviceList
+           for(let i=0;i<hisAdviceList.length;i++){
+             hisAdviceList[i].type = 2
+             this.tableData_list.push(hisAdviceList[i])
+           }
+           var patient = response.data.data.patient
+           this.patientList = patient
+        }
+      })
+    },
+    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
+    },
+  },
+  created() {
+    this.getlist()
   },
-  created() {},
 };
 </script>
 

src/xt_pages/data/components/dialysisOff.vue

+<template>
+  <div class="">
+    <el-table
+      :row-style="{ color: '#303133' }"
+      :header-cell-style="{
+        backgroundColor: 'rgb(245, 247, 250)',
+        color: '#606266'
+      }"
+      :data="dialysis_off_data"
+      border
+      fit
+      highlight-current-row
+      style="width: 100%;min-height:500px;"
+    >
+      <el-table-column align="center" label="字段名">
+        <template slot-scope="scope">
+          <span>{{ scope.row.filed_name_cn }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="字段">
+        <template slot-scope="scope">
+          <span>{{ scope.row.filed_name }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" label="是否显示">
+        <template slot-scope="scope">
+          <span v-if="scope.row.is_show == 1">是</span>
+          <span v-if="scope.row.is_show == 2">否</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作" align="center">
+        <template slot-scope="scope">
+          <el-tooltip
+            class="item"
+            effect="dark"
+            content="不展示"
+            placement="top"
+            v-if="scope.row.is_show == 1"
+          >
+            <el-button
+              size="small"
+              type="danger"
+              icon="el-icon-remove-outline"
+              @click="handleHide(scope.$index, scope.row)"
+            >
+            </el-button>
+          </el-tooltip>
+
+          <el-tooltip
+            class="item"
+            effect="dark"
+            content="展示"
+            placement="top"
+            v-if="scope.row.is_show == 2"
+          >
+            <el-button
+              size="small"
+              type="primary"
+              icon="el-icon-view"
+              @click="handleShow(scope.$index, scope.row)"
+            >
+            </el-button>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { updateFieldIsShow } from "@/api/data";
+import store from "@/store";
+
+export default {
+  name: "dialysisAfter",
+
+  props: {
+    dialysis_off_data: {
+      type: Array
+    }
+  },
+  methods: {
+    handleHide: function(index, row) {
+      this.$confirm("是否将该字段设为不可见?", "提示", {
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
+        type: "warning"
+      })
+        .then(() => {
+          updateFieldIsShow(row.id, 2).then(response => {
+            if (response.data.state == 1) {
+              let params = {
+                id: response.data.data.id,
+                is_show: response.data.data.is_show
+              };
+              store.dispatch("updateFiledConfigList", params).then(() => {});
+              this.$emit("change", params);
+            }
+          });
+          this.$message({
+            type: "success",
+            message: "设置成功!"
+          });
+        })
+        .catch(() => {});
+    },
+    handleShow: function(index, row) {
+      this.$confirm("是否将该字段设为可见?", "提示", {
+        confirmButtonText: "确 定",
+        cancelButtonText: "取 消",
+        type: "warning"
+      }).then(() => {
+          updateFieldIsShow(row.id, 1).then(response => {
+            if (response.data.state == 1) {
+              let params = {
+                id: response.data.data.id,
+                is_show: response.data.data.is_show
+              };
+              store.dispatch("updateFiledConfigList", params).then(() => {});
+              this.$emit("change", params);
+            }
+          });
+          this.$message({
+            type: "success",
+            message: "设置成功!"
+          });
+        })
+        .catch(() => {});
+    }
+  },
+ 
+};
+</script>
+
+<style scoped></style>
+<style>
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+</style>

src/xt_pages/data/showConfig.vue

               @change="changeAfterData"
             ></dialysis-after>
           </el-tab-pane>
+          <el-tab-pane label="透析下机">
+            <dialysis-off
+              :dialysis_off_data="dialysis_off_data"
+              @change="changeDialysisOffData"
+            ></dialysis-off>
+          </el-tab-pane>
           <el-tab-pane label="透析小结">
             <dialysis-summary
               :dialysis_summary_data="dialysis_summary_data"
 import ReceiveTreatmentAsses from "./components/receiveTreatmentAsses";
 import DialysisSummary from "./components/dialysisSummary";
 import doubleCheck from "./components/doubleCheck.vue"
+import dialysisOff from "./components/dialysisOff.vue"
 import { getFiledConfigList } from "@/utils/data_config"; // getConfigList from sessionStorage
 import store from "@/store";
 import DialysisComputer from './components/dialysisComputer'
     DialysisAfter,
     BreadCrumb,
     DialysisSummary,
-    doubleCheck
+    doubleCheck,
+    dialysisOff
   },
   data() {
     return {
       dialysis_summary_data: [],
       dialysis_computer_data:[],
       double_check_date:[],
+      dialysis_off_data:[],
     };
   },
   methods: {
           this.double_check_date[i].is_show = object.is_show;
         }
       }
+    },
+    changeDialysisOffData:function(object){
+
+     for (let i = 0; i < this.dialysis_off_data.length; i++) {
+        if (this.dialysis_off_data[i].id == object.id) {
+          this.dialysis_off_data[i].is_show = object.is_show;
+        }
+      }
     }
 
   },
   created() {
     var filedList = store.getters.xt_user.fileds;
-   
+    
   
     for (let i = 0; i < filedList.length; i++) {
       switch (filedList[i].module) {
         case 8:
           this.double_check_date.push(filedList[i]);
           break;
+        case 9:
+        this.dialysis_off_data.push(filedList[i]);
+        break;
       }
     }
    

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

         </el-select>
       </el-form-item>
 
-      <el-form-item label="第二核对人员工号:" v-if="isShowFiled('第二核对人员工号')" label-width="140px">
+      <el-form-item label="第二核对人员工号:" isShowFiled label-width="140px">
         <el-input style="width:200px" v-model="doubleReview.employee_number"></el-input>
       </el-form-item>
 

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

       <!-- <div class="txsj">
       </div> -->
       <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
-      <el-form :model="form" label-width="80px">
+      <el-form :model="form" label-width="100px">
         <el-form-item label="下机护士">
           <el-select v-model="form.nurse_id" :disabled="!(dialysis_order.id != 0)">
             <el-option v-for="(admin, index) in admins" :key="index" :value="admin.id" :label="admin.name"></el-option>
           ></el-date-picker>
         </el-form-item>
 
+        <el-form-item label="穿刺处血肿:" v-if="isShowFiled('穿刺处血肿')" :label-width="150">
+           <el-radio-group v-model="form.puncture_point_haematoma">
+              <el-radio :label="1">有</el-radio>
+              <el-radio :label="2">无</el-radio>
+           </el-radio-group>
+        </el-form-item>
+        
+        <el-form-item label="内瘘: " v-if="isShowFiled('内瘘')">
+            <el-input v-model="form.internal_fistula" readonly  @focus="showInnerDialog('7')" style="width:200px"></el-input>
+        </el-form-item>
+
+    
+        <el-form-item label="导管: " v-if="isShowFiled('导管')">
+          <el-input v-model="form.catheter" @focus="showInnerDialog('4')" style="width:200px"></el-input>
+        </el-form-item>
+
+        <el-form-item label="透析器凝血: ">
+          <el-input
+            style="width:200px"
+            v-model="form.cruor"
+            readonly
+            @focus="showInnerDialog('1')"
+          ></el-input>
+       </el-form-item> 
+
         <el-form-item>
           <el-button v-if="(dialysis_order.id != 0 && dialysis_order.stage == 1)" @click="submit" :loading="loading"
                      type="primary">执行下机
           </el-button>
-          <!--<el-button v-else-if="(dialysis_order.id != 0 && dialysis_order.stage == 2)" :disabled="true" type="info">-->
-            <!--已下机-->
-          <!--</el-button>-->
-          <!--<el-button v-else :disabled="true" type="info">未上机</el-button>-->
           <el-button
             v-if="dialysis_order.stage == 2 "
             type="primary" @click="modifyFinish">修改下机
           </el-button>
-
-
         </el-form-item>
+        
+
 
       </el-form>
     </el-dialog>
+
+    <multi-select-box
+      :propsForm="InnerDialogProps"
+      v-on:dialog-comfirm="innerDialogComfirm"
+      v-on:dialog-cancle="innerDialogCancle"
+    ></multi-select-box>
+
   </div>
 </template>
 
   import axios from 'axios'
   import { finishDialysis,PostModifyFinishDialysis } from '@/api/dialysis_record'
   import { parseTime } from '@/utils'
-
+  import multiSelectBox from './MultiSelectBox'
   import request from '@/utils/request'
-
+  import store from "@/store";
+  import { getDataConfig } from '@/utils/data'
   export default {
+    components: {
+      multiSelectBox
+    },
     name: 'FinishDialog',
     data() {
       return {
         schedule_date: 0,
         isPremission:false,
         end_time: '',
-
+        isVisibility: false,
         form: {
-          nurse_id: 0
-        }
+          nurse_id: 0,
+          puncture_point_haematoma:2,
+          internal_fistula:"",
+          catheter:"",
+          cruor:"",
+        },
+        internal_fistula: [],
+        InnerDialogProps: {
+          values: [],
+          visibility: false,
+          isShowTextArea: true,
+          customContent: '',
+          titles: '',
+          type: '' // 不同弹框类型，用来匹配数据
+        },
+        catheter: [],
+        cruorOptions: [],
       }
     },
     props: {
       }
     },
     created() {
-
+      this.internal_fistula = getDataConfig('hemodialysis', 'internal_fistula')
+      this.catheter = getDataConfig('hemodialysis', 'catheter')
+      this.cruorOptions = getDataConfig('hemodialysis', 'cruor')
     },
     watch: {
       'dialysis_order.id': function() {
         } else if (this.dialysis_order.stage == 1) {
           this.form.nurse_id = this.$store.getters.xt_user.user.id
         } else {
+          console.log("orde32332323232332",this.dialysis_order)
           this.form.nurse_id = this.dialysis_order.finish_nurse
+          this.form.catheter = this.dialysis_order.catheter
+          this.form.cruor = this.dialysis_order.cruor
+          this.form.internal_fistula = this.dialysis_order.blood_access_internal_fistula
+          this.form.puncture_point_haematoma = this.dialysis_order.puncture_point_haematoma
         }
       },
       patient:{
       }
     },
     methods: {
+       isShowFiled(name) {
+        var filedList = store.getters.xt_user.fileds
+       
+        for (let i = 0; i < filedList.length; i++) {
+          if (filedList[i].module == 9 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
+            return true
+          }
+        }
+        return false
+      },
       show: function(record) {
         this.record = record
         console.log("下机",record)
       },
       hide: function() {
         this.visible = false
-      },modifyFinish:function(){
+      },
+      modifyFinish:function(){
         let ParamsQuery = {};
         ParamsQuery["id"] = this.dialysis_order.id;
         ParamsQuery["nurse"] = this.form.nurse_id;
         ParamsQuery["end_time"] = this.end_time;
         ParamsQuery["mode"] = "2"
+        ParamsQuery["puncture_point_haematoma"] = this.form.puncture_point_haematoma
+        ParamsQuery["internal_fistula"] = this.form.internal_fistula
+        ParamsQuery["catheter"] = this.form.catheter
+        ParamsQuery["cruor"] = this.form.cruor
         if(this.dialysis_order.finish_creator  != this.$store.getters.xt_user.user.id){
           ParamsQuery["mode"] = "3"
         }
       submit: function() {
         this.loading = true
         let mode = "1"
-        finishDialysis(this.patient_id,this.schedule_date ? parseTime(this.schedule_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}'), this.end_time, this.form.nurse_id,mode).then(rs => {
+        finishDialysis(this.patient_id,this.schedule_date ? parseTime(this.schedule_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}'), this.end_time, this.form.nurse_id,mode,this.form.puncture_point_haematoma,this.form.internal_fistula,this.form.catheter,this.form.cruor).then(rs => {
           this.loading = false
           var resp = rs.data
           if (resp.state == 1) {
               this.$set(this_order, key, dialysis_order[key])
             }
             let orgId = parseInt(sessionStorage.getItem("org_id"));
-            // axios.get('/api/index/downpatient?org_id='+ orgId + '&admin_user_id='+ this.form.nurse_id + '&patient_id=' + this.patient_id).then((res) => {
-            //   console.log('res',res.data)
-
-            // }) 
             this.hide()
             this.$emit('assessmentAfterDislysis', resp.data.assessmentAfterDislysis)
 
           module:6
         }
       }).then(res => {
-        console.log(res)
-        console.log("下机",this.record)
-        // console.log("上机",this.record)
         if(res.data.state == 0){
           this.hasPermission = false
         }else if(res.data.state == 1){
           }
         }
       })
-    }
+    },
+    showInnerDialog: function(val) {
+        this.InnerDialogProps.visibility = true
+        switch (val) {
+          case '7': // 内瘘
+            this.InnerDialogProps.values = this.internal_fistula
+            this.InnerDialogProps.titles = '内瘘'
+            this.InnerDialogProps.type = 'internal_fistula'
+            this.InnerDialogProps.selected = this.form.internal_fistula
+            this.InnerDialogProps.isShowTextArea = false
+            break
+           case '4': // 导管
+            this.InnerDialogProps.values = this.catheter
+            this.InnerDialogProps.titles = '导管'
+            this.InnerDialogProps.type = 'catheter'
+            this.InnerDialogProps.selected = this.form.catheter
+            this.InnerDialogProps.isShowTextArea = false
+            break
+            case '1':
+            this.InnerDialogProps.values = this.cruorOptions
+            this.InnerDialogProps.titles = '凝血'
+            this.InnerDialogProps.type = 'cruor'
+            this.InnerDialogProps.selected = this.form.cruor
+            this.InnerDialogProps.isShowTextArea = false
+            break
+          
+        }
+      },
+      innerDialogComfirm: function(val) {
+        this.InnerDialogProps.visibility = false
+        switch (val.type) {
+          case 'internal_fistula':
+            this.form.internal_fistula = val.value.join(',')
+            break
+          case 'catheter':
+            this.form.catheter = val.value.join(',')
+            break
+          case 'cruor':
+          this.form.cruor = val.value.join(',')
+          break
+        }
+      },
+      innerDialogCancle: function() {
+        this.InnerDialogProps.visibility = false
+      }, 
     }
   }
 </script>

src/xt_pages/outpatientTool/components/detailStatistics.vue

     <div style="display: flex; justify-content: space-around; margin-top: 25px">
       <div>总费用:{{ getAllPice() }}</div>
       <div>
-        个人支付: <span v-if="his_patient.balance_accounts_type == 2"></span>
-        {{ getAllPice() }}
-        <span v-if="his_patient.balance_accounts_type != 2"></span>
-        {{ getActPay() }}
+        个人支付: 
+        <span v-if="his_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>  
+        <span v-if="his_patient.balance_accounts_type != 2">{{ getActPay() }}</span>
+      
       </div>
       <div>基金支付记账:{{ getFundPaySumamt() }}</div>
       <div>补充医疗支付记账:{{ getHifesPay() }}</div>
       id: 0,
       start_time: "",
       end_time: "",
+      org_id:0,
     };
   },
   methods: {
     },
   },
   created() {
+    this.org_id = this.$store.getters.xt_user.org.id;
+    console.log("org_id233232323232",this.org_id)
     this.start_time = this.chargeDate[0];
     this.end_time = this.chargeDate[1];
     this.getHisSummaryDetailList();