长沙南雅打印单问题修改

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -1428,11 +1428,15 @@ export default {
       var date = new Date(nowDate + " 00:00:00");
       this.listQuery.schedul_time = date.getTime();
       var start_month = moment().startOf('month').format('YYYY-MM-DD')
-      var start_time = this.getTimestamp(start_month)
-      this.listQuery.start_time = start_time
+      var start_time = this.getTimestamp(start_month)/1000 - 28800
+
+      console.log("开始时间---------------------",start_time)
+      this.listQuery.start_time = start_time*1000
       var end_month = moment(new Date()).add('year',0).format("YYYY-MM-DD")
-      var end_time = this.getTimestamp(end_month)
-      this.listQuery.end_time = end_time
+      var end_time = this.getTimestamp(end_month)/1000-28800
+
+      console.log("结束时间----------------------------------------",end_time)
+      this.listQuery.end_time = end_time*1000
       this.getAllZone();
       this.getSchedualPatientList();
       this.getTemplateInfo();
@@ -1488,6 +1492,11 @@ export default {
 
     changeTime() {
       this.listQuery.schedul_time = this.time;
+      this.listQuery.start_time = ""
+      this.listQuery.start_time = this.getTimestamp(this.time)
+      this.listQuery.end_time = ""
+      this.listQuery.end_time = this.getTimestamp(this.time)
+      console.log("----------------------wo",this.listQuery.end_time)
       this.getSchedualPatientList();
     },
     changeStartTime(){

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -17,7 +17,7 @@
           <span class="content" v-if="actual_ultrafiltration != '0'">{{
             actual_ultrafiltration
           }}</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 44 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10340 ||  this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10430 ||  this.$store.getters.xt_user.template_info.org_id == 10432 ||  this.$store.getters.xt_user.template_info.org_id == 10441 ||  this.$store.getters.xt_user.template_info.org_id == 10445  ) " >ml</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && ((this.$store.getters.xt_user.template_info.template_id == 6 &&this.$store.getters.xt_user.template_info.org_id != 10447) || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 44 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10340 ||  this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10430 ||  this.$store.getters.xt_user.template_info.org_id == 10432 ||  this.$store.getters.xt_user.template_info.org_id == 10441 ||  this.$store.getters.xt_user.template_info.org_id == 10445  ) " >ml</span>
           <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 44 && this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10340 &&  this.$store.getters.xt_user.template_info.org_id!= 10387 &&  this.$store.getters.xt_user.template_info.org_id!= 10430 &&  this.$store.getters.xt_user.template_info.org_id!= 10432 &&  this.$store.getters.xt_user.template_info.org_id!= 10441 &&  this.$store.getters.xt_user.template_info.org_id!= 10445"  >L</span>
         </li>
         <li v-if="isShow('导管')">

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

@@ -28,7 +28,7 @@
           <el-col :span="8" v-if="isShow('实际超滤量')">
             <el-form-item
               label="实际超滤量(ml): "
-              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445"  >
+              v-if=" (this.template_id == 6 && this.$store.getters.xt_user.template_info.org_id != 10447) || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445"  >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else>

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -1560,7 +1560,7 @@ export default {
         }
       }
       
-      if(this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340){
+      if( this.$store.getters.xt_user.org.id == 0 || this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340 || this.$store.getters.xt_user.org.id == 10447){
          var date = new Date()
           var year = date.getFullYear()
           var month = date.getMonth() + 1

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

@@ -2252,6 +2252,14 @@
             } else if (schedual.schedule_type == 3) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '18:00'
             }
+           }else if(this.$store.getters.xt_user.org.id == 10447){
+              if (schedual.schedule_type == 1) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '7:00'
+            } else if (schedual.schedule_type == 2) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '11:00'
+            } else if (schedual.schedule_type == 3) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '18:00'
+            }
            } else {
             if (schedual.schedule_type == 1) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '07:00'

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

@@ -1917,6 +1917,8 @@ export default {
           this.form.breathing_rated = "20"
         }else if(this.org_id == 10340){
          this.form.breathing_rated = "20"
+        }else if(this.org_id == 10447){
+          this.form.breathing_rated = "20"
         } else {
           this.form.breathing_rated = "";
         }
@@ -1962,7 +1964,13 @@ export default {
         this.form.symptom = resp.monitor.symptom ? resp.monitor.symptom : ""; // this.last_monitor_record.symptom;
        // this.form.dispose = resp.monitor.dispose ? resp.monitor.dispose : ""; // this.last_monitor_record.dispose;
         this.form.result = resp.monitor.result ? resp.monitor.result : ""; // this.last_monitor_record.result;
-        this.form.blood_oxygen_saturation = resp.monitor.blood_oxygen_saturation? resp.monitor.blood_oxygen_saturation: "";
+        //电导度
+        if(this.org_id == 9671 || this.org_id == 10447){
+           this.form.blood_oxygen_saturation = "99"
+        }else{
+           this.form.blood_oxygen_saturation = resp.monitor.blood_oxygen_saturation? resp.monitor.blood_oxygen_saturation: "";
+        }
+       
        //针对长沙南雅医院
        if(this.org_id == 9671 || this.org_id == 10340 || this.org_id == 9675){
           this.form.blood_oxygen_saturation = "/"
@@ -1974,7 +1982,7 @@ export default {
         this.form.sodium_concentration = resp.monitor.sodium_concentration
           ? resp.monitor.sodium_concentration
           : "";
-        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340){
+        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340 || this.org_id == 10447){
           this.form.conductivity = 14
         }else{
            this.form.conductivity = resp.monitor.conductivity? resp.monitor.conductivity: "";
@@ -2009,7 +2017,7 @@ export default {
         this.form.heparin_amount = resp.monitor.heparin_amount
           ? resp.monitor.heparin_amount
           : "";
-         if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340){
+         if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340 || this.org_id == 10447){
             this.form.dialysate_temperature = 36.5
             
          }

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -59,7 +59,7 @@
           <div class="inline_block">
             病区：
             <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121||org_id == 10138||org_id == 10414">{{
+              <span v-if="org_id == 10121||org_id == 10138||org_id == 10414 ||org_id == 10447">{{
                 patientInfo.DialysisSchedule.device_zone.name
                   ? patientInfo.DialysisSchedule.device_zone.name
                   : ""
@@ -70,7 +70,7 @@
           <div class="inline_block">
             床号：
             <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121||org_id == 10414">{{
+              <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675">{{
                 dialysisOrder &&
                 dialysisOrder.DeviceNumber &&
                 dialysisOrder.DeviceNumber.number.length > 0
@@ -86,7 +86,7 @@
               {{ patientInfo.dialysis_no }}
             </div>
           </div>
-          <div class="inline_block" style="margin-left: 5px;">
+          <div class="inline_block" style="margin-left: 5px;" v-if="org_id!=9675 && org_id!=10447">
             住院号/门诊号：
             <div class="under_line" style="width: 70px;text-align: left" v-if="receiverTreatmentAccess.admission_number">
               {{ receiverTreatmentAccess.admission_number }}
@@ -369,7 +369,7 @@
                         {{ predialysis.blood_access_part_opera_name }}
                       </div>
                     </div>
-                    <div class="inline_block" style="margin-left: 10px">
+                    <div class="inline_block" style="margin-left: 10px" v-if="org_id!=9675 && org_id!=10447">
                       内瘘：
                       <div
                         class="under_line"
@@ -390,6 +390,7 @@
                     <div
                       class="inline_block"
                       style="margin-left: 10px; flex: 1.4"
+                      v-if="org_id!=9675 && org_id!=10447"
                     >
                       导管：
                       <div
@@ -1039,10 +1040,28 @@
                             : "/"
                         }}
                       </div>
+                     
+                     <span v-if="org_id!=9675 && org_id!=10447">
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="prescription.anticoagulant == 2">iu</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
+                    </span>
+
+                    <span v-if="org_id==9675 || org_id==10447">
+                      <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>
                     </div>
                     <div class="inline_block" style="margin-left: 20px">
                       维持：
@@ -1068,11 +1087,27 @@
                             : "0"
                         }}
                       </div>
-                      <span v-if="prescription.anticoagulant == 5">ml/h</span>
-                      <span v-if="prescription.anticoagulant == 4">mg/h</span>
-                      <span v-if="prescription.anticoagulant == 3">iu/h</span>
-                      <span v-if="prescription.anticoagulant == 2">iu/h</span>
-                      <span v-if="prescription.anticoagulant == 1">mg/h</span>
+                      <span v-if="org_id!=9675 && org_id!=10447">
+
+                        <span v-if="prescription.anticoagulant == 5">ml/h</span>
+                          <span v-if="prescription.anticoagulant == 4">mg/h</span>
+                          <span v-if="prescription.anticoagulant == 3">iu/h</span>
+                          <span v-if="prescription.anticoagulant == 2">iu/h</span>
+                          <span v-if="prescription.anticoagulant == 1">mg/h</span>
+                      </span>
+                      <span v-if="org_id==9675 || org_id==10447">
+                        <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>
+                      </span>
                     </div>
                     <div
                       class="inline_block"
@@ -1125,12 +1160,27 @@
                             : "/"
                         }}
                       </div>
