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

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -46,7 +46,7 @@
           <div class="inline_block" style="margin-left: 10px">
             年龄：
             <div class="under_line" style="width: 30px; text-align: center">
-              {{ getAge(patientInfo)}}
+              {{ getAge(patientInfo) }}
             </div>
             岁
           </div>
@@ -1673,19 +1673,19 @@
             <div class="inline_block" style="margin-left: 5px">
               住院号/门诊号：
               <div
-              class="under_line"
-              style="width: 70px; text-align: left"
-              v-if="receiverTreatmentAccess.admission_number"
-            >
-              {{ receiverTreatmentAccess.admission_number }}
-            </div>
-            <div
-              class="under_line"
-              style="width: 70px; text-align: left"
-              v-else
-            >
-              {{ "/" }}
-            </div>
+                class="under_line"
+                style="width: 70px; text-align: left"
+                v-if="receiverTreatmentAccess.admission_number"
+              >
+                {{ receiverTreatmentAccess.admission_number }}
+              </div>
+              <div
+                class="under_line"
+                style="width: 70px; text-align: left"
+                v-else
+              >
+                {{ "/" }}
+              </div>
             </div>
           </div>
           <div class="row" style="margin-bottom: 10px">
@@ -2695,34 +2695,32 @@ export default {
   },
   methods: {
     // 获取当前年份，用于年龄计算
-    getoldAge(){
-      let date = new Date()
-      let year = date.getFullYear()
-      let year_d = year-this.patientInfo.birth.split('-')[0]
-      let year_m = this.xtdate.split('-')[1]
-      let birth_m = this.patientInfo.birth.split('-')[1]
-      let year_date = this.xtdate.split('-')[2]
-      let birth_date = this.patientInfo.birth.split('-')[2]
+    getoldAge() {
+      let date = new Date();
+      let year = date.getFullYear();
+      let year_d =
+        this.xtdate.split("-")[0] - this.patientInfo.birth.split("-")[0];
+      let year_m = this.xtdate.split("-")[1];
+      let birth_m = this.patientInfo.birth.split("-")[1];
+      let year_date = this.xtdate.split("-")[2];
+      let birth_date = this.patientInfo.birth.split("-")[2];
       // console.log(year,'今年年月')
       // console.log(this.xtdate.split('-'),'病人就诊年月')
-      // console.log(this.patientInfo.birth,'病人生日')
+      console.log(this.patientInfo.birth, "病人生日");
       // console.log(year_d,'year_d')
-      if(year_m < birth_m){
-        return year_d - 1
-      }else if(year_m = birth_m){
-        if(year_date < birth_date){
-          return year_d - 1
-        }else{
-          return year_d
+      if (year_m < birth_m) {
+        return year_d - 1;
+      } else if (year_m == birth_m) {
+        if (year_date < birth_date) {
+          return year_d - 1;
+        } else {
+          return year_d;
         }
-      }else{
-        return year_d
+      } else {
+        return year_d;
       }
     },
 
-
-
-
     checkData() {
       if (this.receiverTreatmentAccess.way == 0) {
         this.$message.error("入科方式未填");
@@ -3093,6 +3091,7 @@ export default {
           this.patientInfo.birthday,
           "{y}-{m}-{d}"
         );
+        // console.log(this.patientInfo.birth,'测试生日')
         // this.patientInfo.age = jsGetAge(this.patientInfo.birth, '-')
         if (response.data.data.patientInfo.first_dialysis_date != 0) {
           this.patientInfo.first_dialysis_date = uParseTime(
@@ -3113,14 +3112,14 @@ export default {
         this.afterdialysis = response.data.data.AssessmentAfterDislysis;
         // console.log('透后体重', this.afterdialysis)
         this.lastafterdialysis = response.data.data.assessmentAfterDislysis;
-        console.log("上次透后体重", this.lastafterdialysis.weight_after);
+        // console.log("上次透后体重", this.lastafterdialysis.weight_after);
         this.operators = response.data.data.operators;
-        console.log("operators", this.operators);
+        // console.log("operators", this.operators);
         this.dialysisOrder =
           response.data.data.dialysisOrder === null
             ? null
             : response.data.data.dialysisOrder;
-        console.log("上机233232323232", this.dialysisOrder);
+        // console.log("上机233232323232", this.dialysisOrder);
         if (this.operators.length > 0) {
           var operatorsLen = this.operators.length;
           for (var index = 0; index < operatorsLen; index++) {
@@ -3177,7 +3176,7 @@ export default {
           this.afterdialysis.complications_other.join(",");
 
         this.prescription = response.data.data.dialysisPrescription;
-        console.log("透析处方", this.prescription);
+        // console.log("透析处方", this.prescription);
         this.receiverTreatmentAccess =
           response.data.data.receiverTreatmentAccess;
         this.prescription.mode = this.modeName(this.prescription.mode_id);
@@ -3225,7 +3224,7 @@ export default {
 
         this.advices = response.data.data.advices;
         this.tableAdvice = response.data.data.advices;
-        console.log("医嘱数据2222222222", this.advices);
+        // console.log("医嘱数据2222222222", this.advices);
         this.monitors = response.data.data.monitors;
         this.summary = response.data.data.summary;
         this.org_template_info = response.data.data.org_template_info;
@@ -3437,7 +3436,7 @@ export default {
           this.doctor_advices = doctor_advices_1;
           this.doctor_advices_2 = doctor_advices_2;
         }
-        console.log(this.advice_groups);
+        // console.log(this.advice_groups);
       } else {
         this.loading = false;
         this.$message.error("请求数据失败");
@@ -3469,7 +3468,7 @@ export default {
           return val.age;
         }
       } else {
-        return this.getoldAge()
+        return this.getoldAge();
       }
     },
     newAdviceGroupObject: function () {
@@ -3580,9 +3579,9 @@ export default {
     }
 
     const xtdate = this.$route.query && this.$route.query.xtdate;
-    console.log("xtdate", xtdate);
+    // console.log("xtdate", xtdate);
     const xtno = this.$route.query && this.$route.query.xtno;
-    console.log("xtno", xtno);
+    // console.log("xtno", xtno);
     if (
       typeof xtdate === "string" &&
       xtdate.length > 0 &&

src/xt_pages/outpatientDoctorStation/recordPrint.vue

@@ -14,13 +14,11 @@
     <div class="dialysisPage" style="padding-top: 40px">
       <printOne
         v-if="
-          org_id != 10217 &&
+          org_id != 10217 && org_id != 10188 &&org_id != 10318&&
           org_id != 9675 &&
           org_id != 9671 &&
           org_id != 0 &&
-          org_id != 10164 &&
-          org_id != 10188 &&
-          org_id != 10318
+          org_id != 10164 
         "
         ref="printOne"
         v-bind:childResponse="childResponse"
@@ -32,10 +30,11 @@
       <printTwo
         v-if="
           org_id == 10217 ||
+           org_id == 10188 ||
           org_id == 9675 ||
           org_id == 9671 ||
-          org_id == 10164 ||
-          org_id == 10188
+          org_id == 10164
+         
         "
         ref="printTwo"
         v-bind:childResponse="childResponse"
@@ -101,7 +100,7 @@ export default {
   methods: {
     show(val, id) {
       this.org_id = id;
-      if (id == 10217 || id == 9675 || id == 9671 ) {
+      if (id == 10217 || id == 9675 || id == 9671|| id == 10188 ) {
         this.$refs.printTwo.show(val);
       } else if (id == 10318|| id == 0) {
         this.$refs.printThree.show(val);