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

src/xt_pages/Dialysisanalysis/summary/index.vue

@@ -40,64 +40,68 @@
           color: '#606266'
         }"
                 style="width: 100%;">
-                <el-table-column type="index" label="序号" align="center" width="60">
-                </el-table-column>
-                <el-table-column
-                  prop="count"
-                  label="姓名"
-                >
-                  <template slot-scope="scope">
-                    {{ scope.row.name }}
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="count"
-                  label="月"
-                >
-                  <template slot-scope="scope">
-                    {{start_month.split("-")[1]}}
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="count"
-                  label="IPTH"
-                >
-                  <template slot-scope="scope">
-                    {{scope.row.ipth}}
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="count"
-                  label="血红蛋白"
-                >
-                  <template slot-scope="scope">
-                    {{scope.row.xhdb}}
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="count"
-                  label="血钾"
-                >
-                  <template slot-scope="scope">
-                    {{scope.row.xuejia}}
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="count"
-                  label="白蛋白"
-                >
-                  <template slot-scope="scope">
-                    {{scope.row.bdb}}
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="count"
-                  label="血磷"
-                >
-                  <template slot-scope="scope">
-                    {{scope.row.xuelin}}
-                  </template>
-                </el-table-column>
+<!--                <el-table-column type="index" label="序号" align="center" width="60">-->
+<!--                </el-table-column>-->
+<!--                <el-table-column-->
+<!--                  prop="count"-->
+<!--                  label="姓名"-->
+<!--                >-->
+<!--                  <template slot-scope="scope">-->
+<!--                    {{ scope.row.name }}-->
+<!--                  </template>-->
+<!--                </el-table-column>-->
+<!--                <el-table-column-->
+<!--                  prop="count"-->
+<!--                  label="月"-->
+<!--                >-->
+<!--                  <template slot-scope="scope">-->
+<!--                    {{start_month.split("-")[1]}}-->
+<!--                  </template>-->
+<!--                </el-table-column>-->
+<!--                <el-table-column-->
+<!--                  prop="count"-->
+<!--                  label="IPTH"-->
+<!--                >-->
+<!--                  <template slot-scope="scope">-->
+<!--                    {{scope.row.ipth}}-->
+<!--                  </template>-->
+<!--                </el-table-column>-->
+<!--                <el-table-column-->
+<!--                  prop="count"-->
+<!--                  label="血红蛋白"-->
+<!--                >-->
+<!--                  <template slot-scope="scope">-->
+<!--                    {{scope.row.xhdb}}-->
+<!--                  </template>-->
+<!--                </el-table-column>-->
+<!--                <el-table-column-->
+<!--                  prop="count"-->
+<!--                  label="血钾"-->
+<!--                >-->
+<!--                  <template slot-scope="scope">-->
+<!--                    {{scope.row.xuejia}}-->
+<!--                  </template>-->
+<!--                </el-table-column>-->
+<!--                <el-table-column-->
+<!--                  prop="count"-->
+<!--                  label="白蛋白"-->
+<!--                >-->
+<!--                  <template slot-scope="scope">-->
+<!--                    {{scope.row.bdb}}-->
+<!--                  </template>-->
+<!--                </el-table-column>-->
+<!--                <el-table-column-->
+<!--                  prop="count"-->
+<!--                  label="血磷"-->
+<!--                >-->
+<!--                  <template slot-scope="scope">-->
+<!--                    {{scope.row.xuelin}}-->
+<!--                  </template>-->
+<!--                </el-table-column>-->
+
+                  <el-table-column v-for="column in columns" :key="column.prop" :prop="column.prop?column.prop:''" :label="column.label?column.label:''">
+                  </el-table-column>
+
               </el-table>
             </div>
           </div>