+                      <span v-if="org_id!=9675 && org_id!=10447">
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="prescription.anticoagulant == 2">iu</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
+                     </span>
+                    <span v-if="org_id==9675 || org_id==10447">
+                       <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>
+                    </span>
                     </div>
-                    <div class="inline_block" style="margin-left: 20px">
+                    <div class="inline_block" style="margin-left: 20px" v-if="org_id!=9675 && org_id!=10447">
                       透析机号：
                       <div
                         class="under_line"
@@ -1154,6 +1204,7 @@
                     <div
                       class="inline_block"
                       style="flex: 1; display: inline-block"
+                      v-if="org_id!=9675 && org_id!=10447"
                     >
                       备注：
                       <div
@@ -1645,7 +1696,7 @@
             <div class="inline_block">
               病区：
               <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121||org_id == 10138">{{
+              <span v-if="org_id == 10121||org_id == 10138 || org_id == 9675 || org_id == 10447">{{
                 patientInfo.DialysisSchedule.device_zone.name
                   ? patientInfo.DialysisSchedule.device_zone.name
                   : ""
@@ -1656,7 +1707,7 @@
             <div class="inline_block">
               床号：
               <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121">{{
+              <span v-if="org_id == 10121 || org_id == 9675 || org_id == 10447">{{
                 dialysisOrder &&
                 dialysisOrder.DeviceNumber &&
                 dialysisOrder.DeviceNumber.number.length > 0
@@ -1672,7 +1723,8 @@
                 {{ patientInfo.dialysis_no }}
               </div>
             </div>
-            <div class="inline_block" style="margin-left: 5px">
+            <div class="inline_block" style="margin-left: 5px"
+            v-if="org_id!=9675 && org_id!=10447">
             住院号/门诊号：
             <div
               class="under_line"
@@ -2066,7 +2118,8 @@
                         {{ afterdialysis.cruor ? afterdialysis.cruor : "/" }}
                       </div>
                     </div>
-                    <div class="inline_block" style="flex: 2">
+                    <div class="inline_block" style="flex: 2"
+                    v-if="org_id!=9675 && org_id!=10447">
                       内瘘：
                       <div
                         class="under_line"
@@ -2083,7 +2136,8 @@
                         }}
                       </div>
                     </div>
-                    <div class="inline_block" style="flex: 4">
+                    <div class="inline_block" style="flex: 4"
+                    v-if="org_id!=9675 && org_id!=10447">
                       导管：
                       <div
                         class="under_line"
@@ -2164,7 +2218,8 @@
                             : "/"
                         }}
                       </div>
