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

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -73,7 +73,7 @@
       <!-- 杏康 -->
       <printSeventheen  :info="info" v-if=" org_id == 10721"></printSeventheen>
       <printeighteen :info="info" v-if=" org_id == 10726"></printeighteen>
-      <printOne :info="info" v-if=" org_id != 9990 && org_id !=0 &&
+      <printOne :info="info" v-if=" org_id != 9990 &&
             org_id != 10138 && org_id != 9504 && org_id != 10028  && org_id != 10744 &&
             org_id != 10610 && org_id !=10537 && org_id !=10697 &&
             org_id != 10278 && org_id != 10387 && org_id != 10191 &&
@@ -1164,7 +1164,7 @@ export default {
           })
         }
       } else {
-        console.log('1111111',this.org_id)
+
         if (this.org_id == 1000000) {
           let params = {
             order_id: obj.order_id,
@@ -2011,8 +2011,6 @@ export default {
                 that.info['his'] = response.data.data.his
                 that.info['dia_config'] = response.data.data.dia_config
 
-                const jsonArr = JSON.parse(response.data.data.his.idetinfo);
-                that.info['psn_idet_type'] = jsonArr[0].psn_idet_type
 
 
                 const jsons = JSON.parse(response.data.data.his.iinfo);
@@ -2216,7 +2214,7 @@ export default {
 
 
 
-          } else if(this.org_id == 10633 || this.org_id == 0){
+          } else if(this.org_id == 10633 ){
             let params = {
               order_id: obj.order_id,
               admin_user_id: this.$store.getters.xt_user.user.id
@@ -2597,7 +2595,438 @@ export default {
 
 
 
-          }else {
+          }else if(this.org_id == 9478 || this.org_id == 0 ){
+
+            let params = {
+              order_id: obj.order_id,
+              admin_user_id: this.$store.getters.xt_user.user.id
+            }
+            getPrivateExpensesOrder(params).then((response) => {
+              if (response.data.state == 0) {
+                // this.$message.error(response.data.msg)
+
+                return false
+              } else {
+                var that = this
+                that.info = response.data.data.info
+                that.p_admin = response.data.data.printor_admin
+                that.charge_admin = response.data.data.charge_admin
+                that.info['new_order'] = response.data.data.info
+                that.info['p_admin'] = that.p_admin
+                that.info['his'] = that.info.his
+                that.info['charge_admin'] = that.charge_admin
+                that.info['order_number'] = response.data.data.order_number
+                that.info['patient'] = response.data.data.patient
+                that.info['date'] = response.data.data.date
+                that.info['number'] = response.data.data.number
+                that.info['order_infos'] = response.data.data.order_infos
+                that.info['diagnosis'] = response.data.data.diagnosis
+
+
+                that.info['dise_name'] = "慢性肾脏病5期"
+
+
+
+                that.info['begndate'] = response.data.data.info.setl_time
+                that.info['enddate'] = response.data.data.info.setl_time
+
+
+                that.info['fixmedins_name'] = response.data.data.org_name
+                that.info['fixmedins_code'] = response.data.data.org_code
+                // that.info["doctor_code"] = response.data.data.doctor_code;
+                // that.info["department"] = response.data.data.department;
+                // that.info["health_card_no"] = response.data.data.health_card_no;
+
+                that.info['bed_cost_total'] = response.data.data.bedCostTotal
+                that.info['bed_cost_self_total'] =
+                  response.data.data.bedCostSelfTotal
+                that.info['bed_cost_part_self_total'] =
+                  response.data.data.bedCostPartSelfTotal
+
+                that.info['operation_cost_total'] =
+                  response.data.data.operationCostTotal
+                that.info['operation_cost_self_total'] =
+                  response.data.data.operationCostSelfTotal
+                that.info['operation_cost_part_self_total'] =
+                  response.data.data.operationCostPartSelfTotal
+
+                that.info['other_cost_total'] = response.data.data.otherCostTotal
+                that.info['other_cost_self_total'] =
+                  response.data.data.otherCostSelfTotal
+                that.info['other_cost_part_self_total'] =
+                  response.data.data.otherCostPartSelfTotal
+
+                that.info['material_cost_total'] =
+                  response.data.data.materialCostTotal
+                that.info['material_cost_self_total'] =
+                  response.data.data.materialCostSelfTotal
+                that.info['material_cost_part_self_total'] =
+                  response.data.data.materialCostPartSelfTotal
+
+                that.info['western_medicine_cost_total'] =
+                  response.data.data.westernMedicineCostTotal
+                that.info['western_medicine_cost_self_total'] =
+                  response.data.data.westernMedicineCostSelfTotal
+                that.info['western_medicine_cost_part_self_total'] =
+                  response.data.data.westernMedicineCostPartSelfTotal
+
+                that.info['chinese_traditional_medicine_cost_total'] =
+                  response.data.data.chineseTraditionalMedicineCostTotal
+                that.info['chinese_traditional_medicine_cost_self_total'] =
+                  response.data.data.chineseTraditionalMedicineCostSelfTotal
+                that.info['chinese_traditional_medicine_cost_part_self_total'] =
+                  response.data.data.chineseTraditionalMedicineCostPartSelfTotal
+
+                that.info['check_cost_total'] = response.data.data.checkCostTotal
+                that.info['check_cost_self_total'] =
+                  response.data.data.checkCostSelfTotal
+                that.info['check_cost_part_self_total'] =
+                  response.data.data.checkCostPartSelfTotal
+
+                that.info['laboratory_cost_total'] =
+                  response.data.data.laboratoryCostTotal
+                that.info['laboratory_cost_self_total'] =
+                  response.data.data.laboratoryCostSelfTotal
+                that.info['laboratory_cost_part_self_total'] =
+                  response.data.data.laboratoryCostPartSelfTotal
+
+                that.info['treat_cost_total'] = response.data.data.treatCostTotal
+                that.info['treat_cost_self_total'] =
+                  response.data.data.treatCostSelfTotal
+                that.info['treat_cost_part_self_total'] =
+                  response.data.data.treatCostPartSelfTotal
+
+
+                that.info['bedInscpTotal'] =
+                  response.data.data.bedInscpTotal
+                that.info['bedSelfTotal'] =
+                  response.data.data.bedSelfTotal
+
+                that.info['operationInscpTotal'] =
+                  response.data.data.operationInscpTotal
+                that.info['operationSelfTotal'] =
+                  response.data.data.operationSelfTotal
+
+                that.info['checkInscpTotal'] =
+                  response.data.data.checkInscpTotal
+                that.info['checkSelfTotal'] =
+                  response.data.data.checkSelfTotal
+
+                that.info['treatInscpTotal'] =
+                  response.data.data.treatInscpTotal
+                that.info['treatSelfTotal'] =
+                  response.data.data.treatSelfTotal
+
+                that.info['laboratoryInscpTotal'] =
+                  response.data.data.laboratoryInscpTotal
+                that.info['laboratorySelfTotal'] =
+                  response.data.data.laboratorySelfTotal
+
+                that.info['westernMedicineInscpTotal'] =
+                  response.data.data.westernMedicineInscpTotal
+                that.info['westernMedicineSelfTotal'] =
+                  response.data.data.westernMedicineSelfTotal
+
+                that.info['materialInscpTotal'] =
+                  response.data.data.materialInscpTotal
+                that.info['materialSelfTotal'] =
+                  response.data.data.materialSelfTotal
+
+                that.info['chineseTraditionalInscpTotal'] =
+                  response.data.data.chineseTraditionalInscpTotal
+                that.info['chineseTraditionalSelfTotal'] =
+                  response.data.data.chineseTraditionalSelfTotal
+
+
+
+                if(response.data.data.zcCostTotal){
+                  that.info['zc_cost_total'] =
+                    response.data.data.zcCostTotal
+                }else{
+                  that.info['zc_cost_total'] = 0
+                }
+
+                if(response.data.data.zcCostSelfTotal){
+                  that.info['zc_cost_self_total'] =
+                    response.data.data.zcCostSelfTotal
+                }else{
+                  that.info['zc_cost_self_total'] = 0
+                }
+
+
+
+
+                if(response.data.data.zcCostPartSelfTotal){
+                  that.info['zc_cost_part_self_total'] =
+                    response.data.data.zcCostPartSelfTotal
+                }else{
+                  that.info['zc_cost_part_self_total'] = 0
+                }
+
+                if(response.data.data.huliCostTotal){
+                  that.info['huli_cost_total'] =
+                    response.data.data.huliCostTotal
+                }else{
+                  that.info['huli_cost_total'] = 0
+                }
+                if(response.data.data.huliCostSelfTotal){
+                  that.info['huli_cost_self_total'] =
+                    response.data.data.huliCostSelfTotal
+                }else{
+                  that.info['huli_cost_self_total'] = 0
+                }
+                if(response.data.data.huliCostPartSelfTotal){
+                  that.info['huli_cost_part_self_total'] =
+                    response.data.data.huliCostPartSelfTotal
+                }else{
+                  that.info['huli_cost_part_self_total'] = 0
+                }
+
+                that.info['date'] = response.data.data.date
+                that.info['number'] = response.data.data.number
+                that.info['order_infos'] = response.data.data.order_infos
+                that.info['diagnosis'] = response.data.data.diagnosis
+                that.info['his'] = response.data.data.his
+                that.info['dia_config'] = response.data.data.dia_config
+
+
+                const jsons = JSON.parse(response.data.data.his.iinfo);
+                that.info['emp_name'] = jsons[0].emp_name
+
+
+
+                for (let i = 0; i < response.data.data.order_infos.length; i++) {
+                  if (response.data.data.order_infos[i].advice_id > 0 && response.data.data.order_infos[i].project_id == 0) {
+                    response.data.data.order_infos[i].med_chrgitm_type = '09'
+                  }
+                  if (response.data.data.order_infos[i].advice_id == 0 && response.data.data.order_infos[i].project_id > 0) {
+                    if (response.data.data.order_infos[i].project.type == 2) { //项目
+                      if (response.data.data.order_infos[i].project.project.cost_classify == 2) {
+                        response.data.data.order_infos[i].med_chrgitm_type = '05'
+                      } else if (response.data.data.order_infos[i].project.project.cost_classify == 3) {
+                        response.data.data.order_infos[i].med_chrgitm_type = '04'
+                      } else {
+                        response.data.data.order_infos[i].med_chrgitm_type = '14'
+                      }
+                    } else if (response.data.data.order_infos[i].project.type == 3) { //耗材
+                      response.data.data.order_infos[i].med_chrgitm_type = '08'
+                    }
+                  }
+                }
+                console.log(response.data.data.order_infos)
+                console.log(that.info)
+
+                let list = []
+                for (let i = 0; i < response.data.data.order_infos.length; i++) {
+                  let order = response.data.data.order_infos[i]
+                  let obj = {
+                    name: '',
+                    spec: '',
+                    cnt: '',
+                    det_item_fee_sumamt: '',
+                    price:'',
+                  }
+
+                  if (order.advice_id > 0 && order.project_id == 0) {
+                    obj.name = order.advice.advice_name
+                    let spec = order.advice.drug.dose + order.advice.drug.dose_unit + '*' + order.advice.drug.min_number + order.advice.drug.min_unit + '/' + order.advice.drug.max_unit
+                    obj.spec = spec
+                    obj.cnt = order.cnt
+                    obj.det_item_fee_sumamt = order.det_item_fee_sumamt
+                    obj.price = order.pric
+                    list.push(obj)
+
+                  } else if (order.advice_id == 0 && order.project_id > 0) {
+                    if (order.project.type == 2) {
+                      obj.name = order.project.project.project_name
+                      obj.spec = ''
+                      obj.cnt = order.cnt
+                      obj.det_item_fee_sumamt = order.det_item_fee_sumamt
+                      obj.price = order.pric
+                    } else {
+                      obj.name = order.project.good_info.good_name
+                      obj.spec = order.project.good_info.specification_name
+                      obj.cnt = order.cnt
+                      obj.det_item_fee_sumamt = order.det_item_fee_sumamt
+                      obj.price = order.pric
+                    }
+                    list.push(obj)
+                  }
+
+                }
+                that.info['Z_list'] = list
+                console.log(" that.info")
+                console.log(that.info.Z_list)
+                console.log(" that.info")
+
+
+                //获取所有项目类型进行去重
+                let med_chrgitm_types = []
+                for (let i = 0; i < response.data.data.order_infos.length; i++) {
+                  med_chrgitm_types.push(response.data.data.order_infos[i].med_chrgitm_type)
+                }
+                const obj10 = {}
+                med_chrgitm_types = med_chrgitm_types.reduce((cur, next) => {
+                  obj10[next] ? '' : obj10[next] = true && cur.push(next)
+                  return cur
+                }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+                let tempOrderInfo = []
+                for (let i = 0; i < med_chrgitm_types.length; i++) {
+
+                  let obj9 = {
+                    details: [],
+                    med_chrgitm_name: that.getType(med_chrgitm_types[i]),
+                    total:0,
+                  }
+
+                  // if(med_chrgitm_types[i] == '09'){
+                  //   obj.sort = 99
+                  // } else if(med_chrgitm_types[i] == '05'){
+                  //   obj.sort = 98
+                  // } else if(med_chrgitm_types[i] == '08'){
+                  //   obj.sort = 97
+                  // }else if(med_chrgitm_types[i] == '03'){
+                  //   obj.sort = 96
+                  // }
+
+                  let tempDetails = []
+                  for (let b = 0; b < response.data.data.order_infos.length; b++) {
+                    if (med_chrgitm_types[i] == response.data.data.order_infos[b].med_chrgitm_type) {
+                      tempDetails.push(response.data.data.order_infos[b])
+                    }
+                  }
+                  console.log(med_chrgitm_types[i])
+                  console.log(tempDetails)
+                  obj9.total = that.getTotal(tempDetails)
+                  obj9.details = that.set10265NewData(tempDetails)
+                  list.push(obj9)
+                }
+                that.info['new_list'] = list
+                // list.sort((a,b) => a.sort < b.sort ? 1 : a.sort > b.sort ? -1 : 0)
+
+                let obj = {
+                  type: 1,
+                  details: [],
+                  total: 0
+                }
+                let obj2 = {
+                  type: 2,
+                  details: [],
+                  total: 0
+                }
+                let obj3 = {
+                  type: 3,
+                  details: [],
+                  total: 0
+                }
+
+                let obj4 = {
+                  type: 4,
+                  details: [],
+                  total: 0
+                }
+                let num = 0
+                that.info.order_infos.map((item) => {
+                  if (item.advice_id > 0) {
+                    obj.details.push(item)
+                    obj.total += item.pric * item.advice.prescribing_number
+                    num++
+                  } else {
+                    if (item.project.type == 2) {
+                      obj2.details.push(item)
+                      obj2.total += item.pric * item.project.count
+                      num++
+                    } else {
+                      obj3.details.push(item)
+                      obj3.total += item.pric * item.project.count
+                      num++
+                    }
+                  }
+                })
+
+                // this.info.order_infos.map(item => {
+                //   obj4.total = item.Total
+                //   obj4.details.push(item)
+                //   num++
+                //
+                // })
+                var funds = []
+                for(let i = 0; i <  response.data.data.funds.length; i++){
+                  var objs = {}
+                  objs["number"] = i + 1
+                  objs["fund_pay"] = response.data.data.funds[i].fund_payamt
+                  objs["limit_pay"] = response.data.data.funds[i].inscp_scp_amt
+                  objs["insp_pay"] = response.data.data.funds[i].inscp_scp_amt
+                  for(let b = 0; b < that.fundsArray.length; b++){
+                    if(response.data.data.funds[i].fund_pay_type ==  that.fundsArray[b].code){
+                      objs["name"] =that.fundsArray[b].name
+                    }
+                  }
+                  funds.push(objs)
+                }
+                that.info['funds'] = funds
+                console.log(that.info)
+
+                that.info.new_detail_list = []
+                that.info.new_detail_list.push(obj)
+                that.info.new_detail_list.push(obj2)
+                that.info.new_detail_list.push(obj3)
+                // that.info.new_detail_list.push(obj4)
+
+                that.num = num
+
+                if (that.paramsObj.settle_type != 1) {
+                  that.info.begndate = that.getTimes(that.paramsObj.start_time)
+                  that.info.enddate = that.getTimes(that.paramsObj.end_time)
+                }
+
+                that.info.order_infos.map((item) => {
+
+                })
+
+
+                that.info["jia_drug"] = 0
+                that.info["yi_drug"] = 0
+                that.info["zifei_drug"] = 0
+
+
+                that.info["jia_yiliao"] = 0
+                that.info["yi_yiliao"] = 0
+                that.info["zifei_yiliao"] = 0
+
+                for(let a = 0; a < response.data.data.order_infos.length; a++){
+                  if(response.data.data.order_infos[a].chrgitm_lv == "01" && response.data.data.order_infos[a].med_chrgitm_type == "09"){
+                    that.info["jia_drug"] = that.info["jia_drug"] + response.data.data.order_infos[a].det_item_fee_sumamt
+                  }
+                  if(response.data.data.order_infos[a].chrgitm_lv == "02" && response.data.data.order_infos[a].med_chrgitm_type == "09"){
+                    that.info["yi_drug"] = that.info["yi_drug"] + response.data.data.order_infos[a].det_item_fee_sumamt
+                  }
+                  if(response.data.data.order_infos[a].chrgitm_lv != "01" && response.data.data.order_infos[a].chrgitm_lv != "02" && response.data.data.order_infos[a].med_chrgitm_type == "09"){
+                    that.info["zifei_drug"] = that.info["zifei_drug"] + response.data.data.order_infos[a].det_item_fee_sumamt
+                  }
+                }
+
+                for(let a = 0; a < response.data.data.order_infos.length; a++){
+                  if(response.data.data.order_infos[a].chrgitm_lv == "01" && response.data.data.order_infos[a].med_chrgitm_type != "09"){
+                    that.info["jia_yiliao"] = that.info["jia_yiliao"] + response.data.data.order_infos[a].det_item_fee_sumamt
+                  }
+                  if(response.data.data.order_infos[a].chrgitm_lv == "02" && response.data.data.order_infos[a].med_chrgitm_type != "09"){
+                    that.info["yi_yiliao"] = that.info["yi_yiliao"] + response.data.data.order_infos[a].det_item_fee_sumamt
+                  }
+                  if(response.data.data.order_infos[a].chrgitm_lv != "01" && response.data.data.order_infos[a].chrgitm_lv != "02" && response.data.data.order_infos[a].med_chrgitm_type != "09"){
+                    that.info["zifei_yiliao"] = that.info["zifei_yiliao"] + response.data.data.order_infos[a].det_item_fee_sumamt
+                  }
+                }
+
+              }
+            })
+
+
+
+
+
+
+          } else {
             var that = this
             axios
               .get('http://127.0.0.1:9532/api/settle/query', {
@@ -2617,6 +3046,7 @@ export default {
                   that.charge_admin = response.data.data.charge_admin
                   that.info['psn_cash_pay'] = response.data.data.psn_cash_pay
                   that.info['new_order'] = response.data.data.order
+                  that.info['his'] = response.data.data.his
                   that.info['p_admin'] = that.p_admin
                   that.info['charge_admin'] = that.charge_admin
                   that.info['order_number'] = response.data.data.order_number

src/xt_pages/outpatientDoctorStation/components/prescriptionTemplateTable.vue

@@ -21,6 +21,15 @@
             </template>
           </el-table-column>
 
+
+          <el-table-column align="center" prop="drug_name" label="规格">
+            <template slot-scope="scope">
+                  <span>
+                    {{ scope.row.drug.dose }}{{ scope.row.drug.dose_unit }}*{{ scope.row.drug.min_number }}{{ scope.row.drug.min_unit }}/{{ scope.row.drug.max_unit }}
+                  </span>
+            </template>
+          </el-table-column>
+
           <el-table-column align="center" prop="single_dose" width="150" label="单次用量">
             <template slot-scope="scope">
               <div style="display:flex;align-items:center;">
@@ -158,6 +167,12 @@
 
                 </template>
             </el-table-column>
+          <el-table-column align="center" prop="project_name" label="规格">
+            <template slot-scope="scope">
+              <span v-if="scope.row.type==2">{{ scope.row.project_name }}</span>
+              <span v-if="scope.row.type==3">{{ scope.row.good_info.specification_name }}</span>
+            </template>
+          </el-table-column>
             <el-table-column align="center" prop="delivery_way" width="80" label="用法">
                 <template slot-scope="scope">
                     <el-autocomplete

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -2348,7 +2348,7 @@ export default {
                     if (this.org_id == 10028 || this.org_id == 10571  || this.org_id == 10633) {
                       preTime = this.record_date + ' ' + '6:30'
                     } else if(this.org_id == 10206 || this.org_id == 10598){
-                      preTime = this.record_date + ' ' + '6:00'
+                      preTime = this.record_date + ' ' + '05:40'
                     }else if(this.org_id == 10721){
                       preTime = this.record_date + ' ' + '05:30'
                     } else {
@@ -2387,7 +2387,7 @@ export default {
                     // preTime = this.record_date
                     if(this.schedule.schedule_type == 1){
                       if(this.org_id == 10206   || this.org_id == 10598) {
-                        preTime = this.record_date+ ' ' + '6:00'
+                        preTime = this.record_date+ ' ' + '05:40'
                       } else if(this.org_id == 10721){
                         preTime = this.record_date + ' ' + '05:30'
                       }else {
@@ -2576,7 +2576,7 @@ export default {
                     if (this.org_id == 10028 ||  this.org_id == 10571 || this.org_id == 10633) {
                       preTime = this.record_date + ' ' + '6:30'
                     } else if(this.org_id == 10206  || this.org_id == 10598) {
-                      preTime = this.record_date+ ' ' + '6:00'
+                      preTime = this.record_date+ ' ' + '05:40'
                     } else if(this.org_id == 10721 ) {
                       preTime = this.record_date+ ' ' + '05:30'
                     } else {
@@ -2606,7 +2606,7 @@ export default {
                 if(nowTime.split(" ")[0] != this.record_date){
                   if(this.schedule.schedule_type == 1){
                     if(this.org_id == 10206  || this.org_id == 0 ||  this.org_id == 10598) {
-                      preTime = this.record_date+ ' ' + '6:00'
+                      preTime = this.record_date+ ' ' + '05:40'
                     } else if(this.org_id == 10721 ) {
                       preTime = this.record_date+ ' ' + '05:30'
                     }else {
@@ -2682,7 +2682,7 @@ export default {
                 // preTime = this.record_date
                 if(this.schedule.schedule_type == 1){
                   if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
-                    preTime = this.record_date+ ' ' + '6:00'
+                    preTime = this.record_date+ ' ' + '05:40'
                   }else if(this.org_id == 10721 ) {
                     preTime = this.record_date+ ' ' + '05:30'
                   }else {
@@ -2746,7 +2746,7 @@ export default {
 
     choosePatient(val) {
       console.log('1234567890',val);
-      
+
       if (this.titleType == '电子病历') {
         if (this.$refs.child != undefined && this.$refs.child.watchSign > 2) {
           this.$confirm('是否保存当前病例', '保存', {
@@ -3003,7 +3003,7 @@ export default {
                           if (this.org_id == 10028 || this.org_id == 10571  || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
                           } else if(this.org_id == 10206 || this.org_id == 10598){
-                            preTime = this.record_date + ' ' + '6:00'
+                            preTime = this.record_date + ' ' + '05:40'
                           } else if(this.org_id == 10721 ){
                             preTime = this.record_date + ' ' + '05:30'
                           } else {
@@ -3037,7 +3037,7 @@ export default {
                         if(nowTime.split(" ")[0] != this.record_date){
                           if(this.schedule.schedule_type == 1){
                             if(this.org_id == 10206  || this.org_id == 10598) {
-                              preTime = this.record_date+ ' ' + '6:00'
+                              preTime = this.record_date+ ' ' + '05:40'
                             } else if(this.org_id == 10721) {
                               preTime = this.record_date+ ' ' + '05:30'
                             }else {
@@ -3207,7 +3207,7 @@ export default {
                           if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
                           } else if(this.org_id == 10206 || this.org_id == 10598){
-                            preTime = this.record_date + ' ' + '6:00'
+                            preTime = this.record_date + ' ' + '05:40'
                           } else if(this.org_id == 10721){
                             preTime = this.record_date + ' ' + '05:30'
                           } else {
@@ -3238,7 +3238,7 @@ export default {
                       if(nowTime.split(" ")[0] != this.record_date){
                         if(this.schedule.schedule_type == 1){
                           if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
-                            preTime = this.record_date+ ' ' + '6:00'
+                            preTime = this.record_date+ ' ' + '05:40'
                           } else if(this.org_id == 10721) {
                             preTime = this.record_date+ ' ' + '05:30'
                           }else {
@@ -3308,7 +3308,7 @@ export default {
                     if(nowTime.split(" ")[0] != this.record_date){
                       if(this.schedule.schedule_type == 1){
                         if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
-                          preTime = this.record_date+ ' ' + '6:00'
+                          preTime = this.record_date+ ' ' + '05:40'
                         }else if(this.org_id == 10721) {
                           preTime = this.record_date+ ' ' + '05:30'
                         }else {
@@ -3712,7 +3712,7 @@ export default {
                       if(nowTime.split(" ")[0] != this.record_date){
                         if(this.schedule.schedule_type == 1){
                           if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
-                            preTime = this.record_date+ ' ' + '6:00'
+                            preTime = this.record_date+ ' ' + '05:40'
                           }else if(this.org_id == 10721) {
                             preTime = this.record_date+ ' ' + '05:30'
                           }else {
@@ -3874,7 +3874,7 @@ export default {
                       if(nowTime.split(" ")[0] != this.record_date){
                         if(this.schedule.schedule_type == 1){
                           if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
-                            preTime = this.record_date+ ' ' + '6:00'
+                            preTime = this.record_date+ ' ' + '05:40'
                           }else if (this.org_id == 10721){
                             preTime = this.record_date+ ' ' + '05:30'
 
@@ -3940,7 +3940,7 @@ export default {
                     if(nowTime.split(" ")[0] != this.record_date){
                       if(this.schedule.schedule_type == 1){
                         if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
-                          preTime = this.record_date+ ' ' + '6:00'
+                          preTime = this.record_date+ ' ' + '05:40'
                         }else if(this.org_id == 10721) {
                           preTime = this.record_date+ ' ' + '05:30'
                         }else {
@@ -4310,6 +4310,7 @@ export default {
                     tempProject.push(obj)
                   }
 
+
                   //附加收费
                   // for (let b = 0; b < prescription.addition.length; b++) {
                   //   let obj = {
@@ -4329,7 +4330,7 @@ export default {
                     if(nowTime.split(" ")[0] != this.record_date){
                       if(this.schedule.schedule_type == 1){
                         if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
-                          preTime = this.record_date+ ' ' + '6:00'
+                          preTime = this.record_date+ ' ' + '05:40'
                         }else if(this.org_id == 10721){
                           preTime = this.record_date+ ' ' + '05:30'
 
@@ -4497,7 +4498,7 @@ export default {
                     if(nowTime.split(" ")[0] != this.record_date){
                       if(this.schedule.schedule_type == 1){
                         if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
-                          preTime = this.record_date+ ' ' + '6:00'
+                          preTime = this.record_date+ ' ' + '05:40'
                         }else if(this.org_id == 10721) {
                           preTime = this.record_date+ ' ' + '05:30'
                         }else {
@@ -4561,7 +4562,7 @@ export default {
                   if(nowTime.split(" ")[0] != this.record_date){
                     if(this.schedule.schedule_type == 1){
                       if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
-                        preTime = this.record_date+ ' ' + '6:00'
+                        preTime = this.record_date+ ' ' + '05:40'
                       }else if(this.org_id == 10721) {
                         preTime = this.record_date+ ' ' + '05:30'
                       }else {
@@ -5036,7 +5037,7 @@ export default {
                             preTime = this.record_date + ' ' + '6:30'
                           } else if(this.org_id == 10206 || this.org_id == 10598){
 
-                            preTime = this.record_date + ' ' + '6:00'
+                            preTime = this.record_date + ' ' + '05:40'
 
                           } else if(this.org_id == 10721){
 
@@ -5077,7 +5078,7 @@ export default {
                         if(nowTime.split(" ")[0] != this.record_date){
                           if(this.schedule.schedule_type == 1){
                             if(this.org_id == 10206  || this.org_id == 10598) {
-                              preTime = this.record_date+ ' ' + '6:00'
+                              preTime = this.record_date+ ' ' + '05:40'
                             }else if(this.org_id == 10721){
                               preTime = this.record_date + ' ' + '05:30'
 
@@ -5251,7 +5252,7 @@ export default {
                           if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
                           } else if(this.org_id == 10206 || this.org_id == 10598){
-                            preTime = this.record_date+ ' ' + '6:00'
+                            preTime = this.record_date+ ' ' + '05:40'
                           } else if(this.org_id == 10721){
                             preTime = this.record_date+ ' ' + '05:30'
                           } else {
@@ -5280,7 +5281,7 @@ export default {
                       if(nowTime.split(" ")[0] != this.record_date){
                         if(this.schedule.schedule_type == 1){
                           if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
-                            preTime = this.record_date+ ' ' + '6:00'
+                            preTime = this.record_date+ ' ' + '05:40'
                           } else if(this.org_id == 10721){
                             preTime = this.record_date+ ' ' + '05:30'
                           }else {
@@ -5357,7 +5358,7 @@ export default {
                     if(nowTime.split(" ")[0] != this.record_date){
                       if(this.schedule.schedule_type == 1){
                         if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
-                          preTime = this.record_date+ ' ' + '6:00'
+                          preTime = this.record_date+ ' ' + '05:40'
                         }else if(this.org_id == 10721){
                           preTime = this.record_date+ ' ' + '05:30'
                         }else {
@@ -5736,7 +5737,7 @@ export default {
                           if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
                           } else if(this.org_id == 10206 || this.org_id == 10598){
-                            preTime = this.record_date + ' ' + '6:00'
+                            preTime = this.record_date + ' ' + '05:40'
                           } else if(this.org_id == 10721){
                             preTime = this.record_date+ ' ' + '05:30'
                           }else {
@@ -5772,7 +5773,7 @@ export default {
                         if(nowTime.split(" ")[0] != this.record_date){
                           if(this.schedule.schedule_type == 1){
                             if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
-                              preTime = this.record_date+ ' ' + '6:00'
+                              preTime = this.record_date+ ' ' + '05:40'
                             }else if(this.org_id == 10721){
                               preTime = this.record_date+ ' ' + '05:30'
                             }else {
@@ -5948,7 +5949,7 @@ export default {
                           if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
                           } else if(this.org_id == 10206 || this.org_id == 10598){
-                            preTime = this.record_date + ' ' + '6:00'
+                            preTime = this.record_date + ' ' + '05:40'
                           } else if(this.org_id == 10721){
                             preTime = this.record_date+ ' ' + '05:30'
                           }else {
@@ -5978,7 +5979,7 @@ export default {
                       if(nowTime.split(" ")[0] != this.record_date){
                         if(this.schedule.schedule_type == 1){
                           if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
-                            preTime = this.record_date+ ' ' + '6:00'
+                            preTime = this.record_date+ ' ' + '05:40'
                           }else if(this.org_id == 10721){
                             preTime = this.record_date+ ' ' + '05:30'
                           }else {
@@ -6056,7 +6057,7 @@ export default {
                     if(nowTime.split(" ")[0] != this.record_date){
                       if(this.schedule.schedule_type == 1){
                         if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
-                          preTime = this.record_date+ ' ' + '6:00'
+                          preTime = this.record_date+ ' ' + '05:40'
                         }else if(this.org_id == 10721){
                           preTime = this.record_date + ' ' + '05:30'