@@ -119,7 +123,10 @@ export default {
         BreadCrumb,
     },
     data() {
+
         return {
+          tableData: [], // 数据源
+          columns: [], // 表头
           start_month:new Date(new Date().getFullYear(), new Date().getMonth()).toLocaleDateString('en-CA'),
           start_time: new Date(new Date().getFullYear(), new Date().getMonth(), 1).toLocaleDateString('en-CA'),
           end_time: new Date(new Date().getFullYear(), new Date().getMonth() + 1, 0).toLocaleDateString('en-CA'),
@@ -201,6 +208,24 @@ export default {
         GetFiveInstatistisc(params).then(response => {
           if (response.data.state == 1) {
             this.patientTableData  =  response.data.data.list
+
+            this.columns = Object.keys(response.data.data.list[0]).map(key => ({
+              prop: key,
+              label: key // 可以自定义表头名称
+            }));
+            // this.tableData = response.data.data.list
+
+
+            this.tableData = response.data.data.list.map(row => {
+              let newRow = {};
+              for (let key in row) {
+                newRow[key] = row[key] === 0 ? '' : row[key];
+              }
+              return newRow;
+            });
+
+            // 将 JSON 数据设置为表格数据
+
           } else {
             this.$message.error(response.data.msg)
           }
@@ -219,6 +244,21 @@ export default {
     },created() {
       this.getData()
 
+  },computed: {
+    processedTableData() {
+      // 处理数据，将值为0的情况设为空字符串
+      return this.tableData.map(row => {
+        let newRow = {};
+        for (let key in row) {
+          if (row[key] === 0) {
+            newRow[key] = '';
+          } else {
+            newRow[key] = row[key];
+          }
+        }
+        return newRow;
+      });
+    }
   }
 }
 </script>

src/xt_pages/dialysis/template/DialysisPrintOrderSop.vue

@@ -8,7 +8,7 @@
         <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;">
           <tbody>
             <tr>
-              <td width="80">治疗日期: <span>{{ year }}</span>年<span>{{ months }}</span>月<span>{{ day }}</span>日</td>
+              <td width="80" style="line-height:30px;">治疗日期: <span>{{ year }}</span>年<span>{{ months }}</span>月<span>{{ day }}</span>日</td>
             </tr>
           </tbody>
         </table>
@@ -16,7 +16,7 @@
           <tbody>
             <tr>
               <td colspan="3">
-                <div style="display: flex;">
+                <div style="display: flex;line-height:30px;">
                   <div style="flex: 1;">
                     姓 名:{{ patientInfo.name ? patientInfo.name : "/" }}
                   </div>
@@ -33,7 +33,7 @@
 
             <tr>
               <td colspan="3">
-                <div>
+                <div style="line-height:30px;">
                   上机前病情:
                   <label-box :isChecked="predialysis.symptom_before_dialysis==''?true :false" showValue="无特殊"></label-box>&nbsp;
                   <label-box :isChecked="predialysis.symptom_before_dialysis!=''?true :false" showValue="出现:"></label-box>
@@ -45,7 +45,7 @@
 
             <tr>
               <td colspan="2">
-                <div>
+                <div style="line-height:30px;">
                   治疗方式:
                   <label-box :isChecked="prescription.mode=='HD'?true :false" showValue="HD"></label-box>&nbsp;
                   <label-box :isChecked="prescription.mode=='HDF'?true :false" showValue="HDF"></label-box>
@@ -57,7 +57,7 @@
                   <span v-if="prescription.mode!='HDF' && prescription.mode!='HD'">{{ prescription.mode }}</span>
                 </div>
               </td>
-              <td >
+              <td style="line-height:30px;">
                 治疗时间：
                 {{ afterdialysis.actual_treatment_hour ? afterdialysis.actual_treatment_hour : "0" }}小时
                 {{ afterdialysis.actual_treatment_minute ? afterdialysis.actual_treatment_minute : 0 }}分
@@ -66,14 +66,14 @@
 
             <tr>
               <td colspan="3">
-                <div style="display: flex;">
+                <div style="display: flex;line-height:30px;">
                   <span>治疗抗凝:</span>
                   <span v-if="prescription.anticoagulant !='普通肝素' && prescription.anticoagulant!='无肝素' && prescription.anticoagulant!='枸橼酸'">
-                    {{ prescription.anticoagulant }} &nbsp;&nbsp; 
+                    {{ prescription.anticoagulant }} &nbsp;&nbsp;
                     {{prescription.anticoagulant_zongliang ? prescription.anticoagulant_zongliang : "0"}}
-                  </span>U&nbsp;&nbsp; 
+                  </span>U&nbsp;&nbsp;
                   <!-- <span v-if="prescription.anticoagulant !='普通肝素' && prescription.anticoagulant!='无肝素' && prescription.anticoagulant!='枸橼酸'">
-                    
+
                   </span>U &nbsp;&nbsp; -->
                   <label-box :isChecked="prescription.anticoagulant=='普通肝素'?true :false" showValue="普通肝素:"></label-box>&nbsp;&nbsp;
                   <div style="display: inline-block;">
@@ -99,7 +99,7 @@
 
             <tr>
               <td colspan="2">
-                <div>
+                <div style="line-height:30px;">
                  <span>处方脱水量: {{ prescription.prescription_water ? prescription.prescription_water : "" }} </span>ml &nbsp;&nbsp;
                  <span>透析液流量: {{ prescription.dialysate_flow ? prescription.dialysate_flow : "" }} </span>ml/h
                 </div>
@@ -119,10 +119,10 @@
         </table>
         <table border="1" class="table-box" style="border-collapse: collapse;">
           <tr>
-            <td style="width: 20%;">透析机：
+            <td style="width: 20%; line-height: 30px;">透析机：
               {{predialysis.machine_type ? predialysis.machine_type : " "}}
             </td>
-            <td style="width: 30%;">
+            <td style="width: 30%;line-height: 30px;">
               透析(滤)器:
               {{ prescription.dialysis_dialyszers ? prescription.dialysis_dialyszers : "" }}
 
@@ -153,7 +153,7 @@
 
           <tr>
             <td colspan="3">
-              <div style="display: inline-block;">
+              <div style="display: inline-block;line-height: 30px;">
                 血管通路:
                 <label-box :isChecked="predialysis.blood_access_part_opera_name=='内瘘'?true :false" showValue="内瘘"></label-box>&nbsp;
                 <label-box :isChecked="predialysis.blood_access_part_opera_name=='长期静脉导管'?true :false" showValue="长期静脉导管"></label-box>&nbsp;
@@ -162,14 +162,14 @@
                             predialysis.blood_access_part_opera_name!='长期静脉导管' &&
                             predialysis.blood_access_part_opera_name!='临时静脉导管' &&
                             predialysis.blood_access_part_opera_name!=''?true :false" showValue="其它">
-                </label-box> 
+                </label-box>
               </div>&nbsp;&nbsp;
-              <div style="display: inline-block;">
+              <div style="display: inline-block;line-height: 30px;">
                 穿刺者:
                 <span v-if="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse) == ''">
                   {{ getAdminUser(dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse) }}
                 </span>
-                <img class="es-img" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse)" alt="" srcset="" v-else />
+                <img class="es-img" style="height:30px;" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse)" alt="" srcset="" v-else />
               </div>
             </td>
 
@@ -179,7 +179,7 @@
         <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;">
           <tbody>
             <tr>
-              <td colspan="12">治疗过程记录</td>
+              <td colspan="12" style="padding: 5px;">治疗过程记录</td>
             </tr>
             <tr>
               <td rowspan="2">时间</td>
@@ -192,7 +192,7 @@
               <td>静脉压<br/>mmHg</td>
               <td>血流量<br/>ml/min</td>
               <td>脱水量<br/>ml</td>
-              <td>T<br/>℃</td>
+              <td>超滤率<br/>ml/h</td>
               <td>HR<br/>bpm</td>
               <td>R<br/>bpm</td>
               <td>BP<br/>mmHg</td>
@@ -201,7 +201,7 @@
               <td>记录</td>
             </tr>
             <tr v-for="(monitor, monindex) in monitors" :key="monindex">
-              <td>{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
+              <td style="height: 30px;">{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
               <td>{{
                 monitor.transmembrane_pressure ? monitor.transmembrane_pressure : ""
                 }}
@@ -209,7 +209,7 @@
               <td>{{ monitor.venous_pressure ? monitor.venous_pressure : "" }}</td>
               <td>{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "0" }}</td>
               <td>{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : ""}}</td>
-              <td>{{ monitor.temperature ? monitor.temperature : "0" }}</td>
+              <td>{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : "0" }}</td>
               <td>{{ monitor.pulse_frequency ? monitor.pulse_frequency : "0" }}</td>
               <td>{{ monitor.breathing_rate ? monitor.breathing_rate : "0" }}</td>
               <td>{{
@@ -235,29 +235,29 @@
           <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;">
             <tbody>
               <tr>
-                <td style="width:12%;height:25px">
-                  <p style="height:20px;line-height:20px">时间</p>
+                <td style="width:12%;height:25px;">
+                  <p style="height:30px;line-height:30px">时间</p>
                 </td>
                 <td style="width:120px;height:25px">
-                  <p style="height:20px;line-height:20px">医嘱执行记录</p>
+                  <p style="height:30px;line-height:30px">医嘱执行记录</p>
                 </td>
                 <td style="width:10%;height:25px">
-                  <p style="height:20px;line-height:20px">执行</p>
+                  <p style="height:30px;line-height:30px">执行</p>
                 </td>
                 <td style="width:10%;height:25px">
-                  <p style="height:20px;line-height:20px">核对</p>
+                  <p style="height:30px;line-height:30px">核对</p>
                 </td>
-                <td style="width:15%;height:25px">
-                  <p style="height:20px;line-height:20px">上次透后体重</p>
+                <td style="width:15%;height:27px">
+                  <p style="height:30px;line-height:30px">上次透后体重</p>
                 </td>
-                <td style="width:10%;height:25px">
+                <td style="width:10%;line-height:30px">
                   {{ assessmentafter.weight_after ? assessmentafter.weight_after : "0" }}kg
                 </td>
               </tr>
 
               <tr v-for="(advice, advice_index) in tableAdvice" :key="advice_index">
-                <td style="">{{ getTime(advice.start_time, "{y}-{m}-{d} {h}:{i}") }}</td>
-                <td>
+                <td style="height:30px;line-height:30px">{{ getTime(advice.start_time, "{y}-{m}-{d} {h}:{i}") }}</td>
+                <td style="height:30px;line-height:30px">
                   <span v-if="advice.parent_id > 0">---></span>
                   <span>{{ advice.advice_name }}</span>
                   <span v-if="advice && advice.advice_desc">({{ advice.advice_desc }}{{ advice.drug_spec_unit }})</span>
@@ -266,11 +266,11 @@
                   <span v-if="advice.parent_id == 0">{{ advice.delivery_way }}</span>
                   <span v-if="advice.parent_id == 0">{{ advice.execution_frequency }}</span>
                 </td>
-                <td>
+                <td style="height:30px;line-height:30px">
                   <span v-if="setAdminUserES(advice.execution_staff) == ''">{{ getAdminUser(advice.execution_staff) }}</span>
                   <img style="height:40px;" :src="setAdminUserES(advice.execution_staff)" alt="" srcset="" v-else />
                 </td>
-                <td>
+                <td style="height:30px;line-height:30px">
                   <span v-if="setAdminUserES(advice.checker) == ''">{{ getAdminUser(advice.checker) }}</span>
                   <img style="height:40px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else />
                 </td>
@@ -830,6 +830,8 @@ export default {
           }
 
           if (tableAdvice.length >= 6) {
+            var obj = { advice_name: "", start_time: "" };
+            tableAdvice.push(obj);
             this.tableAdvice = tableAdvice;
           }
           this.afterdialysis = response.data.data.AssessmentAfterDislysis;
@@ -1377,7 +1379,7 @@ export default {
 
 .dialysis-print-order .table-box {
   width: 100%;
-  line-height: 23px;
+  line-height: 25px;
   font-size: 14px;
 
 }

src/xt_pages/dialysis/template/DialysisPrintOrderseventyone.vue

@@ -1061,6 +1061,8 @@ export default {
           }
 
           if (tableAdvice.length >= 6) {
+            var obj = { advice_name: "", start_time: "" };
+            tableAdvice.push(obj);
             this.tableAdvice = tableAdvice;
           }
           this.afterdialysis = response.data.data.AssessmentAfterDislysis;

src/xt_pages/outpatientCharges/allListPrint.vue

@@ -11,12 +11,12 @@
       </el-button
       >
     </template>
-
+<!--  -->
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne  v-if="org_id != 10215  && org_id !=9671&&org_id !=9675&& org_id !=10515 && org_id !=10489 && org_id !=0" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printOne>
+      <printOne  v-if="org_id != 10215  && org_id !=9671&&org_id !=9675&& org_id !=10515 && org_id !=10489  " :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printOne>
       <summary-print v-if="org_id == 10215|| org_id ==9671 ||org_id ==9675" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></summary-print>
       <printTwo v-if="org_id==10515 " :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printTwo>
-      <printthree  v-if="org_id == 10489 || org_id==0" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printthree>
+      <printthree  v-if="org_id == 10489" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printthree>
 <!--      <list-print-two :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></list-print-two>-->
     </div>
   </div>

src/xt_pages/outpatientCharges/allListTemplate/printOne.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="allList-print" class="allList-print">
-    <div v-for='(i,index) in pageArr.length' :key="index" style="page-break-after: always;">
+    <div v-for='(i,index) in pageArr.length' :key="index">
       <div class="allListTitle">{{ $store.getters.xt_user.org.org_name }}费用汇总</div>
       <div class="allListInfo">
         <div>患者姓名：{{ patient.name }}</div>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1990,9 +1990,11 @@ export default {
               //   }
               //   tempAddition.push(obj)
               // }
+              console.log("test2")
+
 
               var preTime = nowTime
-              if ( this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
+              if ( this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375 && this.$store.getters.xt_user.org.id != 0) {
                 if (prescription.pre_time == 0) {
                   if (this.schedule.schedule_type == 1) {
                     if (this.org_id == 10028) {
@@ -2016,9 +2018,27 @@ export default {
                 } else {
                   preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                 }
+
               } else {
+                console.log("test")
                 if (prescription.pre_time == 0) {
-                  preTime = nowTime
+                  console.log("++=========")
+                  console.log(nowTime.split(" ")[0])
+                  console.log(this.record_date)
+                  console.log("++=========")
+
+                  if(nowTime.split(" ")[0] != this.record_date){
+                    // preTime = this.record_date
+                    if(this.schedule.schedule_type == 1){
+                      preTime = this.record_date + ' ' + '7:00'
+                    }else if(this.schedule.schedule_type == 2){
+                      preTime = this.record_date + ' ' + '11:00'
+
+                    }else{
+                      preTime = this.record_date + ' ' + '17:00'
+                    }
+
+                  }
                 } else {
                   preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                 }
@@ -2039,8 +2059,9 @@ export default {
               }
               this.prescriptions.push(obj)
             }
-          } else {
 
+          } else {
+            console.log("----======0000000")
             if (response.data.data.count <= 1 && response.data.data.schedule.id > 0 && response.data.data.sch_prescriptions.length > 0) {
               for (let i = 0; i < response.data.data.sch_prescriptions.length; i++) {
                 var prescription = response.data.data.sch_prescriptions[i]
@@ -2183,6 +2204,20 @@ export default {
                     preTime = this.record_date + ' ' + '17:00'
                   }
                 }
+                console.log("++=========")
+                console.log(nowTime.split(" ")[0])
+                console.log(this.record_date)
+                console.log("++=========")
+                if(nowTime.split(" ")[0] != this.record_date){
+                  if(this.schedule.schedule_type == 1){
+                    preTime = this.record_date + ' ' + '7:00'
+                  }else if(this.schedule.schedule_type == 2){
+                    preTime = this.record_date + ' ' + '11:00'
+
+                  }else{
+                    preTime = this.record_date + ' ' + '17:00'
+                  }
+                }
 
                 let index = i + 1
                 let obj = {
@@ -2217,6 +2252,25 @@ export default {
               }
 
             } else {
+              console.log("----======1111111")
+              console.log(nowTime.split(" ")[0])
+              console.log(this.record_date)
+
+              if(nowTime.split(" ")[0] != this.record_date){
+                // preTime = this.record_date
+                if(this.schedule.schedule_type == 1){
+                  preTime = this.record_date + ' ' + '7:00'
+                }else if(this.schedule.schedule_type == 2){
+                  preTime = this.record_date + ' ' + '11:00'
+
+                }else{
+                  preTime = this.record_date + ' ' + '17:00'
+                }
+
+              }else{
+
+                preTime = nowTime
+              }
               let obj = {
                 id: 0,
                 name: '处方' + 1,
@@ -2224,7 +2278,7 @@ export default {
                 project: [],
                 addition: [],
                 order_status: 0,
-                pre_time: nowTime,
+                pre_time: preTime,
                 med_type: '',
                 is_medicine_status: false
               }
@@ -2523,7 +2577,17 @@ export default {
                       }
                     } else {
                       if (prescription.pre_time == 0) {
-                        preTime = nowTime
+                        if(nowTime.split(" ")[0] != this.record_date){
+                          if(this.schedule.schedule_type == 1){
+                            preTime = this.record_date + ' ' + '7:00'
+                          }else if(this.schedule.schedule_type == 2){
+                            preTime = this.record_date + ' ' + '11:00'
+
+                          }else{
+                            preTime = this.record_date + ' ' + '17:00'
+                          }
+                        }
+                        // preTime = nowTime
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                       }
@@ -2692,6 +2756,16 @@ export default {
                           preTime = this.record_date + ' ' + '17:00'
                         }
                       }
+                      if(nowTime.split(" ")[0] != this.record_date){
+                        if(this.schedule.schedule_type == 1){
+                          preTime = this.record_date + ' ' + '7:00'
+                        }else if(this.schedule.schedule_type == 2){
+                          preTime = this.record_date + ' ' + '11:00'
+
+                        }else{
+                          preTime = this.record_date + ' ' + '17:00'
+                        }
+                      }
 
                       let index = i + 1
                       let obj = {
@@ -2724,6 +2798,18 @@ export default {
                     }
 
                   } else {
+                    if(nowTime.split(" ")[0] != this.record_date){
+                      if(this.schedule.schedule_type == 1){
+                        preTime = this.record_date + ' ' + '7:00'
+                      }else if(this.schedule.schedule_type == 2){
+                        preTime = this.record_date + ' ' + '11:00'
+
+                      }else{
+                        preTime = this.record_date + ' ' + '17:00'
+                      }
+                    }else{
+                      preTime = nowTime
+                    }
                     let obj = {
                       id: 0,
                       name: '处方' + 1,
@@ -2731,7 +2817,7 @@ export default {
                       project: [],
                       addition: [],
                       order_status: 0,
-                      pre_time: nowTime,
+                      pre_time: preTime,
                       med_type: ''
 
                     }
@@ -3091,7 +3177,17 @@ export default {
                     var preTime = ''
 
                     if (prescription.pre_time == 0) {
-                      preTime = nowTime
+                      // preTime = nowTime
+                      if(nowTime.split(" ")[0] != this.record_date){
+                        if(this.schedule.schedule_type == 1){
+                          preTime = this.record_date + ' ' + '7:00'
+                        }else if(this.schedule.schedule_type == 2){
+                          preTime = this.record_date + ' ' + '11:00'
+
+                        }else{
+                          preTime = this.record_date + ' ' + '17:00'
+                        }
+                      }
                     } else {
                       preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                     }
@@ -3232,6 +3328,16 @@ export default {
                       }
 
                       var preTime = nowTime
+                      if(nowTime.split(" ")[0] != this.record_date){
+                        if(this.schedule.schedule_type == 1){
+                          preTime = this.record_date + ' ' + '7:00'
+                        }else if(this.schedule.schedule_type == 2){
+                          preTime = this.record_date + ' ' + '11:00'
+
+                        }else{
+                          preTime = this.record_date + ' ' + '17:00'
+                        }
+                      }
 
                       let index = i + 1
                       let obj = {
@@ -3262,6 +3368,19 @@ export default {
                     }
 
                   } else {
+                    if(nowTime.split(" ")[0] != this.record_date){
+                      if(this.schedule.schedule_type == 1){
+                        preTime = this.record_date + ' ' + '7:00'
+                      }else if(this.schedule.schedule_type == 2){
+                        preTime = this.record_date + ' ' + '11:00'
+
+                      }else{
+                        preTime = this.record_date + ' ' + '17:00'
+                      }
+                    }else{
+
+                      preTime = nowTime
+                    }
                     let obj = {
                       id: 0,
                       name: '处方' + 1,
@@ -3269,7 +3388,7 @@ export default {
                       project: [],
                       addition: [],
                       order_status: 0,
-                      pre_time: nowTime,
+                      pre_time: preTime,
                       med_type: ''
 
                     }
@@ -3614,7 +3733,17 @@ export default {
                   var preTime = ''
 
                   if (prescription.pre_time == 0) {
-                    preTime = nowTime
+                    // preTime = nowTime
+                    if(nowTime.split(" ")[0] != this.record_date){
+                      if(this.schedule.schedule_type == 1){
+                        preTime = this.record_date + ' ' + '7:00'
+                      }else if(this.schedule.schedule_type == 2){
+                        preTime = this.record_date + ' ' + '11:00'
+
+                      }else{
+                        preTime = this.record_date + ' ' + '17:00'
+                      }
+                    }
                   } else {
                     preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                   }
@@ -3754,6 +3883,16 @@ export default {
                     }
 
                     var preTime = nowTime
+                    if(nowTime.split(" ")[0] != this.record_date){
+                      if(this.schedule.schedule_type == 1){
+                        preTime = this.record_date + ' ' + '7:00'
+                      }else if(this.schedule.schedule_type == 2){
+                        preTime = this.record_date + ' ' + '11:00'
+
+                      }else{
+                        preTime = this.record_date + ' ' + '17:00'
+                      }
+                    }
 
                     let index = i + 1
                     let obj = {
@@ -3785,6 +3924,19 @@ export default {
                   }
 
                 } else {
+                  if(nowTime.split(" ")[0] != this.record_date){
+                    if(this.schedule.schedule_type == 1){
+                      preTime = this.record_date + ' ' + '7:00'
+                    }else if(this.schedule.schedule_type == 2){
+                      preTime = this.record_date + ' ' + '11:00'
+
+                    }else{
+                      preTime = this.record_date + ' ' + '17:00'
+                    }
+                  }else{
+
+                    preTime = nowTime
+                  }
                   let obj = {
                     id: 0,
                     name: '处方' + 1,
@@ -3792,7 +3944,7 @@ export default {
                     project: [],
                     addition: [],
                     order_status: 0,
-                    pre_time: nowTime,
+                    pre_time: preTime,
                     med_type: ''
 
                   }
@@ -4250,8 +4402,19 @@ export default {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                       }
                     } else {
+                      console.log("0---00000000000")
                       if (prescription.pre_time == 0) {
-                        preTime = nowTime
+                        // preTime = nowTime
+                        if(nowTime.split(" ")[0] != this.record_date){
+                          if(this.schedule.schedule_type == 1){
+                            preTime = this.record_date + ' ' + '7:00'
+                          }else if(this.schedule.schedule_type == 2){
+                            preTime = this.record_date + ' ' + '11:00'
+
+                          }else{
+                            preTime = this.record_date + ' ' + '17:00'
+                          }
+                        }
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                       }
@@ -4416,6 +4579,16 @@ export default {
                           preTime = this.record_date + ' ' + '17:00'
                         }
                       }
+                      if(nowTime.split(" ")[0] != this.record_date){
+                        if(this.schedule.schedule_type == 1){
+                          preTime = this.record_date + ' ' + '7:00'
+                        }else if(this.schedule.schedule_type == 2){
+                          preTime = this.record_date + ' ' + '11:00'
+
+                        }else{
+                          preTime = this.record_date + ' ' + '17:00'
+                        }
+                      }
 
                       let index = i + 1
                       let obj = {
@@ -4453,6 +4626,21 @@ export default {
                     }
 
                   } else {
+
+                    if(nowTime.split(" ")[0] != this.record_date){
+                      if(this.schedule.schedule_type == 1){
+                        preTime = this.record_date + ' ' + '7:00'
+                      }else if(this.schedule.schedule_type == 2){
+                        preTime = this.record_date + ' ' + '11:00'
+
+                      }else{
+                        preTime = this.record_date + ' ' + '17:00'
+                      }
+                    }else{
+                      preTime = nowTime
+                    }
+
+
                     let obj = {
                       id: 0,
                       name: '处方' + 1,
@@ -4460,7 +4648,7 @@ export default {
                       project: [],
                       addition: [],
                       order_status: 0,
-                      pre_time: nowTime,
+                      pre_time: preTime,
                       med_type: ''
 
                     }
@@ -4472,122 +4660,6 @@ export default {
 
                     this.prescriptions.push(obj)
 
-                    // if(response.data.data.count <= 1 ){
-                    //   if(response.data.data.last_prescriptions.length == 0){
-                    //     let obj = {
-                    //       id: 0,
-                    //       name: '处方' + 1,
-                    //       advices: [],
-                    //       project: [],
-                    //       addition: [],
-                    //       order_status: 0,
-                    //       pre_time: nowTime,
-                    //
-                    //     };
-                    //     this.prescriptions.push(obj)
-                    //
-                    //
-                    //   }
-                    //   else {
-                    //     for (let i = 0; i < response.data.data.last_prescriptions.length; i++) {
-                    //       var prescription = response.data.data.last_prescriptions[i];
-                    //       let tempAdvice = [];
-                    //       let tempProject = [];
-                    //       let tempAddition = [];
-                    //
-                    //       //药品
-                    //       for (let b = 0; b < prescription.advices.length; b++) {
-                    //         let obj = {
-                    //           advice_id:0,
-                    //           drug_name: prescription.advices[b].advice_name,
-                    //           single_dose: prescription.advices[b].single_dose,
-                    //           delivery_way: prescription.advices[b].delivery_way,
-                    //           execution_frequency: prescription.advices[b].execution_frequency,
-                    //           retail_price: prescription.advices[b].price.toString(),
-                    //           remark: prescription.advices[b].remark,
-                    //           day: prescription.advices[b].day,
-                    //           prescribing_number: prescription.advices[b].prescribing_number.toString(),
-                    //           single_dose_unit: prescription.advices[b].single_dose_unit,
-                    //           prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
-                    //           medical_insurance_number: prescription.advices[b].med_list_codg,
-                    //           id: prescription.advices[b].drug_id,
-                    //           drug:prescription.advices[b].drug
-                    //
-                    //         };
-                    //         tempAdvice.push(obj)
-                    //       }
-                    //
-                    //       //项目
-                    //       for (let b = 0; b < prescription.project.length; b++) {
-                    //         let obj = {
-                    //           id:0,
-                    //           project_id: prescription.project[b].project_id,
-                    //           project_name: prescription.project[b].project.project_name,
-                    //           statistical_classification: prescription.project[b].project.statistical_classification,
-                    //           single_dose: prescription.project[b].single_dose,
-                    //           delivery_way: prescription.project[b].delivery_way,
-                    //           execution_frequency: prescription.project[b].execution_frequency,
-                    //           number_days: prescription.project[b].day,
-                    //           total: prescription.project[b].count.toString(),
-                    //           price: prescription.project[b].price,
-                    //           remark: prescription.project[b].remark,
-                    //           medical_code: prescription.project[b].project.medical_code,
-                    //           unit: prescription.project[b].project.unit,
-                    //           type: prescription.project[b].type
-                    //         };
-                    //
-                    //         if (prescription.project[b].type == 2) {
-                    //           obj['statistical_classification'] = prescription.project[b].project.statistical_classification
-                    //           obj['medical_code'] = prescription.project[b].project.medical_code
-                    //           obj['project_name'] = prescription.project[b].project.project_name
-                    //
-                    //         } else if (prescription.project[b].type == 3) {
-                    //           obj['statistical_classification'] = ""
-                    //           obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
-                    //           obj['project_name'] = prescription.project[b].good_info.good_name
-                    //         }
-                    //         tempProject.push(obj)
-                    //       }
-                    //
-                    //       //附加收费
-                    //       for (let b = 0; b < prescription.addition.length; b++) {
-                    //         let obj = {
-                    //           item_name: prescription.addition[b].item_name,
-                    //           price: prescription.addition[b].price,
-                    //           count: prescription.addition[b].count,
-                    //           item_id: prescription.addition[b].item_id,
-                    //         };
-                    //         tempAddition.push(obj)
-                    //       }
-                    //
-                    //       var preTime = nowTime
-                    //
-                    //       let index = i + 1;
-                    //       let obj = {
-                    //         id: 0,
-                    //         name: '处方' + index,
-                    //         advices: tempAdvice,
-                    //         project: tempProject,
-                    //         addition: tempAddition,
-                    //         order_status: 1,
-                    //         pre_time: preTime
-                    //       };
-                    //       this.prescriptions.push(obj)
-                    //     }
-                    //   }
-                    // }else{
-                    //   let obj = {
-                    //     id: 0,
-                    //     name: '处方' + 1,
-                    //     advices: [],
-                    //     project: [],
-                    //     addition: [],
-                    //     order_status: 0,
-                    //     pre_time: nowTime,
-                    //
-                    //   };
-                    //   this.prescriptions.push(obj)
-                    // }
                   }
                 }
                 console.log("jin5")
@@ -4935,6 +5007,16 @@ export default {
                     } else {
                       if (prescription.pre_time == 0) {
                         preTime = nowTime
+                        if(nowTime.split(" ")[0] != this.record_date){
+                          if(this.schedule.schedule_type == 1){
+                            preTime = this.record_date + ' ' + '7:00'
+                          }else if(this.schedule.schedule_type == 2){
+                            preTime = this.record_date + ' ' + '11:00'
+
+                          }else{
+                            preTime = this.record_date + ' ' + '17:00'
+                          }
+                        }
 
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
@@ -5101,6 +5183,16 @@ export default {
                           preTime = this.record_date + ' ' + '17:00'
                         }
                       }
+                      if(nowTime.split(" ")[0] != this.record_date){
+                        if(this.schedule.schedule_type == 1){
+                          preTime = this.record_date + ' ' + '7:00'
+                        }else if(this.schedule.schedule_type == 2){
+                          preTime = this.record_date + ' ' + '11:00'
+
+                        }else{
+                          preTime = this.record_date + ' ' + '17:00'
+                        }
+                      }
 
                       let index = i + 1
                       let obj = {
@@ -5138,6 +5230,21 @@ export default {
                     }
 
                   } else {
+                    if(nowTime.split(" ")[0] != this.record_date){
+                      if(this.schedule.schedule_type == 1){
+                        preTime = this.record_date + ' ' + '7:00'
+                      }else if(this.schedule.schedule_type == 2){
+                        preTime = this.record_date + ' ' + '11:00'
+
+                      }else{
+                        preTime = this.record_date + ' ' + '17:00'
+                      }
+                    }else{
+
+                      preTime = nowTime
+                    }
+
+
                     let obj = {
                       id: 0,
                       name: '处方' + 1,
@@ -5145,7 +5252,7 @@ export default {
                       project: [],
                       addition: [],
                       order_status: 0,
-                      pre_time: nowTime,
+                      pre_time: preTime,
                       med_type: ''
 
                     }