518合并代码

src/api/dialysis.js

@@ -291,3 +291,11 @@ export function GetDialysisGoodStatistics(params) {
 
   })
 }
+
+export function changeRole(params) {
+  return request({
+    url: '/api/get/getrolelist',
+    method: 'get',
+    params: params
+  })
+}

src/api/his/advice.js

@@ -23,3 +23,27 @@ export function updatePharmacyBaseDrug(params) {
     params: params
   })
 }
+
+export function SaveSetting(params) {
+  return request({
+    url: '/api/advice/savesetting',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getPharmacyConfig(params) {
+  return request({
+    url: '/api/advice/getpharmacyconfig',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getUserdDrugList(params) {
+  return request({
+    url: '/api/advice/getpharmacybasedruglist',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -79,6 +79,7 @@
             border
             style="width: 100%"
             highlight-current-row
+            @current-change="handleSelectionChangeOne"
             ref="singleTable"
           >
             <el-table-column prop="name" label="名称" width="100">
@@ -101,11 +102,9 @@
       </div>
       <div class="mainRight">
         <div class="titlelist">
-          <el-button type="primary" @click="dispense" v-if="state == 1"
-            >发药</el-button
-          >
+          <el-button type="primary" @click="dispense" v-if="state == 1">发药</el-button>
           <el-button type="primary" @click="toPrint">打印</el-button>
-          <el-button type="primary" v-if="state == 1">设置</el-button>
+          <el-button type="primary" @click="toSetting">设置</el-button>
         </div>
         <el-divider></el-divider>
         <div>
@@ -115,6 +114,60 @@
             border
             style="width: 1328px"
             @selection-change="handleSelectionChange"
+             v-if="state == 1"
+          >
+            >
+            <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>
+
+
+            <el-table
+            :height="tableHeight"
+            :data="tableList"
+            border
+            style="width: 1328px"
+            v-if="state == 2"
           >
             >
             <el-table-column type="selection" width="55"> </el-table-column>
@@ -160,9 +213,38 @@
                </template>
             </el-table-column>
           </el-table>
+
+
+        </div>
+        <div style="margin-top">领料人：
+          <el-select v-model="admin_user_id" placeholder="请选择">
+            <el-option
+              v-for="item in doctorList"
+              :key="item.admin_user_id"
+              :label="item.user_name"
+              :value="item.admin_user_id">
+            </el-option>
+           </el-select>
         </div>
-        <div style="margin-top">诊断时间：2022-05-07 19:22:16</div>
       </div>
+
+      <el-dialog
+        title="设置"
+        :visible.sync="dialogVisible"
+        width="30%">
+        <span>请选择药品是否要通过药房管理出库</span>
+        <span>
+          <el-radio v-model="is_open" label="1">是</el-radio>
+          <el-radio v-model="is_open" label="2">否</el-radio>
+        </span>
+        <span>
+          若选择为是，则通过药房发药的药品都会在发药之后进行出库，否则按原来的方式进行出库管理
+        </span>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="SaveSetting">确 定</el-button>
+        </span>
+      </el-dialog>
     </div>
 
     <drug-print
@@ -178,7 +260,7 @@
 <script>
 import drugPrint from "./print/drugPrint.vue";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import { getTodayAdviceList,getPharmacyBaseDrug,updatePharmacyBaseDrug } from "@/api/his/advice";
+import { getTodayAdviceList,getPharmacyBaseDrug,updatePharmacyBaseDrug,SaveSetting,getPharmacyConfig,getUserdDrugList } from "@/api/his/advice";
 const moment = require('moment')
 export default {
   components: {
@@ -198,10 +280,17 @@ export default {
       alreadmount: 0,
       tableData: [],
       tableData_list: [],
+      tableList:[],
       multipleSelection: [],
       start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
       patientList:[],
       keywords:"",
+      dialogVisible:false,
+      is_open:"2",
+      isVisibility:"",
+      propsTable:"",
+      doctorList:[],
+      admin_user_id:this.$store.getters.xt_user.user.id,
     };
   },
 
@@ -217,17 +306,49 @@ export default {
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
-
+    handleSelectionChangeOne(val){
+      this.tableList = []
+      this.getUserlist(val.id)
+    },
     // 药品发药
     dispense() {
-      var params = {};
+      var blood_ids = []
+      var his_ids = []
+      var bloodStr = ""
+      var hisStr = ""
+      for(let i=0;i<this.tableData.length;i++){
+        if(this.tableData[i].type == 1){
+          blood_ids.push(this.tableData[i].id)
+        }
+        if(this.tableData[i].type == 2){
+          his_ids.push(this.tableData[i].id)
+        }
+      }
+      bloodStr = blood_ids.join(",")
+      hisStr =  his_ids.join(",")
+      var params = {
+        bloodStr:bloodStr,
+        hisStr:hisStr,
+        admin_user_id:this.admin_user_id,
+      }
       this.$confirm("确定是否对该药品进行发药?", "患者发药", {
         confirmButtonText: "确 定",
         cancelButtonText: "取 消",
         type: "warning",
-      })
-        .then(() => {})
-        .catch(() => {});
+      }).then(() => {
+        updatePharmacyBaseDrug(params).then(response=>{
+           if(response.data.state == 1){
+           var msg = response.data.data.msg
+           var medical =  response.data.data.medical
+           if(msg === 1){
+             this.$message.success("发药成功!")
+           }
+           if(msg == 2 || msg ===3){
+             this.$message.error("库存不足")
+           }
+         }
+        })
+      }).catch(() => {});
     },
 
     // 药品退药
@@ -255,6 +376,8 @@ export default {
            var list =  response.data.data.list
            this.$refs.singleTable.setCurrentRow(list[0])
            this.tableData = list
+           var doctorlist = response.data.data.doctorlist
+           this.doctorList = doctorlist
          }
       }) 
     }, 
@@ -320,6 +443,50 @@ export default {
        }
        return name
     },
+    toSetting(){
+      getPharmacyConfig().then(response=>{
+        if(response.data.state == 1){
+           this.dialogVisible = true
+           var config = response.data.data.config
+           this.is_open = config.is_open.toString()
+        }
+      })
+    },
+    SaveSetting(){
+      var params = {
+        is_open:parseInt(this.is_open),
+      }
+     SaveSetting(params).then(response=>{
+       if(response.data.state == 1){
+         var config = response.data.data.config
+         this.$message.success("保存成功!")
+         this.dialogVisible = false
+       }
+     })
+    },
+    getUserlist(drug_id){
+       var params = {
+        start_time:this.start_time,
+        drug_id:drug_id,
+      }
+      getUserdDrugList(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.tableList.push(advicelist[i])
+           }
+           var hisAdviceList = response.data.data.hisAdviceList
+           for(let i=0;i<hisAdviceList.length;i++){
+             hisAdviceList[i].type = 2
+             this.tableList.push(hisAdviceList[i])
+           }
+           var patient = response.data.data.patient
+           this.patientList = patient
+        }
+      })
+    }
   },
   created() {
     this.getlist()

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

@@ -1636,10 +1636,15 @@
           this.$message.error('你没有执行医嘱的权限')
           return false
         }
+
+        console.log("王哈",this.currentRow)
+        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id ==10340 ){
+           if(this.currentRow.checker == 0){
+              this.$message.error("请先核对医嘱")
+              return
+           }
+        }
         this.execTimeDialogVisible = true
