提交代码

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1509,6 +1509,7 @@ export default {
         var hours = nowDate.getHours()
         var min = nowDate.getMinutes()
 
+        var preTime = ""
         var nowTime =
           nowYear +
           '-' +
@@ -1516,7 +1517,19 @@ export default {
           '-' +
           (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (hours < 10 ? '0' + hours : hours) +
           ':' + (min < 10 ? '0' + min : min)
-        this.prescriptions[i]['pre_time'] = nowTime
+        if(nowTime.split(" ")[0] != this.record_date){
+          if(this.org_id == 10206  || this.org_id == 0) {
+            preTime = this.record_date+ ' '  + (hours < 10 ? '0' + hours : hours) +
+              ':' + (min < 10 ? '0' + min : min)
+          }else {
+            preTime = this.record_date + ' ' + (hours < 10 ? '0' + hours : hours) +
+              ':' + (min < 10 ? '0' + min : min)
+          }
+        } else {
+          preTime = nowTime
+        }
+
+        this.prescriptions[i]['pre_time'] = preTime
 
         this.prescriptions[i].name = '处方' + (i + 1)
         if (i == 0) {
@@ -1569,9 +1582,23 @@ export default {
         '-' +
         (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (hours < 10 ? '0' + hours : hours) +
         ':' + (min < 10 ? '0' + min : min)
+      var preTime  = ""
+      console.log(nowTime.split(" ")[0] )
+      console.log(this.record_date)
+
+      if(nowTime.split(" ")[0] != this.record_date){
+          preTime = this.record_date + ' ' + (hours < 10 ? '0' + hours : hours) +
+            ':' + (min < 10 ? '0' + min : min)
+      } else {
+        preTime = nowTime
+      }
+
+
+
+
       for (let i = 0; i < this.prescriptions.length; i++) {
         this.prescriptions[i].name = '处方' + (i + 1)
-        this.prescriptions[i]['pre_time'] = nowTime
+        this.prescriptions[i]['pre_time'] = preTime
 
         if (i == 0) {
           if (this.prescriptions[0].advices.length > 0 && this.prescriptions[0].project.length == 0) {
@@ -3226,6 +3253,23 @@ export default {
         '-' +
         (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (hours < 10 ? '0' + hours : hours) +
         ':' + (min < 10 ? '0' + min : min)
+
+
+      var preTime  = ""
+      console.log(nowTime.split(" ")[0] )
+      console.log(this.record_date)
+
+      if(nowTime.split(" ")[0] != this.record_date){
+
+            preTime = this.record_date + ' ' + (hours < 10 ? '0' + hours : hours) +
+              ':' + (min < 10 ? '0' + min : min)
+
+      } else {
+        preTime = nowTime
+      }
+
+
+
       let obj = {
         id: 0,
         name: newTabName,
@@ -3233,7 +3277,7 @@ export default {
         advices: [],
         project: [],
         addition: [],
-        pre_time: nowTime
+        pre_time: preTime
 
       }