Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/outpatientCharges/costComparison.vue

@@ -212,7 +212,8 @@
     getDoctorList,
     getExportConsumeDetailList,
     getHisOrderList,
-    getList
+    getList,
+    getInitData
   } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
   import { fetchAllAdminUsers } from '@/api/doctor'
@@ -230,6 +231,7 @@
           { path: false, name: '医保费用对照' }
         ],
         tableData: [],
+        diagnoses:[],
         limit: 10,
         page: 1,
         dialogFormVisible: false,
@@ -582,7 +584,7 @@
                 '个人编号': this.fromData[i].psn_no,
                 '门诊号': this.fromData[i].mdtrt_id,
                 '挂号日期': this.getTimes(this.fromData[i].settle_accounts_date),
-                '挂号科室': this.getTimes(this.fromData[i].settle_accounts_date),
+                '挂号科室': "",
                 '门诊费用': this.fromData[i].medfee_sumamt,
                 '自费': this.fromData[i].psn_cash_pay,
                 '起付线I': this.fromData[i].act_pay_dedc,
@@ -591,11 +593,15 @@
                 '统筹基金': this.fromData[i].fund_pay_sumamt,
                 '公务员补助': this.fromData[i].cvlserv_pay,
                 '单位补充保险': this.fromData[i].hifes_pay,
+                '煤矿补充保险': "0.00",
+                "超封顶线费用": "0.00",
                 '大额医疗保险应付': this.fromData[i].hifob_pay,
-                '大额合计': this.fromData[i].hifob_pay,
-                '诊断':"",
-                "血透次数":1,
-                "置留管数量":1,
+                '透析补助': "0.00",
+                '大额合计':  "0.00",
+                '实账支付额': "0.00",
+                '诊断': this.GetDiagnosisName(this.fromData[i].diagnosis_id),
+                "血透次数":this.fromData[i].DialysisCount,
+                "置留管数量":0,
                 "备注":"",
 
               }
@@ -609,8 +615,11 @@
             }
 
             import('@/vendor/Export2Excel').then(excel => {
-              const tHeader = ['结算金额', '姓名', '身份证', '个人编号', '门诊流水号', '挂号日期', '起付线', '统筹基金', '个人支付', '个账支付', '现金支付', '总费用', '冲销标志']
-              const filterVal = ['结算金额', '姓名', '身份证', '个人编号', '门诊流水号', '挂号日期', '起付线', '统筹基金', '个人支付', '个账支付', '现金支付', '总费用', '冲销标志']
+              const tHeader = ['序号', '姓名', '单位名称','个人编号', '门诊号', '挂号日期','挂号科室','门诊费用','自费', '起付线I','按比例自付II','小计I+II','统筹基金','公务员补助','单位补充保险','煤矿补充保险','超封顶线费用','大额医疗保险应付', '透析补助', '大额合计', '实账支付额', '诊断', '血透次数', '置留管数量','备注']
+              const filterVal = ['序号', '姓名', '单位名称','个人编号', '门诊号', '挂号日期','挂号科室','门诊费用','自费', '起付线I','按比例自付II','小计I+II','统筹基金','公务员补助','单位补充保险','煤矿补充保险','超封顶线费用','大额医疗保险应付', '透析补助', '大额合计', '实账支付额', '诊断', '血透次数', '置留管数量','备注']
+              // const filterVal = [ '姓名', '身份证', '个人编号', '门诊流水号', '挂号日期', '起付线', '统筹基金', '个人支付', '个账支付', '现金支付', '总费用', '冲销标志']
+              const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
+
               const data = this.formatJson(filterVal, list)
               excel.export_json_to_excel({
                 header: tHeader,
@@ -623,11 +632,33 @@
 
       }, formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]))
-      }
+      },GetDiagnosisName(id){
+        for(let i = 0;i < this.diagnoses.length; i++){
+          if(this.diagnoses[i].id == id){
+            return this.diagnoses[i].class_name
+          }
+        }
+        return ""
+
+      },  getInitData() {
+        getInitData().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.diagnoses = response.data.data.diagnose
+
+
+          }
+        })
+
+      },
+
     },
     created() {
       this.getList()
       this.fetchAllAdminUsers()
+      this.getInitData()
 
     }
   }

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -139,7 +139,8 @@
                         </el-button>
 
 