-        // if (this.currentAdvices.length <= 0) {
-        //   return;
-        //  }
         if (this.current_select_object == 1) {
           var isExecution = true
           var adviceArr = this.advice_groups[this.current_group_index].advices
@@ -2085,6 +2090,7 @@
         }
       },
       cellMouseEnter: function(row, column, event) {
+        console.log("row323323322323233232",row)
         this.currentRow = row
         this.groupSelectRow = row
         // this.sameRowArr.forEach((arr, i) => {

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

@@ -162,8 +162,21 @@
       if (this.form.puncture_nurse_id == 0) {
         this.form.puncture_nurse_id = this.$store.getters.xt_user.user.id
       }
+     
+      if(this.form.change_nurse == 0){
 
-
+         this.form.change_nurse = this.$store.getters.xt_user.user.id
+      }
+      
+      if(this.form.washpipe_nurse == 0){
+        this.form.washpipe_nurse =  this.$store.getters.xt_user.user.id
+      }
+      if(this.form.difficult_puncture_nurse == 0){
+        this.form.difficult_puncture_nurse =  this.$store.getters.xt_user.user.id
+      }
+      if(this.form.new_fistula_nurse == 0){
+        this.form.new_fistula_nurse = this.$store.getters.xt_user.user.id
+      }
     },
     watch: {
       patient:{
@@ -182,6 +195,7 @@
         this.form.change_nurse = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.change_nurse
         this.form.difficult_puncture_nurse = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id:this.dialysis_order.difficult_puncture_nurse
         this.form.new_fistula_nurse = this.dialysis_order.id ==0?this.$store.getters.xt_user.user.id:this.dialysis_order.new_fistula_nurse
+
         var nowDate = new Date()
         var nowYear = nowDate.getFullYear()
         var nowMonth = nowDate.getMonth() + 1

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

@@ -128,7 +128,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="第二核对人员工号:" isShowFiled label-width="140px">
+      <el-form-item label="第二核对人员工号:" isShowFiled label-width="150px">
         <el-input style="width:200px" v-model="doubleReview.employee_number"></el-input>
       </el-form-item>
 
@@ -151,7 +151,7 @@
 </template>
 
 <script>
-  import { postDoubleCheck } from '@/api/dialysis'
+  import { postDoubleCheck,changeRole } from '@/api/dialysis'
   import { uParseTime } from '@/utils/tools'
   import { parseTime } from '@/utils'
   import { getDataConfig } from '@/utils/data'
@@ -209,6 +209,8 @@
         dialysate_flow:"透析液流量:",
         blood_access_part_opera_id:"通路类型:",
         displace_liqui_value:"置换液总量:",
+        job_number:"",
+        org_id:0,
       }
     }, 
     methods: {
@@ -262,8 +264,7 @@
           //   this.check_time = (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
           // }
           this.first_check_time = (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
-          console.log( this.first_check_time )
-          console.log( this.check_time )
+          
 
         }
       },