-                      ml
+                      <span v-if="org_id!=9675&&org_id!=10447"> ml</span>
+                      <span v-if="org_id ==9675||org_id==10447">L</span>
                     </div>
                   </div>
                   <div
@@ -2308,6 +2363,7 @@
                     <div
                       class="inline_block"
                       style="flex: 1; display: inline-block"
+                      v-if="org_id!=9675 && org_id!=10447"
                     >
                       备注：
                       <div
@@ -3594,7 +3650,7 @@ export default {
       "vascular_access_desc"
     );
     this.org_id = this.$store.getters.xt_user.org.id;
-
+    console.log("org_id-----------------------------------------",this.org_id)
     // this.bloodAccessParOpera = getDataConfig('hemodialysis', 'vascular_access_desc')
 
     var bloodAccessParOpera = getDataConfig(

src/xt_pages/stock/stockFlow.vue

@@ -131,6 +131,12 @@
              <span > {{getManufacturer(scope.row.manufacturer)}}</span>
            </template>
         </el-table-column>
+
+        <el-table-column prop="drug_name" label="剩余库存" align="center">
+           <template slot-scope="scope">
+             <span > {{scope.row.over_count}}</span>
+           </template>
+        </el-table-column>
        </el-table>
        
       <el-pagination

src/xt_pages/user/courseOfDisease.vue

@@ -57,6 +57,7 @@
                 <el-table-column label="记录时间" align="center">
                   <template slot-scope="scope">
                     {{ recordTime(scope.row.record_time) }}
+                   
                   </template>
                 </el-table-column>
                 <el-table-column label="记录医生" align="center">
@@ -86,8 +87,8 @@
               <label class="title"><span class="name">病程日期</span> : </label>
               <el-date-picker v-model="course_of_disease_time" prefix-icon="el-icon-date" :editable="false"
                               style="width: 200px;"
-                              type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm"
-                              value-format="yyyy-MM-dd HH:mm"></el-date-picker>
+                              type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm:ss"
+                              value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
 
               <label class="title"><span class="name">日常病程</span> : </label>
               <el-select v-model="select_template" placeholder="可选择病程模板" @change="didSelectTemplate">
@@ -132,8 +133,8 @@
               <el-date-picker v-model="edit_course_of_disease_time" prefix-icon="el-icon-date" :editable="false"
                               style="width: 200px;"
                               type="datetime"
-                              placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm"
-                              value-format="yyyy-MM-dd HH:mm"></el-date-picker>
+                              placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm:ss"
+                              value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
 
               <label class="title"><span class="name">日常病程</span> : </label>
               <el-select v-model="select_template" placeholder="可选择病程模板" @change="didEditSelectTemplate">
@@ -185,7 +186,9 @@
     modifyCourseOfDiseaseRecord,
     GetCoursePrintData
   } from '@/api/patient'