-                        <el-button v-if="this.radio == 2   && this.order.order_status == 2" size="small" @click="open(9)" type="primary"
+                        <el-button v-if="this.radio == 2   && this.order.order_status == 2" size="small"
+                                   @click="open(9)" type="primary"
                         >结算单
                         </el-button>
 
@@ -271,9 +272,9 @@
 
                                         <div class="costBox">
                                             <span>当前处方总费用：<span style="color:red;">{{items.total}}元</span></span>
-                                            <span>总费用：<span style="color:red;">{{ items.prescriptions[0].order.medfee_sumamt? items.prescriptions[0].order.medfee_sumamt:''}}元</span></span>
-                                            <span>基金支付：<span style="color:red;">{{ items.prescriptions[0].order.fund_pay_sumamt?items.prescriptions[0].order.fund_pay_sumamt:''}}元</span></span>
-                                            <span>个人支付：<span style="color:red;">{{ items.prescriptions[0].order.psn_cash_pay?items.prescriptions[0].order.psn_cash_pay:''}}元</span></span>
+                                            <span>总费用：<span style="color:red;">{{ items.curPrescriptions.order.medfee_sumamt ?  items.curPrescriptions.order.medfee_sumamt:getTotalFour(items.prescriptions)?getTotalFour(items.prescriptions):'' }}元</span></span>
+                                            <span>基金支付：<span style="color:red;">{{ items.curPrescriptions.order.fund_pay_sumamt?items.curPrescriptions.order.fund_pay_sumamt:''}}元</span></span>
+                                            <span>个人支付：<span style="color:red;">{{ items.curPrescriptions.order.psn_cash_pay?items.curPrescriptions.order.psn_cash_pay:''}}元</span></span>
 
                                             <span v-if="items.curPrescriptions.order_status  == 1">待结算</span>
                                             <span v-if="items.curPrescriptions.order_status  == 2">已结算</span>
@@ -284,8 +285,8 @@
 
                                 </div>
                                 <div class="centerRight">
-                                    <p class="centerRightTitle" style="padding-top: 10px;">就诊信息</p>
-                                    <div>
+                                    <p class="centerRightTitle" style="padding-top: 10px;" v-if="org_id != 9504 || org_id != 10028 || org_id != 10138">就诊信息</p>
+                                    <div v-if="org_id != 9504 || org_id != 10028 || org_id != 10138">
                                         <el-form :model="form" :rules="rules" ref="formValue" label-width="100px">
 
                                             <!--<el-form-item label="处方类型：" prop="p_type" :validate-event="is_Name">-->
@@ -356,7 +357,7 @@
                                     <ul class="basicUl">
                                         <li style="width:50%;">医生：{{ info.doctor }}</li>
                                         <li style="width:50%;">科室：{{ info.departments }}</li>
-                                        <li style="width:100%;">总费用：{{ getTotal() }}</li>
+                                        <!--<li style="width:100%;">总费用：{{ getTotal() }}</li>-->
 
                                         <li style="width:100%;">判断结果：{{info.diagnosis}}</li>
                                         <li style="width:100%;">是否有传染病：</li>
@@ -515,10 +516,23 @@
 
                                 </div>
                                 <div class="centerRight">
-                                    <p class="centerRightTitle" style="padding-top: 10px;">就诊信息</p>
-                                    <div>
+                                    <p class="centerRightTitle" style="padding-top: 10px;" v-if="org_id != 0 || org_id != 9504 || org_id != 10028 || org_id != 10138">就诊信息</p>
+                                    <div v-if="org_id != 0 || org_id != 9504 || org_id != 10028 || org_id != 10138">
                                         <el-form :model="form" :rules="rules" ref="formValue" label-width="100px">
 