@@ -307,15 +308,16 @@
         if(this.check_time){
           ParamsQuery['check_time'] = this.record_date + ' ' + this.check_time
         }
-        // ParamsQuery['check_time'] = this.record_date + ' ' + this.check_time
+        
         if(this.first_check_time){
           ParamsQuery['first_check_time'] = this.record_date + ' ' + this.first_check_time
         }
         
         ParamsQuery['creater'] = this.doubleReview.creater
         ParamsQuery['modifier'] = this.doubleReview.modifier
-
-
+            
+    
+       
         postDoubleCheck(ParamsQuery).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -341,7 +343,6 @@
            
 
             let doublecheck_resp = response.data.data.doubleCheck
-            console.log("处方233232323232232332",this.prescription)
             var doubleCheck = this.double_check
             for (var index in doublecheck_resp) {        
               this.$set(doubleCheck, index, doublecheck_resp[index])
@@ -550,7 +551,6 @@
          
          var arr = []
          var str = val.join(';')
-         console.log("strw222222222",str)
         if(str.indexOf('透析器/灌流器')!=-1 && this.prescription!=null){
             arr.push("透析器/灌流器:"+(this.prescription.dialyzer_perfusion_apparatus?this.prescription.dialyzer_perfusion_apparatus:""))
         }
@@ -586,7 +586,7 @@
         if(str.indexOf('钙')!=-1 && this.prescription==null ){
           arr.push("钙:")
         }
-        console.log("arr",arr)
+    
         this.doubleReview.dialysis_item_desc = arr.join(";")
         if(val.length > 0){
           this.doubleReview.dialysis_item_check = 2
@@ -684,7 +684,6 @@
         if(str.indexOf("置换液总量")!=-1 && this.prescription == null){
            arr.push("置换液总量:")
         }
-        console.log("arr",arr)
         this.doubleReview.dialysis_parameter_desc = arr.join(";")
         if(val.length>0){
           this.doubleReview.dialysis_parameter_check = 2
@@ -719,7 +718,6 @@
           if(str.indexOf('滑脱')!=-1){
              arr.push("滑脱:")
           }
-        console.log("arr",arr)
         this.doubleReview.vascular_access_desc = arr.join(";")
         if(val.length>0){
           this.doubleReview.vascular_access_verification = 2
@@ -790,7 +788,6 @@
 
       GetDialysateFormulationById(val) {
          this.dialysate_formulation_options = getDataConfig('hemodialysis','dialysate_formulation')
-         console.log("透析液配方",this.dialysate_formulation_options)
         
         let name = ''
         let dfl = this.dialysate_formulation_options.length
@@ -932,7 +929,6 @@
      getDisplace(id){
        var name = ""
        var arr = this.$store.getters.displace_liqui
-       console.log("arr233233233223",arr)
        for(let i=0;i<arr.length;i++){
         if(id == arr[i].id){
           name = arr[i].name
@@ -940,6 +936,17 @@
        }
        return name
      },
+     changeRole(admin_user_id){
+        var params = {
+          admin_user_id:admin_user_id,
+        }
+       changeRole(params).then(response=>{
+         if(response.data.state == 1){
+           var role = response.data.data.adminRole
+           this.job_number = role.job_number
+         }
+       })
+     }
     },
 
     props: {
@@ -1084,7 +1091,7 @@
           if(this.prescription.displace_liqui_value!=""){
             this.displace_liqui_value = "置换液总量:"
             this.displace_liqui_value = this.displace_liqui_value + this.prescription.displace_liqui_value
-            console.log("置换液总量",this.displace_liqui_value)
+          
           }
         
         }
@@ -1194,7 +1201,7 @@
            if(this.double_check.pipeline_connection_desc.indexOf("管路打折")!=-1){
              this.checkListThree.push("管路打折")
            }
-           console.log("hhh",this.checkListOne)
+      
         }
       }, 
       'double_check.id': function() {
@@ -1268,7 +1275,8 @@
      
       var date = this.$route.query && this.$route.query.date
       this.record_date = date ? uParseTime(date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}')
-
+      this.org_id = this.$store.getters.xt_user.org.id
+     
       var nowDate = new Date()
       var nowYear = nowDate.getFullYear()
       var nowMonth = nowDate.getMonth() + 1

src/xt_pages/role/components/AdminInfoForm.vue

@@ -74,6 +74,11 @@
         <el-input v-model="form.doctor_number"></el-input>
        </el-form-item>
     </el-col>
+    <el-col :span="8">
+       <el-form-item label="工号:">
+           <el-input v-model="form.job_number" style="width:180px;"></el-input>
+       </el-form-item>
+    </el-col>
    </el-row>
   
   <div v-show="show">
@@ -203,11 +208,7 @@
         
        </el-form-item>
     </el-col>
-     <el-col :span="8">
-       <el-form-item label="工号:">
-           <el-input v-model="form.job_number" style="width:180px;"></el-input>
-       </el-form-item>
-    </el-col>
+   
     <el-col :span="8">
        <el-form-item label="处方资格标志:">
            <el-select v-model="form.prescription_qualification_identification" placeholder="处方资格标志" style="width:180px;">

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

@@ -699,11 +699,9 @@ export default {
          end_time:this.end_time,
          order_type:2,
       }  
-     
      getDrugOutOrderPrint(params).then(response=>{
         if(response.data.state == 1){
             var list = response.data.data.list
-          
             let objInfo = {}
             if(this.org_id == 9919){
               list.forEach((item,index)=>{
@@ -726,9 +724,9 @@ export default {
                   min_price:item.XtBaseDrug.min_price,
                 }
               }
-            })
+             })
             }else{
-               list.forEach((item,index)=>{
+             list.forEach((item,index)=>{
               let { drug_id } = item
               if(!objInfo[drug_id]){
                 objInfo[drug_id] = {

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -13,8 +13,8 @@
 
           <div style="float: left;margin-bottom: 1px;">单据编号：{{it.warehouse_out_order_number}}</div>
           <div style="float: right;margin-bottom: 1px;">{{getDateTwo()}}</div>
-
-          <table class="print-table" border="1">
+         
+           <table class="print-table" border="1" v-if = "org_id == 10210">
             <tbody>
             <tr>
               <td style="line-height: 50px" width="230">药品名称</td>
@@ -58,6 +58,50 @@
              </tr>
             </tbody>
           </table>
+          <table class="print-table" border="1" v-if = "org_id !=10210">
+            <tbody>
+            <tr>
+              <td style="line-height: 50px" width="230">药品名称</td>
+              <td style="line-height: 50px" width="230">规格型号</td>
+              <td style="line-height: 50px" width="80">出货数量</td>
+              <td style="line-height: 50px" width="50">单位</td>
+              <td style="line-height:50px" width="80">出库价格</td>
+              <td style="line-height: 50px" width="80">总价</td>
+              <td style="line-height: 50px" width="80">批号</td>
+              <td style="line-height: 50px" width="80">生产日期</td>
+              <td style="line-height: 50px" width="80">有效日期</td>
+            </tr>
+
+            <tr v-for="(item,i) in tableData" :key="i">
+              <td style="line-height: 50px">
+                <span>{{item.drug.drug_name}}</span>
+              </td>
+              <td style="line-height: 50px">
+                <span>{{item.drug.dose}}{{item.drug.dose_unit}}*{{item.drug.min_number}}{{item.drug.min_unit}}/{{item.drug.max_unit}}</span>
+              </td>
+              <td style="line-height: 50px">
+                  {{item.count}}
+              </td>
+              <td style="line-height: 50px">
+                <span>{{item.count_unit}}</span>
+              </td>
+              <td style="line-height:50px">
+                  {{item.price}}
+              </td>
+             <td  style="line-height:50px">
+                {{(item.count * item.price).toFixed(2)}}
+             </td>
+             <td>{{item.batch_number}}</td>
+             <td>{{(getTime(item.product_date))}}</td>
+             <td>{{(getTime(item.expire_date))}}</td>
+            </tr>
+             <tr>
+               <td style="line-height:50px">合计</td>
+               <td colspan="7"></td>
+               <td>{{getTotalPrice()}} </td>
+             </tr>
+            </tbody>
+          </table>
 
 
           <div v-if="orgId != 10024" style="display:flex;margin-top:1px;float:right;">
@@ -133,7 +177,9 @@
         manufactureList:[],
         tableList:[],
         loading:false,
-        warehouseList:[]
+        warehouseList:[],
+        orgId:0,
+        tableData:[],
       }
     },
     methods: {
@@ -315,9 +361,7 @@
         getDrugOutOrderDetailPrint(params).then(response=>{
           if(response.data.state ==1){
              var info = response.data.data.info
-             console.log("info",info)
             var warehousing = response.data.data.warehousing
-            console.log("ware2232",warehousing)
             this.warehouseList = warehousing
           
             for(let i=0;i<info.length;i++){
@@ -330,11 +374,14 @@
             }
             
             var manufacturerList = response.data.data.manufacturerList
-            console.log("manufacturelist",manufacturerList)
             this.manufactureList = manufacturerList
-            console.log("列表",info)
             this.tableList = info
+
+            var drug_warhouse_out = response.data.data.drug_warhouse_out
+            this.tableData = drug_warhouse_out
             this.loading = false
+
+           
           }
         })
       },
@@ -346,6 +393,15 @@
           }
         }
         return count
+      },
+      getTotalPrice(){
+         var count = 0
+        for(let i=0;i<this.tableList.length;i++){
+          if(id == this.tableList[i].warehouse_out_id){
+             count +=this.tableList[i].count * this.tableList[i].price
+          }
+        }
+        return count.toFixed(2)
       }
     },
     created() {

src/xt_pages/stock/inventory.vue

@@ -320,6 +320,7 @@ export default {
               this.total = total
               this.doctorList =  response.data.data.doctorlist
               this.houseList = response.data.data.houseList
+              console.log("仓库行吗32323232232332",this.houseList)
               var houseConfig = response.data.data.houseConfig
               this.storehouse_id = houseConfig.storehouse_out_info
               }

src/xt_pages/stock/stockPrint.vue

@@ -60,7 +60,7 @@
                                    </td>
                                   
                                    <td v-if="end_time == ''">
-                                     <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779 || org_id == 10290 || org_id == 10265">
+                                     <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779 || org_id == 10290 || org_id == 10265 || org_id == 10210">
                                         {{getOverFlushInfo(item.xt_warehouse_info)}}
                                      </span>
                                      <span v-else>