518合并代码

src/store/modules/globalConfig.js

@@ -841,6 +841,21 @@ const global_config = {
         zongliang_unit: 'mg',
         gaimingcheng_unit: '',
         gaijiliang_unit: ''
+      },
+      13: {
+        id: 13,
+        name: '那曲肝素钙',
+        type: 1,
+        shouji: 2,
+        weichi: 2,
+        zongliang: 2,
+        gaimingcheng: -1,
+        gaijiliang: -1,
+        shouji_unit: 'mg',
+        weichi_unit: 'mg/h',
+        zongliang_unit: 'mg',
+        gaimingcheng_unit: '',
+        gaijiliang_unit: ''
       }
     },
     anticoagulants_set: {

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

@@ -643,6 +643,7 @@
               <span v-if="scope.row.monitor_anticoagulant == 8">依诺肝素</span>
               <span v-if="scope.row.monitor_anticoagulant == 9">达肝素</span>
               <span v-if="scope.row.monitor_anticoagulant == 12">无抗凝剂</span>
+              <span v-if="scope.row.monitor_anticoagulant == 13">那曲肝素钙</span>
               <span v-if="scope.row.monitor_anticoagulant_value != ''"
                 >（{{
                   scope.row.monitor_anticoagulant_value

src/xt_pages/outpatientCharges/allListPrint.vue

@@ -13,8 +13,8 @@
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne  v-if="org_id != 10215 && org_id != 0" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printOne>
-      <summary-print v-if="org_id == 10215|| org_id == 0" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></summary-print>
+      <printOne  v-if="org_id != 10215 && org_id != 0 && org_id !=9671" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printOne>
+      <summary-print v-if="org_id == 10215|| org_id == 0 || org_id ==9671" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></summary-print>
 
 <!--      <list-print-two :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></list-print-two>-->
     </div>
@@ -150,6 +150,7 @@
                   total: obj.total,
                   is_total: 1,
                 })
+                console.log("23323223323232332323322332",obj.details)
                 this.list =  this.list.concat(obj.details)
               }
             }

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -43,7 +43,7 @@
       <div>
       </div>
     </div>
-    <el-table :data="tableList" border :row-style="{ color: '#303133' }" ref="table"
+    <el-table :data="list" border :row-style="{ color: '#303133' }" ref="table"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
               show-summary
               max-height="600"
@@ -53,31 +53,38 @@
            <template slot-scope="scope">{{scope.row.index}}</template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="处方日期">
-        <template slot-scope="scope"></template>
+        <template slot-scope="scope">
+          {{getTime(scope.row.record_date)}}
+        </template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="费用分类">
         <template slot-scope="scope">
-
+          {{ scope.row.med_chrgitm_type }}
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="项目名称">
         <template slot-scope="scope">
-           <span v-if="scope.row.advice_id > 0 ">{{getAdviceName(scope.row.advice_id)}}</span>
-           <span v-if="scope.row.project_id > 0 ">{{getProjectName(scope.row.project_id)}}</span>
+          <span>{{scope.row.name}}</span>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="规格型号">
-        <template slot-scope="scope"></template>
+        <template slot-scope="scope">
+          {{ scope.row.spec }}
+        </template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="数量">
-        <template slot-scope="scope"></template>
+        <template slot-scope="scope">
+          {{ scope.row.count }}{{ scope.row.unit }}
+        </template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="单价">
-        <template slot-scope="scope"></template>
+        <template slot-scope="scope">
+          {{scope.row.price}}
+        </template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="金额">
         <template slot-scope="scope">
