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

src/xt_pages/dialysis/PatientBox.vue

@@ -26,9 +26,9 @@
                 {{ schedule.patient.name
                 }}<span class="yc" v-show="isAbnormal(schedule)">异常</span>
               </h3>
-              <span class="num"
-                >{{ genderText(schedule) }} | {{ getAge(schedule) }} 岁</span
-              >
+              <span class="num">
+                {{ genderText(schedule) }} | {{ getAge(schedule)>200 ? schedule.patient.age : getAge(schedule) }} 岁
+              </span>
               <div
                 style="
                   margin-left: 10px;
@@ -499,6 +499,8 @@ export default {
       // return nowYear - birthdayYear
     },
     getAge: function (val) {
+      console.log('1111111111222222',val);
+      
       var thisLen = val.patient.id_card_no.length;
       var birth = "";
       if (thisLen == 15) {

src/xt_pages/dialysis/batch_print/batch_print_order_eighty.vue

@@ -1199,7 +1199,7 @@
                               : "/"
                           }}
                         </div>
-                        kg
+                        L
                       </div>
                     </div>
 

src/xt_pages/dialysis/batch_print/batch_print_order_seventyeight.vue

@@ -1412,9 +1412,9 @@
                         </div>
                         min
                       </div>
-                      <div class="inline_block" style="flex: 2">
+                      <div class="inline_block" style="flex: 3">
                         透后宣教：
-                        <div class="under_line" style="width: 60%; text-align: center">
+                        <div class="under_line" style="width: 85%; text-align: left;white-space: normal;">
                           {{ record.summer ? record.summer.mission : '/' }}
                         </div>
                       </div>

src/xt_pages/dialysis/template/DialysisPrintOrderSeventyeight.vue

@@ -1244,9 +1244,9 @@
                       min
                     </div>
 
-                    <div class="inline_block" style="flex: 2">
+                    <div class="inline_block" style="flex: 3">
                       透后宣教：
-                      <div class="under_line" style="width: 80%; text-align: center;white-space: normal;">
+                      <div class="under_line" style="width: 85%; text-align: left;white-space: normal;">
                         {{ summary.mission ? summary.mission : '/' }}
                       </div>
                     </div>

src/xt_pages/dialysis/template/DialysisPrintOrdereighty.vue

@@ -1055,7 +1055,7 @@
                             : "/"
                         }}
                       </div>
-                      kg
+                      L
                     </div>
                   </div>
 

src/xt_pages/user/components/PatientSidebar.vue

@@ -46,7 +46,15 @@
         >姓名：{{ currentPatient.name }}    性别：{{
           tranSex(currentPatient.gender)
         }}
-           年龄：{{ getAge(currentPatient) }}    透析号：{{
+           年龄：
+        <span v-if="getAge(currentPatient)>200">
+          {{ currentPatient.age }}
+        </span>
+        <span v-else>
+          {{ getAge(currentPatient) }} 
+        </span>
+        
+        &nbsp;&nbsp; 透析号：{{
           currentPatient.dialysis_no
         }}
       </span>
@@ -599,8 +607,6 @@ export default {
        this.treeKey = this.defaultActive
 
     }
-
-
     this.getList()
   },