-  import { parseTime } from '@/utils'
+  import { parseTime, } from '@/utils'
+  import { uParseTime } from '@/utils/tools'
+
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
 
   export default {
@@ -285,8 +288,15 @@
         this.current_select_record = record
       },
       recordTime: function(timestamp) {
-        var time = new Date(timestamp * 1000)
-        return parseTime(time, '{y}-{m}-{d} {h}:{m}')
+       
+        if(timestamp < 0){
+           return ""
+         }
+         if(timestamp == ""){
+          return ""
+         }else {
+          return uParseTime(timestamp, '{y}-{m}-{d} {h}:{i}:{s}')
+         }
       },
       doctorName: function(doctor_id) {
         for (let index = 0; index < this.doctors.length; index++) {

src/xt_pages/workforce/components/tableWeeks.vue

@@ -221,24 +221,16 @@
             </el-table-column>
             <el-table-column label="透析器/灌流器" min-width="100" align="center">
                 <template slot-scope="scope">
-                    <!-- <span v-if="org_id!=9987&&org_id!=10131&&org_id!=10215 &&org_id!=10233 && org_id!=10290">
-                      <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus!=''">
-                        <span>{{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span>
-                      </span>
-
-                      <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus==''&& scope.row.dialysissolution.id > 0 && scope.row.prescription.dialysis_dialyszers == ''">{{scope.row.dialysissolution.dialysis_dialyszers}}</span>
-                    </span> -->
-
-                    <!-- <span v-if="org_id==10131 || org_id == 10215 || org_id == 10233">{{scope.row.dialysissolution.dialyzer_perfusion_apparatus}}</span> -->
                     
-                      <!-- {{scope.row.prescription.dialysis_dialyszers}} -->
                     <span v-if="scope.row.prescription.dialysis_dialyszers =='' ">
                        {{scope.row.dialysissolution.dialysis_dialyszers}}
                     </span>
                     <span v-if="scope.row.prescription.dialysis_dialyszers !=''">{{scope.row.prescription.dialysis_dialyszers}}</span>
+
                     <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus =='' ">
                        {{scope.row.dialysissolution.dialyzer_perfusion_apparatus}}
                     </span>
+
                     <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus !=''">{{scope.row.prescription.dialyzer_perfusion_apparatus}}</span>
   
                     <span v-if="scope.row.prescription.dialysis_irrigation==''">/{{scope.row.dialysissolution.dialysis_irrigation}}</span>