-          <div></div>
+          {{ (scope.row.price * scope.row.count).toFixed(2) }}
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" label="医保类别">
@@ -92,6 +99,7 @@
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { getGatherDetailList } from '@/api/his/his_tools'
+import { uParseTime } from '@/utils/tools'
 const moment = require('moment')
 export default {
   components: {
@@ -124,8 +132,8 @@ export default {
         { id: 3, name: '耗材' },
         { id: 2, name: '项目' }
 
-      ]
-     
+      ],
+      list:[],
     }
   },
   methods: {
@@ -150,42 +158,106 @@ export default {
         keyword: this.keywords
       }
      getGatherDetailList(params).then(response=>{
-       if(response.data.state == 1){
-         var projectlist = response.data.data.projectlist
-         for(let i=0;i<projectlist.length;i++){
-          this.tableList.push(projectlist[i])
-         }
-         console.log("detailist232323322332",projectlist)
-         var advicelist = response.data.data.advicelist
-         for(let i=0;i<advicelist.length;i++){
-           this.tableList.push(advicelist[i])
-         }
-         for(let i=0;i<this.tableData.length;i++){
-           this.tableList[i].index = i +1
-         }
-         console.log("advicelist332233323232323232",this.tableList)
-      
-         var list = response.data.data.list
-         console.log("list233223232323",list)
-         for(let i=0;i<list.length;i++){
-            for(let j=0;j<list[i].orders.length;j++){
-              for(let z=0;z<list[i].orders[j].order_info.length;z++){
-                  list[i].orders[j].order_info[z].record_date = list[i].orders[j].settle_accounts_date
-                  list[i].orders[j].order_info[z].number = list[i].orders[j].number
-                  this.tableData.push(list[i].orders[j].order_info[z])
-               }
-            }
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.order = response.data.data.order
+            this.order['bedCostTotal'] = response.data.data.bedCostTotal
+            this.order['operationCostTotal'] = response.data.data.operationCostTotal
+            this.order['otherCostTotal'] = response.data.data.otherCostTotal
+            this.order['materialCostTotal'] = response.data.data.materialCostTotal
+            this.order['westernMedicineCostTotal'] = response.data.data.westernMedicineCostTotal
+            this.order['chineseTraditionalMedicineCostTotal'] = response.data.data.chineseTraditionalMedicineCostTotal
+            this.order['checkCostTotal'] = response.data.data.checkCostTotal
+            this.order['zhenChaCostTotal'] = response.data.data.zhenChaCostTotal
+            this.order['laboratoryCostTotal'] = response.data.data.laboratoryCostTotal
+            this.order['treatCostTotal'] = response.data.data.treatCostTotal
+            this.patient = response.data.data.patient
+            this.admin = response.data.data.admin_info
+            this.his_hospital = response.data.data.his_hospital
+            var order_info = response.data.data.order_info
+
+            if(this.$store.getters.xt_user.org_id == 10215 || this.$store.getters.xt_user.org_id == 0){
+              //获取所有项目类型进行去重
+              let med_chrgitm_types = []
+              for (let i = 0; i < order_info.length; i++) {
+                med_chrgitm_types.push(order_info[i].med_chrgitm_type)
+              }
+              const obj = {}
+              med_chrgitm_types = med_chrgitm_types.reduce((cur, next) => {
+                obj[next] ? '' : obj[next] = true && cur.push(next)
+                return cur
+              }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+
+              let tempOrderInfo = []
+
+              for (let i = 0; i < med_chrgitm_types.length; i++) {
+                let obj = {
+                  total: 0,
+                  details: [],
+                  is_total:0,
+                }
+                let tempDetails = []
+                for (let b = 0; b < order_info.length; b++) {
+                  if (med_chrgitm_types[i] == order_info[b].med_chrgitm_type) {
+                    tempDetails.push(order_info[b])
+                  }
+                }
+                obj.details = this.setNewData(tempDetails)
+               
+                this.list =  this.list.concat(obj.details)
+                for(let i=0;i<this.list.length;i++){
+                  this.list[i].index = i
+                }
+              }
+              let newobj = {}
+              newobj['total'] = this.order.medfee_sumamt
+              newobj['is_total'] = 1
+              
+              this.list.push(newobj)
+            }else{
+              console.log("hh2332322323232332232332",order_info)
+              //获取所有项目类型进行去重
+              let med_chrgitm_types = []
+              for (let i = 0; i < order_info.length; i++) {
+                med_chrgitm_types.push(order_info[i].med_chrgitm_type)
+              }
+              const obj = {}
+              med_chrgitm_types = med_chrgitm_types.reduce((cur, next) => {
+                obj[next] ? '' : obj[next] = true && cur.push(next)
+                return cur
+              }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+              let tempOrderInfo = []
+              for (let i = 0; i < med_chrgitm_types.length; i++) {
+                let obj = {
+                  total: 0,
+                  details: []
+                }
+                let tempDetails = []
+                for (let b = 0; b < order_info.length; b++) {
+                  if (med_chrgitm_types[i] == order_info[b].med_chrgitm_type) {
+                    tempDetails.push(order_info[b])
+                  }
+                }
+                console.log("tempdetail2323323232322332233223",tempDetails)
+                obj.details = this.setNewData(tempDetails)
+
+                obj.total = this.getTotal(obj.details)
+                obj.details.push({
+                  total: obj.total,
+                  is_total: 1,
+                })
+                console.log("obj3232232332323223",obj.details)
+                this.list =  this.list.concat(obj.details)
+                for(let i=0;i<this.list.length;i++){
+                  this.list[i].index = i+1
+                }
+                console.log("list32233223233332232323232323",this.list)
+             }
           }
-        for(let i=0;i<this.tableData.length;i++){
-          this.tableData[i].index = i+1
-          this.tableData[i].total_price = 0
-          this.tableData[i].total_price = (this.tableData[i].cnt * this.tableData[i].pric).toFixed(2)
         }
-        console.log("322323232323322323",this.tableData)
-       }
      })
-
-
     },
     getAdviceName(id){
       var drug_name = ""
@@ -204,7 +276,191 @@ export default {
        }
      }
      return project_name
-    }
+    },
+    setNewData(details) {
+      console.log("detail233223233223",details)
+        let drug_ids = []
+        let project_ids = []
+
+        for (let i = 0; i < details.length; i++) {
+          if (details[i].advice && details[i].advice.id > 0 && details[i].advice.prescription && details[i].advice.prescription.type == 1) { //药品
+            let obj = {
+              id: details[i].advice.drug_id,
+              price: details[i].advice.price,
+              record_date:details[i].advice.advice_date
+            }
+            drug_ids.push(obj)
+          } else if (details[i].project && details[i].project.id > 0 && details[i].project.prescription && details[i].project.prescription.type == 2) { //项目
+            let obj = {
+              id: details[i].project.project_id,
+              price: details[i].project.price,
+              record_date:details[i].advice.record_date
+            }
+            project_ids.push(obj)
+
+          }
+
+        }
+   
+        let new_drug_ids = this.unique(drug_ids)
+        let new_project_ids = this.unique(project_ids)
+        let list = []
+        if (new_drug_ids.length > 0 && new_project_ids.length == 0) {
+          for (let i = 0; i < new_drug_ids.length; i++) {
+            let obj = {}
+            let count = 0
+            for (let a = 0; a < details.length; a++) {
+              if (new_drug_ids[i].id == details[a].advice.drug_id && new_drug_ids[i].price == details[a].advice.price) {
+                obj['name'] = details[a].advice.advice_name
+                obj['spec'] =   details[a].advice.drug.dose +   details[a].advice.drug.dose_unit+"*" +  details[a].advice.drug.min_number +   details[a].advice.drug.min_unit+"/"+ details[a].advice.drug.max_unit
+                obj['unit'] = details[a].advice.drug.min_unit
+                obj['medicine_insurance_kind'] = this.getMedicineInsuranceType(details[a].chrgitm_lv)
+                obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
+                obj['price'] = parseFloat(details[a].pric)
+                obj['is_total'] = 2
+                obj['record_date'] = details[a].advice.record_date
+                count = count + details[a].cnt
+              }
+            }
+            obj['count'] = count
+            list.push(obj)
+          }
+        }
+
+        if (new_drug_ids.length == 0 && new_project_ids.length > 0) {
+          for (let i = 0; i < new_project_ids.length; i++) {
+            let obj = {}
+            let count = 0
+            for (let a = 0; a < details.length; a++) {
+              if (new_project_ids[i].id == details[a].project.project_id && new_project_ids[i].price == details[a].project.price) {
+               if( details[a].project.type == 2){
+                 obj['name'] = details[a].project.project.project_name
+                 obj['spec'] = ''
+                 obj['unit'] = details[a].project.project.unit
+
+
+               }else if(details[a].project.type == 3){
+                 obj['name'] = details[a].project.good_info.good_name
+                 obj['spec'] = ''
+                 obj['unit'] = details[a].project.good_info.packing_unit
+
+               }
+                obj['medicine_insurance_kind'] = this.getMedicineInsuranceType(details[a].chrgitm_lv)
+                obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
+                obj['price'] = parseFloat(details[a].pric)
+                obj['is_total'] = 2
+
+                count = count + details[a].cnt
+              }
+            }
+            obj['count'] = count
+            list.push(obj)
+          }
+        }
+        return list
+      }, 
+    
+      getMedicineInsuranceType(type) {
+        switch (type) {
+          case "01":
+            return '甲类'
+            break
+          case "02":
+            return '乙类'
+
+            break
+          case "03":
+            return '自费'
+            break
+
+        }
+
+      },
+       getType(med_chrgitm_type){
+        switch (med_chrgitm_type) {
+          case '01':
+            return '床位费'
+            break
+          case '02':
+            return '诊察费'
+
+            break
+          case '03':
+            return '检查费'
+
+            break
+          case '04':
+            return '化验费'
+            break
+          case '05':
+            return '治疗费'
+
+            break
+          case '06':
+            return '手术费'
+
+            break
+          case '07':
+            return '护理费'
+
+            break
+          case '08':
+            return '材料费'
+
+            break
+          case '09':
+            return '西药费'
+
+            break
+          case '10':
+            return '中药饮片费'
+
+            break
+          case '11':
+            return '中成药费'
+
+            break
+          case '12':
+            return '一般诊疗费'
+
+            break
+          case '13':
+            return '挂号费'
+
+            break
+          case '14':
+            return '其他费'
+
+            break
+
+        }
+      },
+      unique(array) {
+        // res用来存储结果
+        var res = []
+        for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
+          for (var j = 0, resLen = res.length; j < resLen; j++) {
+            if (array[i].id === res[j].id && array[i].price === res[j].price) {
+              break
+            }
+          }
+          // 如果array[i]是唯一的，那么执行完循环，j等于resLen
+          if (j === resLen) {
+            res.push(array[i])
+          }
+        }
+        return res
+      },
+      getTotal:function(items){
+        let total = 0
+        for(let i = 0; i < items.length; i++){
+          total = Number(total) + Number((parseFloat(items[i].count) * parseFloat(items[i].price)).toFixed(2))
+        }
+        return total.toFixed(2)
+      },
+      getTimes(time) {
+       return uParseTime(time, '{y}-{m}-{d}')
+     },
   },
   created() {
     this.getGatherDetailList()

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

@@ -160,7 +160,9 @@
         <el-table-column label="总价" align="center">
           <template slot-scope="scope">
            <span v-if="org_id == 9919">{{(scope.row.last_price * scope.row.count).toFixed(2)}} </span> 
-           <span v-else>
+           <span v-if="org_id == 10210 ">{{(scope.row.price * scope.row.count).toFixed(2)}} </span> 
+           <span v-if="org_id == 9671 ">{{(scope.row.price * scope.row.count).toFixed(2)}} </span> 
+           <span v-if ="org_id!=9919 && org_id!=10210 && org_id!=9671">
              <!-- <span v-if="scope.row.price >0">
                 <span v-if="scope.row.count_unit == scope.row.min_unit">
                   {{(scope.row.price * scope.row.count).toFixed(2)}}

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -248,8 +248,11 @@
           </el-table-column> -->
           <el-table-column label="总价" align="center">
             <template slot-scope="scope">
-              <span v-if="scope.row.price > 0">{{getAllPriceOne(scope.row.drug_id,scope.row.price,scope.row.price,scope.row.max_unit,scope.row.count_unit,scope.row.min_number,scope.row.is_sys).toFixed(2)}}</span>
-              <span v-if="scope.row.price == 0">{{getAllPriceOne(scope.row.drug_id,scope.row.retail_price,scope.row.min_price,scope.row.max_unit,scope.row.count_unit,scope.row.min_number,scope.row.is_sys).toFixed(2)}}</span>
+              <span v-if="org_id == 10210 || org_id == 9671">{{(scope.row.count * scope.row.price).toFixed(2)}}</span>
+               <span v-if="org_id != 10210 && org_id !=9671">
+                  <span v-if="scope.row.price > 0">{{getAllPriceOne(scope.row.drug_id,scope.row.price,scope.row.price,scope.row.max_unit,scope.row.count_unit,scope.row.min_number,scope.row.is_sys).toFixed(2)}}</span>
+                  <span v-if="scope.row.price == 0">{{getAllPriceOne(scope.row.drug_id,scope.row.retail_price,scope.row.min_price,scope.row.max_unit,scope.row.count_unit,scope.row.min_number,scope.row.is_sys).toFixed(2)}}</span>
+               </span>
             </template>
           </el-table-column>
           <el-table-column label="生产厂家" align="center">
@@ -420,6 +423,7 @@ export default {
   name: "salesReturnOrder",
   components: { BreadCrumb },
   created() {
+    this.org_id = this.$store.getters.xt_user.org.id
     var nowDate = new Date();
     var nowYear = nowDate.getFullYear();
     var nowMonth = nowDate.getMonth() + 1;
@@ -504,6 +508,7 @@ export default {
       houseList:[],
       storehouse_id:0,
       is_sys:0,
+      org_id:0,
     };
   },
   methods: {