1

src/xt_pages/dialysis/batch_print/batch_print_order_twentyEight.vue

@@ -1116,9 +1116,9 @@ export default {
             var delghTwo = 0
             if (
               this.records[recordIndex].advices &&
-              this.records[recordIndex].advices.length < 14
+              this.records[recordIndex].advices.length < 7
             ) {
-              delghTwo = 14 - this.records[recordIndex].advices.length
+              delghTwo = 7 - this.records[recordIndex].advices.length
             } else {
               delghTwo = 0
             }
@@ -1173,29 +1173,29 @@ export default {
             var adlen = advices.length
 
             var halfLen = adlen % 2 == 0 ? adlen / 2 : (adlen + 1) / 2
-            for (var i = 0; i < halfLen; i++) {
+            for (var i = 0; i < adlen; i++) {
               leftAdvice.push(advices[i])
-              var rightIndex = i + halfLen
-              rightAdvice.push(
-                rightIndex in advices ? advices[i + halfLen] : []
-              )
-            }
-            if (halfLen < 5) {
-              var nl = 5 - leftAdvice.length
-              for (let index = 0; index < nl; index++) {
-                leftAdvice.push([])
-              }
-              var nl = 5 - rightAdvice.length
-              for (let index = 0; index < nl; index++) {
-                rightAdvice.push([])
-              }
+              // var rightIndex = i + halfLen
+              // rightAdvice.push(
+              //   rightIndex in advices ? advices[i + halfLen] : []
+              // )
             }
+            // if (halfLen < 5) {
+            //   var nl = 5 - leftAdvice.length
+            //   for (let index = 0; index < nl; index++) {
+            //     leftAdvice.push([])
+            //   }
+            //   var nl = 5 - rightAdvice.length
+            //   for (let index = 0; index < nl; index++) {
+            //     rightAdvice.push([])
+            //   }
+            // }
 
             this.records[recordIndex].advices = []
-            for (var i = 0; i < halfLen; i++) {
+            for (var i = 0; i < adlen; i++) {
               var item = []
               item.push(leftAdvice[i])
-              item.push(rightAdvice[i])
+              // item.push(rightAdvice[i])
               this.records[recordIndex].advices.push(item)
             }
           }

src/xt_pages/outpatientDoctorStation/template/printThree.vue

@@ -22,7 +22,7 @@
                 <span v-if="item.patient.gender == 1">男</span>
                 <span v-if="item.patient.gender == 2">女</span>
               </div>
-              <div>年龄：{{getAge(item.patient)?getAge(item.patient):""}}岁</div>
+              <div>年龄：{{getNewAge(item.patient.birthday)?getNewAge(item.patient.birthday):""}}岁</div>
           </div>
           <div class="infoMain">
               <div style="margin-bottom: 10px;display:flex;">门诊号码：<span class="under_line" v-if="hisPatient.number">{{hisPatient.number?hisPatient.number:""}}</span></div>
@@ -120,6 +120,19 @@ export default {
       }
     },
    methods:{
+    getNewAge(birthday){
+      // var myDate = new Date(birthday * 1000)
+      // var month = myDate.getMonth() + 1
+      // var day = myDate.getDate()
+      // var age = new Date().getFullYear() - myDate.getFullYear()
+      // if (month < new Date().getMonth() + 1 || new Date().getMonth() + 1 == month && day <= new Date().getDate()) {
+      //   age++
+      // }
+      // return age
+      var nowTime = new Date().getTime(); 
+      //一年毫秒数(365 * 86400000 = 31536000000)
+      return Math.ceil((nowTime-(birthday * 1000))/31536000000);
+    },
      getAge(patient){
        var thisLen = patient.id_card_no.length
        var birth = ''

src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue

@@ -20,7 +20,7 @@
             <span v-if="item.patient.gender == 1">男</span>
             <span v-if="item.patient.gender == 2">女</span>
             </div>
-            <div>年龄：{{getAge(item.patient)?getAge(item.patient):""}}岁</div>
+            <div>年龄：{{getNewAge(item.patient.birthday)?getNewAge(item.patient.birthday):""}}岁</div>
         </div>
         <div class="infoMain">
             <div style="margin-bottom: 10px;display:flex;">门诊号码：<span class="under_line">{{hisPatient.number?hisPatient.number:""}}</span></div>
@@ -238,6 +238,19 @@ export default {
       }
     },
    methods:{
+    getNewAge(birthday){
+      // var myDate = new Date(birthday * 1000)
+      // var month = myDate.getMonth() + 1
+      // var day = myDate.getDate()
+      // var age = new Date().getFullYear() - myDate.getFullYear()
+      // if (month < new Date().getMonth() + 1 || new Date().getMonth() + 1 == month && day <= new Date().getDate()) {
+      //   age++
+      // }
+      // return age
+      var nowTime = new Date().getTime(); 
+      //一年毫秒数(365 * 86400000 = 31536000000)
+      return Math.ceil((nowTime-(birthday * 1000))/31536000000);
+    },
      getAge(patient){
        var thisLen = patient.id_card_no.length
        var birth = ''