Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/Dialysisanalysis/platelets/all_ktv.vue

@@ -210,7 +210,7 @@
           prop="inspect_value"
           label="结果"
         >
-          <template slot-scope="scope">{{ parseFloat(scope.row.inspect_value).toFixed(2)}}</template>
+          <template slot-scope="scope">{{ parseFloat(scope.row.inspect_value).toFixed(1)}}</template>
         </el-table-column>
 
       </el-table>

src/xt_pages/Dialysisanalysis/platelets/all_urr.vue

@@ -210,7 +210,7 @@
           prop="inspect_value"
           label="结果"
         >
-          <template slot-scope="scope">{{ (scope.row.inspect_value) + '%'}}</template>
+          <template slot-scope="scope">{{ parseFloat(scope.row.inspect_value).toFixed(1) + '%'}}</template>
 
         </el-table-column>
 

src/xt_pages/Dialysisanalysis/platelets/p_ktv.vue

@@ -106,7 +106,7 @@
 
                 <el-table-column width="100" label="KTV" align="center">
                   <template slot-scope="scope">
-                    {{parseFloat(scope.row.value).toFixed(2)}}
+                    {{parseFloat(scope.row.value).toFixed(1)}}
                   </template>
                 </el-table-column>
               </el-table>
@@ -484,7 +484,7 @@ export default {
             for (let i = 0; i < resp.data.inspections.length; i++) {
               let obj = {
                 name:resp.data.patient.name,
-                value:parseFloat(resp.data.inspections[i].inspect_value).toFixed(2),
+                value:parseFloat(resp.data.inspections[i].inspect_value).toFixed(1),
                 inspect_date:resp.data.inspections[i].inspect_date
               }
               this.tableData.push(obj)

src/xt_pages/Dialysisanalysis/platelets/p_urr.vue

@@ -106,7 +106,7 @@
 
                 <el-table-column width="100" label="URR(%)" align="center">
                   <template slot-scope="scope">
-                    {{scope.row.value}}
+                    {{parseFloat(scope.row.value).toFixed(1)}}
                   </template>
                 </el-table-column>
               </el-table>
@@ -484,7 +484,7 @@ export default {
             for (let i = 0; i < resp.data.inspections.length; i++) {
               let obj = {
                 name:resp.data.patient.name,
-                value:resp.data.inspections[i].inspect_value,
+                value:parseFloat(resp.data.inspections[i].inspect_value).toFixed(1),
                 inspect_date:resp.data.inspections[i].inspect_date
               }
               this.tableData.push(obj)

src/xt_pages/dialysis/batch_print/batch_print_order_forty.vue

@@ -790,7 +790,7 @@
                                   <label-box :isChecked="record.assessment_after_dislysis.catheter.indexOf('更换敷料')>-1?true:false" showValue='更换敷料'></label-box>
                               </td>
                               <td width='50'>
-                                  <label-box :isChecked="record.assessment_after_dislysis.catheter.indexOf('干洁')==-1 && record.assessment_after_dislysis.catheter.indexOf('更换敷料')==-1?true:false" showValue='其他'></label-box>
+                                  <label-box :isChecked="record.assessment_after_dislysis.catheter!=''&&record.assessment_after_dislysis.catheter.indexOf('干洁')==-1 && record.assessment_after_dislysis.catheter.indexOf('更换敷料')==-1?true:false" showValue='其他'></label-box>
                               </td>
                               <td width='100'>
                                   <div class="under-line">&nbsp;

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

@@ -2508,7 +2508,7 @@ mu
           }
           if (this.$store.getters.xt_user.org.id == 10016 || this.$store.getters.xt_user.org.id == 10121 || this.$store.getters.xt_user.org.id == 4 || this.$store.getters.xt_user.org.id == 10013 || this.$store.getters.xt_user.org.id == 10014 ||  this.$store.getters.xt_user.org.id == 9970) {
             this.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
-          }else if(this.$store.getters.xt_user.org.id == 10234 || this.$store.getters.xt_user.org.id == 9990 || this.$store.getters.xt_user.org.id==10432){
+          }else if(this.$store.getters.xt_user.org.id == 9990 || this.$store.getters.xt_user.org.id==10432){
             if (schedual.schedule_type == 1) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '06:00'
             } else if (schedual.schedule_type == 2) {
@@ -2572,6 +2572,14 @@ mu
             } else if (schedual.schedule_type == 3) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
             }
+           }else if(this.$store.getters.xt_user.org.id == 10234){
+              if (schedual.schedule_type == 1) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '7:30'
+            } else if (schedual.schedule_type == 2) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '12:00'
+            } else if (schedual.schedule_type == 3) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
+            }
            } else {
             if (schedual.schedule_type == 1) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '07:00'

src/xt_pages/dialysis/doctorLongNewAdvicePrint.vue

@@ -60,6 +60,14 @@
                       <span v-if="it&&it.advice_name == '肝素钠注射剂'">
                         {{getDrugAdviceCount(it.advice_name,item.zone_name)}}  
                       </span>
+
+                      <span v-if="item.child[i]==null && getDrugCount(item.child,it.advice_name)>0">
+                         {{getDrugCount(item.child,it.advice_name)}}
+                         <span v-if="it&&it.advice_name == '肝素钠注射剂'">
+                          {{getDrugAdviceCount(it.advice_name,item.zone_name)}}  
+                        </span>
+                      </span>
+                     
                     </span>
                     <span v-if="item.is_total == 0">
                       {{getAllSumCount(it.advice_name)}}

src/xt_pages/dialysis/doctorNewAdviceStaticPrint.vue

@@ -60,6 +60,12 @@
                       <span v-if="it&&it.advice_name == '肝素钠注射剂'">
                         {{getDrugAdviceCount(it.advice_name,item.zone_name)}}  
                       </span>
+                      <span v-if="item.child[i]==null && getDrugCount(item.child,it.advice_name)>0">
+                        {{getDrugCount(item.child,it.advice_name)}}
+                        <span v-if="it&&it.advice_name == '肝素钠注射剂'">
+                        {{getDrugAdviceCount(it.advice_name,item.zone_name)}}  
+                      </span>
+                      </span>
                     </span>
                     <span v-if="item.is_total == 0">
                       {{getAllSumCount(it.advice_name)}}

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -175,9 +175,9 @@
       </div> -->
 
       <div style="margin-top: 10px;margin-bottom:10px">
-        <el-button type="primary" size="small" @click="toStatic" v-if="org_id!=9671  && org_id!=10340 ">统计</el-button>
+        <el-button type="primary" size="small" @click="toStatic" v-if="org_id!=9671  && org_id!=10340 && org_id!=0 ">统计</el-button>
 
-        <el-button type="primary" size="small" @click="toStaticOne" v-if="org_id == 9671 || org_id==10340">统计</el-button>
+        <el-button type="primary" size="small" @click="toStaticOne" v-if="org_id == 9671 || org_id==10340 || org_id == 0">统计</el-button>
       </div>
 
 
@@ -702,6 +702,12 @@
               <span v-if="item&&item.advice_name == '肝素钠注射剂'">
                  {{getDrugAdviceCount(item.advice_name,scope.row.zone_name)}}
               </span>
+              <span v-if="scope.row.child[index]==null && getDrugCount(scope.row.child,item.advice_name)>0">
+                {{getDrugCount(scope.row.child,item.advice_name)}}
+                <span v-if="item&&item.advice_name == '肝素钠注射剂'">
+                 {{getDrugAdviceCount(item.advice_name,scope.row.zone_name)}}
+              </span>
+              </span>
             </span>
             <span v-if="scope.row.is_total == 0">
                  {{getAllSumCount(item.advice_name)}}

src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue

@@ -1127,7 +1127,7 @@
                           <label-box :isChecked="afterdialysis.catheter.indexOf('更换敷料')>-1?true:false" showValue='更换敷料'></label-box>
                       </td>
                       <td width='50'>
-                          <label-box :isChecked="afterdialysis.catheter.indexOf('干洁')==-1 && afterdialysis.catheter.indexOf('更换敷料')==-1?true:false" showValue='其他'></label-box>
+                          <label-box :isChecked="afterdialysis.catheter!=''&& afterdialysis.catheter.indexOf('干洁')==-1 && afterdialysis.catheter.indexOf('更换敷料')==-1?true:false" showValue='其他'></label-box>
                       </td>
                       <td width='100'>
                           <div class="under-line">&nbsp;

src/xt_pages/dialysis/template/DialysisPrintOrdersixtySeven.vue

@@ -38,11 +38,9 @@
                 <td>姓名：{{ patientInfo.name }}</td>
                 <td>性别： {{ patientInfo_gender_1 ? "男" : "女" }}</td>
                 <td>年龄：{{ getAge(patientInfo) }}</td>
-                <td>门诊号： {{
-                    patientInfo.admission_number
-                      ? patientInfo.admission_number
-                      : "/"
-                  }}</td>
+                <td>门诊号：
+                  {{patientInfo.dialysis_no}}
+                </td>
               </tr>
               <tr>
                 <td>病床床号：
@@ -57,8 +55,7 @@
                   </span>
                 </td>
                 <td>治疗时间：
-                  {{afterdialysis.actual_treatment_hour }}<span v-if="afterdialysis.actual_treatment_hour>0">时</span>
-                  <span v-if="afterdialysis.actual_treatment_minute>0">{{afterdialysis.actual_treatment_minute>0}}</span> {{afterdialysis.actual_treatment_minute }}<span v-if="afterdialysis.actual_treatment_minute>0">分</span>
+                  {{getTime(prescription.record_date,"{y}-{m}-{d}") }}
                 </td>
                 <td>干体重：{{ predialysis.dry_weight ? predialysis.dry_weight : "/" }}kg</td>
                 <td>上次透后体重：
@@ -73,25 +70,36 @@
                 </td>
                 <td>透析总次数：{{ patientInfo.total_dialysis + patientInfo.user_sys_before_count }}</td>
                 <td colspan="2">患者评估：
-                  {{ receiverTreatmentAccess.sick_condition ? receiverTreatmentAccess.sick_condition : "/" }}
+                  入科方式:
+                  <span v-if="receiverTreatmentAccess.way == 1">步行</span>
+                  <span v-if="receiverTreatmentAccess.way == 2">扶行</span>
+                  <span v-if="receiverTreatmentAccess.way == 3">轮椅</span>
+                  <span v-if="receiverTreatmentAccess.way == 4">平车</span>
+
+                  意识:
+                  <span v-if="receiverTreatmentAccess.consciousness == 1">清醒</span>
+                  <span v-if="receiverTreatmentAccess.consciousness == 2">嗜睡</span>
+                  <span v-if="receiverTreatmentAccess.consciousness == 4">模糊</span>
+                  <span v-if="receiverTreatmentAccess.consciousness == 3">昏迷</span>
                 </td>
               </tr>
               <tr>
                 <td colspan="4">
-                  <span style="width: 14%;">血管通路：
+                  <span>血管通路：
                     {{ predialysis.blood_access_part_opera_name }}
                   </span>
-                  <span style="width: 14%;">部位：
+                  <span>部位：
                     {{ predialysis.blood_access_part_id }}
                  </span>
-                  <span style="width: 14%;">通路评估：
+                  <span>通路评估：
+                     内瘘：
+                     <span v-if="predialysis.internal_fistula.indexOf('自体内瘘') >-1">自体内瘘</span>
                      <span v-if="predialysis.internal_fistula.indexOf('震颤-存在') >-1">震颤-存在</span>
                      <span v-if="predialysis.internal_fistula.indexOf('震颤-减弱') >-1">震颤-减弱</span>
                      <span v-if="predialysis.internal_fistula.indexOf('震颤-无') >-1">震颤-无</span>
 
                   </span>
-                  <!-- <span style="width: 14%;">震颤：</span> -->
-                  <!-- <span style="width: 14%;">外观：</span> -->
+                
                   <span style="width: 14%;">置换方式：
                     {{
                       getDisplaceLiquiPart(prescription.displace_liqui_part)
@@ -182,6 +190,44 @@
               <tr>
                 <td colspan="4">抗凝剂：
                   {{prescription.anticoagulant_name?prescription.anticoagulant_name : "/"}}
+                  首剂：{{ prescription.anticoagulant_shouji ? prescription.anticoagulant_shouji: ""}}
+                  <span>
+                    <span v-if="prescription.anticoagulant == 4">iu</span>
+                    <span v-if="prescription.anticoagulant == 3">iu</span>
+                    <span v-if="prescription.anticoagulant == 2">mg</span>
+                    <span v-if="prescription.anticoagulant == 5">ml</span>
+                    <span v-if="prescription.anticoagulant == 6">iu</span>
+                    <span v-if="prescription.anticoagulant == 7">iu</span>
+                    <span v-if="prescription.anticoagulant == 8">iu</span>
+                    <span v-if="prescription.anticoagulant == 9">iu</span>
+                    <span v-if="prescription.anticoagulant == 10">iu</span>
+                    <span v-if="prescription.anticoagulant == 11">iu</span>
+                    <span v-if="prescription.anticoagulant == 13">iu</span>
+                  </span>
+                  维持:{{prescription.anticoagulant_weichi? prescription.anticoagulant_weichi : ""}}
+                  <span v-if="prescription.anticoagulant == 2">mg/h</span>
+                  <span v-if="prescription.anticoagulant == 3">iu/h</span>
+                  <span v-if="prescription.anticoagulant == 4">ml</span>
+                  <span v-if="prescription.anticoagulant == 5">ml/h</span>
+                  <span v-if="prescription.anticoagulant == 6">iu/h</span>
+                  <span v-if="prescription.anticoagulant == 7">iu/h</span>
+                  <span v-if="prescription.anticoagulant == 8">iu/h</span>
+                  <span v-if="prescription.anticoagulant == 9">iu/h</span>
+                  <span v-if="prescription.anticoagulant == 10">iu/h</span>
+                  <span v-if="prescription.anticoagulant == 11">iu/h</span>
+                  <span v-if="prescription.anticoagulant == 13">iu/h</span>
+                  总量:{{prescription.anticoagulant_zongliang? prescription.anticoagulant_zongliang: ""}}
+                  <span v-if="prescription.anticoagulant == 2">mg</span>
+                  <span v-if="prescription.anticoagulant == 3">iu</span>
+                  <span v-if="prescription.anticoagulant == 4">ml</span>
+                  <span v-if="prescription.anticoagulant == 5">ml</span>
+                  <span v-if="prescription.anticoagulant == 6">iu</span>
+                  <span v-if="prescription.anticoagulant == 7">iu</span>
+                  <span v-if="prescription.anticoagulant == 8">iu</span>
+                  <span v-if="prescription.anticoagulant == 9">iu</span>
+                  <span v-if="prescription.anticoagulant == 10">iu</span>
+                <span v-if="prescription.anticoagulant == 11">iu</span>
+                <span v-if="prescription.anticoagulant == 13">iu</span>
                 </td>
               </tr>
               <tr>
@@ -203,6 +249,8 @@
                    钠：{{ prescription.sodium }} mmol/L
                    钙:{{ prescription.calcium }} mmol/L
                    碳酸氢盐: {{ prescription.bicarbonate }} mmol/L
+                   CI : 109  mmol/L
+                   Mg: 0.5mmol/L
                   </span>
                 </td>
               </tr>
@@ -265,19 +313,21 @@
                 <td>{{monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</td>
                 <td>{{monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: ""}}</td>
                 <td>{{monitor.conductivity? monitor.conductivity: ""}}</td>
-                <td>{{monitor.dispose? monitor.dispose: ""}}
+                <td>
+                  {{monitor.symptom?monitor.symptom:"" }}&nbsp;
+                  {{monitor.dispose? monitor.dispose: ""}}&nbsp;
                   {{monitor.result? monitor.result: ""}}
                 </td>
                 <td>
                   <span
                     style="height: 30px; display: inline-block"
-                      v-if="setAdminUserES(monitor.creater) == ''"
+                      v-if="setAdminUserES(monitor.monitoring_nurse) == ''"
                       >
-                     {{ getAdminUser(monitor.creater) }}
+                     {{ getAdminUser(monitor.monitoring_nurse) }}
                   </span>
                   <img
                     style="height: 40px"
-                    :src="setAdminUserES(monitor.creater)"
+                    :src="setAdminUserES(monitor.monitoring_nurse)"
                     alt=""
                     srcset=""
                     v-else
@@ -430,14 +480,14 @@
               </tr>
               <tr>
                 <td colspan="4">
-                  <span style="width: 14%;">通路评估：
-                    {{
+                  <span>通路评估：
+                    内瘘:{{
                       afterdialysis.internal_fistula
                         ? afterdialysis.internal_fistula
                         : ""
                      }}
 
-                     {{
+                  导管:{{
                         afterdialysis.catheter ? afterdialysis.catheter : ""
                     }}
                   </span>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1778,7 +1778,12 @@ export default {
               if ( this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191){
                 if (prescription.pre_time == 0) {
                   if (this.schedule.schedule_type == 1) {
-                    preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+                    if(this.org_id == 10028){
+                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                    }else{
+                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+
+                    }
                   } else if (this.schedule.schedule_type == 2) {
                     preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
                   } else if (this.schedule.schedule_type == 3) {
@@ -1934,7 +1939,13 @@ export default {
                 var preTime = nowTime
                 if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191) {
                   if (this.schedule.schedule_type == 1) {
-                     preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+                    if(this.org_id == 10028){
+                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                    }else{
+                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+
+                    }
+                     // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                   } else if (this.schedule.schedule_type == 2) {
                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
                   } else if (this.schedule.schedule_type == 3) {
@@ -2245,7 +2256,13 @@ export default {
                     if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 ) {
                       if (prescription.pre_time == 0) {
                         if (this.schedule.schedule_type == 1) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+                          if(this.org_id == 10028){
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                          }else{
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+
+                          }
+                          // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
                         } else if (this.schedule.schedule_type == 3) {
@@ -2402,7 +2419,13 @@ export default {
                       // var preTime = ''
                       if(this.org_id != 0 && this.org_id !=  9919 && this.org_id !=  10485 && this.org_id !=  10191) {
                         if (this.schedule.schedule_type == 1) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+                          if(this.org_id == 10028){
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                          }else{
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+
+                          }
+                          // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
                         } else if (this.schedule.schedule_type == 3) {
@@ -3909,7 +3932,13 @@ export default {
                     if(this.org_id != 0 && this.org_id != 9919 && this.org_id  != 10485 && this.org_id  != 10191 ) {
                       if (prescription.pre_time == 0) {
                         if (this.schedule.schedule_type == 1) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+                          if(this.org_id == 10028){
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                          }else{
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+
+                          }
+                          // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
                         } else if (this.schedule.schedule_type == 3) {
@@ -4062,7 +4091,13 @@ export default {
                       var preTime = nowTime
                       if( this.org_id != 0 && this.org_id != 9919 &&  this.org_id != 10485 &&  this.org_id != 10191) {
                         if (this.schedule.schedule_type == 1) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+                          if(this.org_id == 10028){
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                          }else{
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+
+                          }
+                          // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
                         } else if (this.schedule.schedule_type == 3) {
@@ -4547,7 +4582,13 @@ export default {
                       if (prescription.pre_time == 0) {
                         // preTime = nowTime
                         if (this.schedule.schedule_type == 1) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+                          if(this.org_id == 10028){
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                          }else{
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+
+                          }
+                          // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
                         } else if (this.schedule.schedule_type == 3) {
@@ -4702,7 +4743,13 @@ export default {
                       // var preTime = ''
                       if(this.org_id != 0 && this.org_id != 9919  && this.org_id != 10485 && this.org_id != 10191 ) {
                         if (this.schedule.schedule_type == 1) {
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+                          if(this.org_id == 10028){
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
+                          }else{
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+
+                          }
+                          // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
                         } else if (this.schedule.schedule_type == 3) {

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

@@ -25,6 +25,7 @@
                             <thead>
                                 <tr>
                                   <td rowspan="2" width="80">序号</td>
+                                  <td rowspan="2" width="80">耗材名称</td>
                                   <td rowspan="2" width="80">耗材类型</td>
                                   <td rowspan="2" width="80">规格&单位</td>
                                   <td rowspan="2" width="80">生产厂商</td>
@@ -52,6 +53,7 @@
                             <tbody>
                                 <tr v-for="(item,index) in this.tableList" :key="index">
                                  <td>{{index + 1}}</td>
+                                 <td>{{item.good_name}}</td>
                                  <td>{{getGoodTypeName(item.good_type_id)}}</td>
                                  <td>{{item.specification_name}}</td>
                                  <td> {{getManufacturName(item.manufacturer)}}</td>