1111

src/xt_pages/outpatientCharges/costComparison.vue

@@ -166,7 +166,7 @@
           <el-button type="primary" @click="confirm">确 定</el-button>
         </div>
       </el-dialog>
-     
+
     </div>
 
 
@@ -252,14 +252,17 @@ export default {
           label: '其他'
         }, {
           value: '9903',
-          label: '异地'
+          label: '异地(9903)'
+        },{
+          value: '9901',
+          label: '异地(9901)'
         }
       ],
       insutypes: [
         {
           value: '310',
           label: '职工基本医疗保险'
-        }, 
+        },
         // {
         //   value: '320',
         //   label: '公务员医疗补助'
@@ -273,7 +276,7 @@ export default {
         {
           value: '390',
           label: '城乡居民基本医疗保险'
-        }, 
+        },
         // {
         //   value: '392',
         //   label: '城乡居民大病医疗保险'
@@ -722,7 +725,7 @@ export default {
             const table_list = response.data.data.result
             let tableData = [
               ['序号', '医疗区划', '证件号码', '姓名','性别', '职业','医疗类别', '入院时间', '出院时间', '结算时间',
-              '出院诊断','住院天数', '医疗费总额','统筹支付金额','起付线', '职工大额基金支付', '居民大病基金支出', 
+              '出院诊断','住院天数', '医疗费总额','统筹支付金额','起付线', '职工大额基金支付', '居民大病基金支出',
               '企业补充','公务员补助', '医疗救助','其他支付','医院负担', '个账支付', '共济支付','基金支付金额','现金支付']//导出表头
             ]
             table_list.forEach((item,index) =>{
@@ -827,7 +830,7 @@ export default {
           ins:this.query_insutype,
         }
         summary2(params).then(response =>{
-          
+
           console.log('summary2',response);
           if(response.data.state==1){
             const table=response.data.data.result
@@ -851,6 +854,9 @@ export default {
             const Enter=0
             const Major=0
             const Other2=0
+            const zhenca=0
+
+            var obj2 = {}
             for(let i in table){
               let obj={
                 '序号': i + 1,
@@ -864,6 +870,7 @@ export default {
                 '手术':0,
                 '化验':table[i].LaboratoryFee,
                 '材料':table[i].HealthMaterialsFee,
+                '诊查':zhenca + table[i].ConsultationFee,
                 '其它':table[i].OtherFee,
                 '医疗费总额':table[i].TotalMedicalFee,
                 '个人自付金额':table[i].SelfPay,
@@ -877,7 +884,7 @@ export default {
                 '重大疾病补充':table[i].MajorDiseaseSupplement,
                 '其它支付':table[i].OtherPayment,
               }
-              var obj2={
+              obj2={
                 '序号': '合计',
                 "医疗保险号":'',
                 '姓名':'',
@@ -889,6 +896,8 @@ export default {
                 '手术':0,
                 '化验':Labor + table[i].LaboratoryFee,
                 '材料':Heal + table[i].HealthMaterialsFee,
+                '诊查':zhenca + table[i].ConsultationFee,
+
                 '其它':Other + table[i].OtherFee,
                 '医疗费总额':Total + table[i].TotalMedicalFee,
                 '个人自付金额':Self + table[i].SelfPay,
@@ -908,9 +917,9 @@ export default {
           }
           import('@/vendor/Export2Excel').then(excel => {
             const multiHeader =[['序号','医疗保险号','姓名','医疗费项目','','','','','','','','','医疗费总额','个人自付金额','基本账户支付','共济账户支付','公务员补助','统筹支付金额','医疗救助','大病支付','企业补充支付','重大疾病补充','其它支付']]
-            const tHeader = ['','','','床位','西药','中药','检查','治疗','手术','化验',	'材料',	'其它','','','','','','','','','','','']
-            const filterVal = ['序号','医疗保险号','姓名', '床位','西药','中药','检查','治疗','手术','化验',	'材料',	'其它','医疗费总额','个人自付金额','基本账户支付','共济账户支付','公务员补助','统筹支付金额','医疗救助','大病支付','企业补充支付','重大疾病补充','其它支付']
-            const merges = ['A1:A2', 'B1:B2', 'C1:C2', 'D1:L1', 'M1:M2', 'N1:N2', 'O1:O2', 'P1:P2', 'Q1:Q2', 'R1:R2', 'S1:S2', 'T1:T2', 'U1:U2', 'V1:V2', 'W1:W2']
+            const tHeader = ['','','','床位','西药','中药','检查','治疗','手术','化验',	'材料','诊查',	'其它','','','','','','','','','','','']
+            const filterVal = ['序号','医疗保险号','姓名', '床位','西药','中药','检查','治疗','手术','化验',	'材料','诊查',	'其它','医疗费总额','个人自付金额','基本账户支付','共济账户支付','公务员补助','统筹支付金额','医疗救助','大病支付','企业补充支付','重大疾病补充','其它支付']
+            const merges = ['A1:A2', 'B1:B2', 'C1:C2', 'D1:L1', 'M1:M2', 'N1:N2', 'O1:O2', 'P1:P2', 'Q1:Q2', 'R1:R2', 'S1:S2', 'T1:T2', 'U1:U2', 'V1:V2', 'W1:W2','X1:X2']
 
             const data = this.formatJson(filterVal, list)
             excel.export_json_to_excel({
@@ -939,7 +948,7 @@ export default {
           }
         }
       }
-      
+
     },
   },
   created() {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -3865,27 +3865,7 @@ export default {
 
     comfirm() {
 
-      if (this.curDrugs.length > 0) {
-        for (let i = 0; i < this.curDrugs.length; i++) {
-          if (this.org_id != 10206 && this.org_id != 0) {
-            if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
-              this.$message.error('该处方属于特病类型处方，开非特病类型的药')
-              return
-            }
-          }
-
-        }
-      }
       if (this.teamList.length > 0) {
-        if (this.org_id != 10206 && this.org_id != 0) {
-          for (let i = 0; i < this.teamList.length; i++) {
-            if (this.curPrescriptions.med_type == 14 && this.teamList[i].is_special_diseases != 1) {
-              this.$message.error('该处方属于特病类型处方，请开特病类型的项目')
-              // return
-            }
-
-          }
-        }
 
         let arr = this.teamList
         let newArr = []
@@ -3900,16 +3880,6 @@ export default {
         this.teamList = newArr
       }
 
-      if (this.curDrugs.length == 0) {
-        for (let i = 0; i < this.curDrugs.length; i++) {
-          if (this.org_id != 10206 && this.org_id != 0) {
-            if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
-              this.$message.error('该处方属于特病类型处方，开非特病类型的药')
-              return
-            }
-          }
-        }
-      }
 
 
       if (this.curStatus == 1 && this.rightTab == 2) {

src/xt_pages/outpatientTool/components/detail.vue

@@ -92,7 +92,7 @@
               <template slot-scope="scope">{{scope.row.count}}</template>
           </el-table-column>
           <el-table-column align="center" prop="name" label="单价">
-              <template slot-scope="scope">{{scope.row.price.toFixed(2)}}</template>
+              <template slot-scope="scope">{{scope.row.price}}</template>
           </el-table-column>
           <el-table-column align="center" prop="name" label="费用">
               <template slot-scope="scope">
@@ -447,8 +447,6 @@ export default {
             }
             tempPatients.push(obj)
           }
-          console.log(tempPatients)
-          //
           for (let i = 0; i < tempPatients.length; i++) {
             let obj = {
               patient_id: tempPatients[i].patient_id,
@@ -456,25 +454,21 @@ export default {
               order_info: []
             }
             let orders = tempPatients[i].orders
-
             for (let c = 0; c < orders.length; c++) {
                 let newObj = {}
                 newObj['count'] = orders[c].cnt
                 newObj['price'] = orders[c].pric
-                newObj['item_total'] = orders[c].det_item_fee_sumamt
+                newObj['item_total'] = parseFloat(orders[c].det_item_fee_sumamt).toFixed(2)
 
                 if (orders[c].advice_id > 0 && orders[c].project_id == 0) {
                   newObj['type'] = 1
                   newObj['item_name'] = orders[c].item_name
                   newObj['item_id'] = orders[c].item_id
-
                   if (orders[c].min_unit != orders[c].dose_unit) {
                     newObj['item_spec'] =  orders[c].dose + orders[c].dose_unit + '*' + orders[c].min_number + orders[c].min_unit + '/' + orders[c].max_unit
                   } else {
-
                     newObj['item_spec'] = ''
                   }
-
                 }
                 if (orders[c].advice_id == 0 && orders[c].project_id > 0) {
                   newObj['type'] = 2
@@ -497,7 +491,7 @@ export default {
               }
             tempPatientsTwo.push(obj)
           }
-          console.log(tempPatientsTwo)
+
 
           //
           for (let d = 0; d < tempPatientsTwo.length; d++) {
@@ -517,9 +511,12 @@ export default {
             for (let i = 0; i < project.length; i++) {
               let obj = {}
               let count = 0
+              let det_item_fee_sumamt = 0
               for (let a = 0; a < tempPatientsTwo[d].order_info.length; a++) {
                 if (project[i].item_id == tempPatientsTwo[d].order_info[a].item_id && project[i].price == tempPatientsTwo[d].order_info[a].price) {
                   count = count + tempPatientsTwo[d].order_info[a].count
+                  det_item_fee_sumamt = det_item_fee_sumamt + parseFloat(tempPatientsTwo[d].order_info[a].item_total)
+                  // det_item_fee_sumamt = det_item_fee_sumamt +
                 }
               }
 
@@ -529,21 +526,26 @@ export default {
               obj['type'] = project[i].type
               obj['item_name'] = project[i].item_name
               obj['item_spec'] = project[i].item_spec
-              obj['item_total'] = project[i].item_total
-
+              obj['item_total'] = det_item_fee_sumamt
               obj['item_id'] = project[i].item_id
               obj['name'] = tempPatientsTwo[d].name
               obj['patient_id'] = tempPatientsTwo[d].patient_id
               obj['count'] = count
+
+
               tempPatientsTwo[d].new_order_info.push(obj)
             }
 
             for (let i = 0; i < advice.length; i++) {
               let obj = {}
               let count = 0
+              let det_item_fee_sumamt = 0
+
               for (let a = 0; a < tempPatientsTwo[d].order_info.length; a++) {
                 if (advice[i].item_id == tempPatientsTwo[d].order_info[a].item_id && advice[i].price == tempPatientsTwo[d].order_info[a].price) {
                   count = count + tempPatientsTwo[d].order_info[a].count
+                  det_item_fee_sumamt = det_item_fee_sumamt + parseFloat(tempPatientsTwo[d].order_info[a].item_total)
+
                 }
               }
 
@@ -553,42 +555,35 @@ export default {
               obj['item_spec'] = advice[i].item_spec
               obj['item_id'] = advice[i].item_id
               obj['name'] = tempPatientsTwo[d].name
-              obj['item_total'] = advice[i].item_total
+              obj['item_total'] = det_item_fee_sumamt
               obj['patient_id'] = tempPatientsTwo[d].patient_id
               obj['count'] = count
               tempPatientsTwo[d].new_order_info.push(obj)
             }
 
           }
-          for (let i = 0; i < tempPatientsTwo.length; i++) {
-            let total = 0
-            for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
-              let new_name = tempPatientsTwo[i].new_order_info[b].item_name
-              if (new_name != undefined){
-                if (new_name.length != 0) {
-                  console.log(parseFloat(tempPatientsTwo[i].new_order_info[b].count) * parseFloat(tempPatientsTwo[i].new_order_info[b].price))
-                  total = parseFloat(total) + parseFloat((parseFloat(tempPatientsTwo[i].new_order_info[b].count) * parseFloat(tempPatientsTwo[i].new_order_info[b].price)).toFixed(2))
-                }
-
-
+          console.log("tempPatientsTwo")
+          console.log(tempPatientsTwo)
+          console.log("tempPatientsTwo")
 
-              }
 
 
+          for (let i = 0; i < tempPatientsTwo.length; i++) {
+            let total = 0
+            for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
+                  total = total + parseFloat(tempPatientsTwo[i].new_order_info[b].item_total)
             }
             tempPatientsTwo[i]['total'] = total
           }
           for (let i = 0; i < tempPatientsTwo.length; i++) {
             // console.log(111,tempPatientsTwo[i].total)
             if (tempPatientsTwo[i].new_order_info.length > 0) {
-
               for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
                 // let new_name = tempPatientsTwo[i].new_order_info[b].item_name
                 // console.log('2 ' + new_name)
                 //
                 // new_name = new_name.replace('（ ', '')
                 // new_name = new_name.replace(' ）', '')
-
                   let obj = {
                     name: tempPatientsTwo[i].name,
                     patient_id: tempPatientsTwo[i].patient_id,
@@ -599,18 +594,12 @@ export default {
                     count: tempPatientsTwo[i].new_order_info[b].count,
                     item_spec: tempPatientsTwo[i].new_order_info[b].item_spec
                   }
-
-
                   // if(b == 0){
                   obj['total'] = tempPatientsTwo[i].total
                   // }else{
                   //   obj['total'] = 0
                   // }
                   this.tableData.push(obj)
-
-
-
-
               }
             }
           }
@@ -828,7 +817,9 @@ export default {
           // sums[index] = sums[index].toFixed(2)
           let num = 0
           data.map(item => {
-            num += item.price * item.count
+            console.log(item)
+
+            num += item.total
           })
           sums[index] = num.toFixed(2)
         } else {

src/xt_pages/outpatientTool/components/gather.vue

@@ -250,6 +250,8 @@ export default {
 
                 newObj['count'] = orders[c].cnt
                 newObj['price'] = orders[c].pric
+                newObj['det_item_fee_sumamt'] = orders[c].det_item_fee_sumamt
+
                 if (orders[c].advice_id > 0 && orders[c].project_id == 0) {
                   newObj['type'] = 1
                   newObj['item_name'] = orders[c].item_name
@@ -289,7 +291,7 @@ export default {
               let price = 0
               for(let f = 0; f < tempPatientsTwo[d].order_info.length; f++){
                 if (tempPatientsTwo[d].order_info[f].cost_classify == infos[e].cost_classify){
-                  price = parseFloat(price.toString()) + parseFloat((parseFloat(tempPatientsTwo[d].order_info[f].count.toString()) * parseFloat(tempPatientsTwo[d].order_info[f].price.toString()).toFixed(2)).toString())
+                  price = parseFloat(price.toString()) + parseFloat((parseFloat(tempPatientsTwo[d].order_info[f].det_item_fee_sumamt.toString())).toString())
                 }
               }
               let obj = {
@@ -305,9 +307,7 @@ export default {
             tempPatientsThree.push(new_obj)
           }
 
-          console.log("tempPatientsThree")
 
-          console.log(tempPatientsThree)
 
           for(let i = 0; i < tempPatientsThree.length;i++){
             let sum = 0