+                                            <!--<el-form-item label="处方类型：" prop="p_type" :validate-event="is_Name">-->
+                                            <!--<el-select style="margin-right:5px;width:100px;" v-model="form.p_type"-->
+                                            <!--placeholder=""-->
+                                            <!--&gt;-->
+                                            <!--<el-option-->
+                                            <!--v-for="(item,index) in register"-->
+                                            <!--:key="index"-->
+                                            <!--:label="item.label"-->
+                                            <!--:value="item.value">-->
+                                            <!--</el-option>-->
+                                            <!--</el-select>-->
+                                            <!--</el-form-item>-->
+
                                             <el-form-item label="大病类别：" prop="sick_type" :validate-event="is_Name">
                                                 <el-select style="margin-right:5px;width:100px;"
                                                            v-model="form.sick_type" placeholder="">
@@ -1150,7 +1164,6 @@
       },
       confirm(forms) {
 
-
         forms['record_time'] = this.record_date
         forms['admin_user_id'] = this.$store.getters.xt_user.user.id
         forms['org_id'] = this.$store.getters.xt_user.org_id
@@ -1649,19 +1662,19 @@
 
                 if (response.data.data.list[i].his_patient.length > 1) {
                   for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
-                    if(response.data.data.list[i].his_patient[b].orders.length  == 0){
+                    if (response.data.data.list[i].his_patient[b].orders.length == 0) {
                       let obj = {
                         id: response.data.data.list[i].id,
                         name: response.data.data.list[i].name,
                         number: response.data.data.list[i].his_patient[b].number,
                         order_status: 1,
                         his_patient_id: response.data.data.list[i].his_patient[b].id,
-                        order_number: "",
+                        order_number: '',
                         order_id: 0,
                         prescription: response.data.data.list[i].prescription
                       }
                       this.all_table_data.push(obj)
-                    }else{
+                    } else {
 
                       for (let c = 0; c < response.data.data.list[i].his_patient[b].orders.length; c++) {
                         let obj = {
@@ -1678,7 +1691,6 @@
                         this.all_table_data.push(obj)
                       }
 
-
                     }
 
                   }
@@ -1696,35 +1708,30 @@
               for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
                 if (this.all_table_data[i].order_status != 2) {
                   isHasUnCharge = true
-                }else {
-                  if(this.all_table_data[i].his_patient_id > 0){
-                    if(this.all_table_data[i].his_patient_id == this.all_table_data[i].prescription[0].his_patient_id){
+                } else {
+                  if (this.all_table_data[i].his_patient_id > 0) {
+                    if (this.all_table_data[i].his_patient_id == this.all_table_data[i].prescription[0].his_patient_id) {
                       isHasUnCharge = true
                     }
                   }
 
                 }
               }
-              if(this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2){
+              if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2) {
                 isHasUnCharge = true
 
               }
 
-
-
               if (isHasUnCharge) {
                 unChargePatient.push(this.all_table_data[i])
               }
 
             }
 
-
-
             unChargePatient = this.unique_four(unChargePatient)
 
             one_count = one_count + unChargePatient.length
 
-
             let ChargePatient = []
             for (let i = 0; i < this.all_table_data.length; i++) {
               if (this.all_table_data[i].order_status == 2) {
@@ -1748,9 +1755,9 @@
                   for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
                     if (this.all_table_data[i].order_status != 2) {
                       isHasUnCharge = true
-                    }else {
-                      if(this.all_table_data[i].his_patient_id > 0){
-                        if(this.all_table_data[i].his_patient_id == this.all_table_data[i].prescription[0].his_patient_id){
+                    } else {
+                      if (this.all_table_data[i].his_patient_id > 0) {
+                        if (this.all_table_data[i].his_patient_id == this.all_table_data[i].prescription[0].his_patient_id) {
                           isHasUnCharge = true
                         }
                       }
@@ -1758,7 +1765,7 @@
                     }
 
                   }
-                  if(this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2){
+                  if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2) {
                     isHasUnCharge = true
 
                   }
@@ -1784,7 +1791,6 @@
                 break
             }
 
-
             this.cal_one = one_count
             this.cal_two = two_count
             this.cal_three = three_count
@@ -1874,19 +1880,19 @@
 
                 if (response.data.data.list[i].his_patient.length > 1) {
                   for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
-                    if(response.data.data.list[i].his_patient[b].orders.length  == 0){
+                    if (response.data.data.list[i].his_patient[b].orders.length == 0) {
                       let obj = {
                         id: response.data.data.list[i].id,
                         name: response.data.data.list[i].name,
                         number: response.data.data.list[i].his_patient[b].number,
                         order_status: 1,
                         his_patient_id: response.data.data.list[i].his_patient[b].id,
-                        order_number: "",
+                        order_number: '',
                         order_id: 0,
                         prescription: response.data.data.list[i].prescription
                       }
                       this.all_table_data.push(obj)
-                    }else{
+                    } else {
 
                       for (let c = 0; c < response.data.data.list[i].his_patient[b].orders.length; c++) {
                         let obj = {
@@ -1903,7 +1909,6 @@
                         this.all_table_data.push(obj)
                       }
 
-
                     }
 
                   }
@@ -1921,35 +1926,30 @@
               for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
                 if (this.all_table_data[i].order_status != 2) {
                   isHasUnCharge = true
-                }else {
-                  if(this.all_table_data[i].his_patient_id > 0){
-                    if(this.all_table_data[i].his_patient_id == this.all_table_data[i].prescription[0].his_patient_id){
+                } else {
+                  if (this.all_table_data[i].his_patient_id > 0) {
+                    if (this.all_table_data[i].his_patient_id == this.all_table_data[i].prescription[0].his_patient_id) {
                       isHasUnCharge = true
                     }
                   }
 
                 }
               }
-              if(this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2){
+              if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2) {
                 isHasUnCharge = true
 
               }
 
-
-
               if (isHasUnCharge) {
                 unChargePatient.push(this.all_table_data[i])
               }
 
             }
 
-
-
             unChargePatient = this.unique_four(unChargePatient)
 
             one_count = one_count + unChargePatient.length
 
-
             let ChargePatient = []
             for (let i = 0; i < this.all_table_data.length; i++) {
               if (this.all_table_data[i].order_status == 2) {
@@ -1973,9 +1973,9 @@
                   for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
                     if (this.all_table_data[i].order_status != 2) {
                       isHasUnCharge = true
-                    }else {
-                      if(this.all_table_data[i].his_patient_id > 0){
-                        if(this.all_table_data[i].his_patient_id == this.all_table_data[i].prescription[0].his_patient_id){
+                    } else {
+                      if (this.all_table_data[i].his_patient_id > 0) {
+                        if (this.all_table_data[i].his_patient_id == this.all_table_data[i].prescription[0].his_patient_id) {
                           isHasUnCharge = true
                         }
                       }
@@ -1983,7 +1983,7 @@
                     }
 
                   }
-                  if(this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2){
+                  if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2) {
                     isHasUnCharge = true
 
                   }
@@ -2009,7 +2009,6 @@
                 break
             }
 
-
             this.cal_one = one_count
             this.cal_two = two_count
             this.cal_three = three_count
@@ -2260,7 +2259,7 @@
           }
 
           if (month_prescriptions[i].addition != null) {
-            for (let b = 0; b <month_prescriptions[i].addition.length; b++) {
+            for (let b = 0; b < month_prescriptions[i].addition.length; b++) {
               total = parseFloat(total) + parseFloat(month_prescriptions[i].addition[a].price * month_prescriptions[i].addition[b].count)
             }
           }
@@ -2273,7 +2272,7 @@
           return false
         }
       },
-      open(index, med_type, order,prescriptions) {
+      open(index, med_type, order, prescriptions) {
 
         if (index == 1) {
 
@@ -2347,8 +2346,6 @@
           //   }
           // }
 
-
-
           if (this.activeName == 'first') {
 
             this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder)
@@ -2487,6 +2484,20 @@
 
         } else if (index == 8) {
 
+          if (this.$store.getters.xt_user.org_id != 10028 || this.$store.getters.xt_user.org_id != 9504 || this.$store.getters.xt_user.org_id != 10138) {
+            if (this.form.diagnosis.length || this.form.diagnosis == 0) {
+              that.$message.error('诊断不能为空,请选择诊断内容')
+              return
+            }
+
+            if (this.form.sick_type.length || this.form.sick_type == 0) {
+
+              that.$message.error('疾病类型不能为空,请选择疾病类型')
+              return
+            }
+
+          }
+
           var that = this
           let form = {}
           form['id'] = this.patientInfo.id
@@ -2507,7 +2518,7 @@
             form['settle_accounts_type'] = 2
           }
 
-          if (that.$store.getters.xt_user.org_id == 0) {
+          if (that.$store.getters.xt_user.org_id == 12) {
 
             this.$confirm('是否进行预结算', '预结算', {
               confirmButtonText: '确 定',
@@ -2957,19 +2968,19 @@
 
                 if (response.data.data.list[i].his_patient.length > 1) {
                   for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
-                    if(response.data.data.list[i].his_patient[b].orders.length  == 0){
+                    if (response.data.data.list[i].his_patient[b].orders.length == 0) {
                       let obj = {
                         id: response.data.data.list[i].id,
                         name: response.data.data.list[i].name,
                         number: response.data.data.list[i].his_patient[b].number,
                         order_status: 1,
                         his_patient_id: response.data.data.list[i].his_patient[b].id,
-                        order_number: "",
+                        order_number: '',
                         order_id: 0,
                         prescription: response.data.data.list[i].prescription
                       }
                       this.all_table_data.push(obj)
-                    }else{
+                    } else {
 
                       for (let c = 0; c < response.data.data.list[i].his_patient[b].orders.length; c++) {
                         let obj = {
@@ -2986,7 +2997,6 @@
                         this.all_table_data.push(obj)
                       }
 
-
                     }
 
                   }
@@ -3004,35 +3014,30 @@
               for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
                 if (this.all_table_data[i].order_status != 2) {
                   isHasUnCharge = true
-                }else {
-                  if(this.all_table_data[i].his_patient_id > 0){
-                    if(this.all_table_data[i].his_patient_id == this.all_table_data[i].prescription[0].his_patient_id){
+                } else {
+                  if (this.all_table_data[i].his_patient_id > 0) {
+                    if (this.all_table_data[i].his_patient_id == this.all_table_data[i].prescription[0].his_patient_id) {
                       isHasUnCharge = true
                     }
                   }
 
                 }
               }
-              if(this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2){
+              if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2) {
                 isHasUnCharge = true
 
               }
 
-
-
               if (isHasUnCharge) {
                 unChargePatient.push(this.all_table_data[i])
               }
 
             }
 
-
-
             unChargePatient = this.unique_four(unChargePatient)
 
             one_count = one_count + unChargePatient.length
 
-
             let ChargePatient = []
             for (let i = 0; i < this.all_table_data.length; i++) {
               if (this.all_table_data[i].order_status == 2) {
@@ -3056,9 +3061,9 @@
                   for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
                     if (this.all_table_data[i].order_status != 2) {
                       isHasUnCharge = true
-                    }else {
-                      if(this.all_table_data[i].his_patient_id > 0){
-                        if(this.all_table_data[i].his_patient_id == this.all_table_data[i].prescription[0].his_patient_id){
+                    } else {
+                      if (this.all_table_data[i].his_patient_id > 0) {
+                        if (this.all_table_data[i].his_patient_id == this.all_table_data[i].prescription[0].his_patient_id) {
                           isHasUnCharge = true
                         }
                       }
@@ -3066,7 +3071,7 @@
                     }
 
                   }
-                  if(this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2){
+                  if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2) {
                     isHasUnCharge = true
 
                   }
@@ -3092,7 +3097,6 @@
                 break
             }
 
-
             this.cal_one = one_count
             this.cal_two = two_count
             this.cal_three = three_count
@@ -3179,19 +3183,19 @@
 
                 if (response.data.data.list[i].his_patient.length > 1) {
                   for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
-                    if(response.data.data.list[i].his_patient[b].orders.length  == 0){
+                    if (response.data.data.list[i].his_patient[b].orders.length == 0) {
                       let obj = {
                         id: response.data.data.list[i].id,
                         name: response.data.data.list[i].name,
                         number: response.data.data.list[i].his_patient[b].number,
                         order_status: 1,
                         his_patient_id: response.data.data.list[i].his_patient[b].id,
-                        order_number: "",
+                        order_number: '',
                         order_id: 0,
                         prescription: response.data.data.list[i].prescription
                       }
                       this.all_table_data.push(obj)
-                    }else{
+                    } else {
 
                       for (let c = 0; c < response.data.data.list[i].his_patient[b].orders.length; c++) {
                         let obj = {
@@ -3208,7 +3212,6 @@
                         this.all_table_data.push(obj)
                       }
 
-
                     }
 
                   }
@@ -3226,35 +3229,30 @@
               for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
                 if (this.all_table_data[i].order_status != 2) {
                   isHasUnCharge = true
-                }else {
-                  if(this.all_table_data[i].his_patient_id > 0){
-                    if(this.all_table_data[i].his_patient_id == this.all_table_data[i].prescription[0].his_patient_id){
+                } else {
+                  if (this.all_table_data[i].his_patient_id > 0) {
+                    if (this.all_table_data[i].his_patient_id == this.all_table_data[i].prescription[0].his_patient_id) {
                       isHasUnCharge = true
                     }
                   }
 
                 }
               }
-              if(this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2){
+              if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2) {
                 isHasUnCharge = true
 
               }
 
-
-
               if (isHasUnCharge) {
                 unChargePatient.push(this.all_table_data[i])
               }
 
             }
 
-
-
             unChargePatient = this.unique_four(unChargePatient)
 
             one_count = one_count + unChargePatient.length
 
-
             let ChargePatient = []
             for (let i = 0; i < this.all_table_data.length; i++) {
               if (this.all_table_data[i].order_status == 2) {
@@ -3278,9 +3276,9 @@
                   for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
                     if (this.all_table_data[i].order_status != 2) {
                       isHasUnCharge = true
-                    }else {
-                      if(this.all_table_data[i].his_patient_id > 0){
-                        if(this.all_table_data[i].his_patient_id == this.all_table_data[i].prescription[0].his_patient_id){
+                    } else {
+                      if (this.all_table_data[i].his_patient_id > 0) {
+                        if (this.all_table_data[i].his_patient_id == this.all_table_data[i].prescription[0].his_patient_id) {
                           isHasUnCharge = true
                         }
                       }
@@ -3288,7 +3286,7 @@
                     }
 
                   }
-                  if(this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2){
+                  if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2) {
                     isHasUnCharge = true
 
                   }
@@ -3314,8 +3312,6 @@
                 break
             }
 
-
-
             this.cal_one = one_count
             this.cal_two = two_count
             this.cal_three = one_count + two_count
@@ -3407,19 +3403,19 @@
 
                 if (response.data.data.list[i].his_patient.length > 1) {
                   for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
-                    if(response.data.data.list[i].his_patient[b].orders.length  == 0){
+                    if (response.data.data.list[i].his_patient[b].orders.length == 0) {
                       let obj = {
                         id: response.data.data.list[i].id,
                         name: response.data.data.list[i].name,
                         number: response.data.data.list[i].his_patient[b].number,
                         order_status: 1,
                         his_patient_id: response.data.data.list[i].his_patient[b].id,
-                        order_number: "",
+                        order_number: '',
                         order_id: 0,
                         prescription: response.data.data.list[i].prescription
                       }
                       this.all_table_data.push(obj)
-                    }else{
+                    } else {
 
                       for (let c = 0; c < response.data.data.list[i].his_patient[b].orders.length; c++) {
                         let obj = {
@@ -3436,7 +3432,6 @@
                         this.all_table_data.push(obj)
                       }
 
-
                     }
 
                   }
@@ -3454,35 +3449,30 @@
               for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
                 if (this.all_table_data[i].order_status != 2) {
                   isHasUnCharge = true
-                }else {
-                  if(this.all_table_data[i].his_patient_id > 0){
-                    if(this.all_table_data[i].his_patient_id == this.all_table_data[i].prescription[0].his_patient_id){
+                } else {
+                  if (this.all_table_data[i].his_patient_id > 0) {
+                    if (this.all_table_data[i].his_patient_id == this.all_table_data[i].prescription[0].his_patient_id) {
                       isHasUnCharge = true
                     }
                   }
 
                 }
               }
-              if(this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2){
+              if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2) {
                 isHasUnCharge = true
 
               }
 
-
-
               if (isHasUnCharge) {
                 unChargePatient.push(this.all_table_data[i])
               }
 
             }
 
-
-
             unChargePatient = this.unique_four(unChargePatient)
 
             one_count = one_count + unChargePatient.length
 
-
             let ChargePatient = []
             for (let i = 0; i < this.all_table_data.length; i++) {
               if (this.all_table_data[i].order_status == 2) {
@@ -3506,9 +3496,9 @@
                   for (let b = 0; b < this.all_table_data[i].prescription.length; b++) {
                     if (this.all_table_data[i].order_status != 2) {
                       isHasUnCharge = true
-                    }else {
-                      if(this.all_table_data[i].his_patient_id > 0){
-                        if(this.all_table_data[i].his_patient_id == this.all_table_data[i].prescription[0].his_patient_id){
+                    } else {
+                      if (this.all_table_data[i].his_patient_id > 0) {
+                        if (this.all_table_data[i].his_patient_id == this.all_table_data[i].prescription[0].his_patient_id) {
                           isHasUnCharge = true
                         }
                       }
@@ -3516,7 +3506,7 @@
                     }
 
                   }
-                  if(this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2){
+                  if (this.all_table_data[i].his_patient_id > 0 && this.all_table_data[i].order_status != 2) {
                     isHasUnCharge = true
 
                   }
@@ -3639,8 +3629,6 @@
 
         }
 
-
-
         //
         //
         for (let y = 0; y < big_prescriptions.length; y++) {
@@ -3767,8 +3755,6 @@
           this.big_month_prescriptions[i]['month_total'] = this.getMonthTotalTwo(this.big_month_prescriptions[i].month_prescriptions[0])
         }
 
-
-
       }, getPName(med_type, index) {
         var med_type = parseInt(med_type)
         switch (med_type) {
@@ -3913,7 +3899,6 @@
 
             if (this.info.id > 0) {
 
-
               this.form.p_type = response.data.data.info.register_type
               this.form.sick_type = response.data.data.info.sick_type
               this.form.diagnosis = response.data.data.info.diagnosis
@@ -4061,9 +4046,6 @@
 
             console.log(this.big_prescriptions)
 
-
-
-
             //
             // if (this.prescriptions.length > 0) {
             //   this.curPrescriptions = this.prescriptions[0]
@@ -4076,9 +4058,6 @@
             //   this.curMonthPrescriptions = {}
             // }
 
-
-
-
             // this.month_total = this.getMonthTotalOne()
 
           }

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -23,16 +23,16 @@
                     <el-form-item label="证件号: " prop="name" label-position="right">
                         <el-input v-model="patientInfo.id_card_no" placeholder="" readonly></el-input>
                     </el-form-item>
-                    <el-form-item label="处方类型: " prop="name" label-position="right">
-                        <el-select style="width:100%;" v-model="register_type" placeholder="">
-                            <el-option
-                                    v-for="(item,index) in register"
-                                    :key="index"
-                                    :label="item.label"
-                                    :value="item.value">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
+                    <!--<el-form-item label="处方类型: " prop="name" label-position="right">-->
+                        <!--<el-select style="width:100%;" v-model="register_type" placeholder="">-->
+                            <!--<el-option-->
+                                    <!--v-for="(item,index) in register"-->
+                                    <!--:key="index"-->
+                                    <!--:label="item.label"-->
+                                    <!--:value="item.value">-->
+                            <!--</el-option>-->
+                        <!--</el-select>-->
+                    <!--</el-form-item>-->
                     <el-form-item label="疾病类型:" prop="name" label-position="right">
 
                         <el-select  filterable style="width:100%;" v-model="state1" placeholder="">