新分支

src/utils/tools.js

@@ -21,13 +21,68 @@ export function jsGetAge(strBirthday, splitstr) {
   // debugger
   var returnAge
   var strBirthdayArr = strBirthday.split(splitstr)
+ 
   var birthYear = strBirthdayArr[0]
   var birthMonth = strBirthdayArr[1]
   var birthDay = strBirthdayArr[2]
+
+  
   var d = new Date()
   var nowYear = d.getFullYear()
   var nowMonth = d.getMonth() + 1
   var nowDay = d.getDate()
+  
+  if (nowYear == birthYear) {
+    returnAge = 0 // 同年 则为0岁
+  } else {
+    var ageDiff = nowYear - birthYear // 年之差
+    if (ageDiff > 0) {
+      if (nowMonth == birthMonth) {
+        var dayDiff = nowDay - birthDay // 日之差
+        if (dayDiff < 0) {
+          returnAge = ageDiff - 1
+        } else {
+          returnAge = ageDiff
+        }
+      } else {
+        var monthDiff = nowMonth - birthMonth // 月之差
+        if (monthDiff < 0) {
+          returnAge = ageDiff - 1
+        } else {
+          returnAge = ageDiff
+        }
+      }
+    } else {
+      returnAge = -1 // 返回-1 表示出生日期输入错误 晚于今天
+    }
+  }
+
+  return returnAge // 返回周岁年龄
+}
+
+
+export function jsGetAgeOne(strBirthday,splitstr, nowYear,nowMonth,nowDay) {
+ 
+  // debugger
+  var returnAge
+  var strBirthdayArr = strBirthday.split(splitstr)
+  console.log("strBirthdayArr",strBirthdayArr)
+  var birthYear = strBirthdayArr[0]
+  var birthMonth = strBirthdayArr[1]
+  var birthDay = strBirthdayArr[2]
+  // var d = new Date()
+  // var anowYear = d.getFullYear()
+  // var anowMonth = d.getMonth() + 1
+  // var anowDay = d.getDate()
+  
+  // console.log("anowYear",anowYear)
+  // console.log("anowMonth",anowMonth)
+  // console.log("anowDay",anowDay)
+  
+  console.log("brityYear666",strBirthdayArr[0])
+  console.log("birthMonth5656",strBirthdayArr[1])
+  console.log("birthDay5656",strBirthdayArr[2])
+  
   if (nowYear == birthYear) {
     returnAge = 0 // 同年 则为0岁
   } else {

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyTwo.vue

@@ -56,9 +56,8 @@
                <!-- <span v-if="record.dialysis_order && record.dialysis_order.dialysis_date<=1672416000">{{record.patient.total_dialysis + record.patient.user_sys_before_count}}</span>  
                <span v-if="record.dialysis_order && record.dialysis_order.dialysis_date>=1672502400">{{record.patient.total_dialysis}}</span>   -->
               <span>
-                            <!-- {{ record.Count ? record.Count:''}} -->
-                            {{ record.patient.total_dialysis }}
-                        </span>
+                 {{ record.Count ? record.Count:''}}  
+                </span>
               </span>
             </td>
                   <td style="text-align:center;">

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -1318,7 +1318,7 @@
         align="right"
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[20, 40, 60, 80,100]"
+        :page-sizes="[20, 40, 60, 80,100,300,500]"
         :page-size="10"
         background
         style="margin-top:20px;"

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -357,7 +357,7 @@
 
         <li v-if="isShow('维持时长')">
           <label>维持时长: </label>
-          <span class="content">{{this.prescription.anticoagulant_weichi_hour}}</span>
+          <span class="content">{{this.prescription.anticoagulant_weichi_hour?this.prescription.anticoagulant_weichi_hour:"0"}}</span>
         </li>
 
         <li
@@ -449,7 +449,7 @@
 
          <li v-if="isShow('葡萄糖')">
           <label>葡萄糖: </label>
-          <span class="content">{{this.prescription.amylaceum}}</span>
+          <span class="content">{{this.prescription.amylaceum?this.prescription.amylaceum:0}}</span>
         </li>
 
         <li v-if="isShow('单超时长')">

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

@@ -475,6 +475,8 @@ export default {
         accepts.way =1
         accepts.posture=1
         accepts.condition =2
+        accepts.consciousness = 1
+        accepts.appetite =1
 
       }
       this.accepts = accepts;

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

@@ -2803,7 +2803,7 @@ mu
         }
         // console.log('this.dialysisPrescription.mode_id', this.dialysisPrescription.mode_id)
         // console.log('this.schedual', schedual.mode_id)
-        if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || schedual.mode_id == 2 || schedual.mode_id == 5 || schedual.mode_id == 12) {
+        if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || schedual.mode_id == 2 || schedual.mode_id == 5 || schedual.mode_id == 12 || schedual.mode_id == 0) {
           this.zhiShow = true
           this.huShow = true
           this.totalShow = true
@@ -2815,7 +2815,6 @@ mu
           pre.mode_id == 7 ||
           pre.mode_id == 8 ||
           pre.mode_id == 9 ||
-          pre.mode_id == 10 ||
           pre.mode_id == 11 ||
           pre.mode_id == 13 ||
           pre.mode_id == 14 ||
@@ -2852,11 +2851,19 @@ mu
               this.dialysisPrescription.dialysate_flow = 500
             }
 
-            if(this.$store.getters.xt_user.org.id == 10598){
+            if(this.$store.getters.xt_user.org.id == 10598 || this.$store.getters.xt_user.org.id == 10612){
                if(this.dialysisPrescription.dialysis_duration_minute == ""){
                  this.dialysisPrescription.dialysis_duration_minute =0
 
                }
+
+               if(this.dialysisPrescription.anticoagulant_weichi == ""){
+                  this.dialysisPrescription.anticoagulant_weichi = 0
+               }
+
+               if(this.dialysisPrescription.amylaceum == ""){
+                this.dialysisPrescription.amylaceum = 0
+               }
             }
         }
         if (this.predialysis == null || this.predialysis.id == 0) {
@@ -3036,7 +3043,7 @@ mu
             //   }
 
             // }
-            if(this.dialysisPrescription.mode_id!=2 && this.dialysisPrescription.mode_id!=5 && this.dialysisPrescription.mode_id!=12){
+            if(this.dialysisPrescription.mode_id!=2 && this.dialysisPrescription.mode_id!=5 && this.dialysisPrescription.mode_id!=12 && this.dialysisPrescription.mode_id!=10){
               this.dialysisPrescription.displace_liqui_part = 0
               this.dialysisPrescription.displace_liqui_value = 0
               this.dialysisPrescription.replacement_total = 0
@@ -4446,7 +4453,6 @@ mu
         id === 7 ||
         id === 8 ||
         id === 9 ||
-        id === 10 ||
         id === 11 ||
         id === 13 ||
         id === 14 ||

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

@@ -266,7 +266,7 @@
                 org_id == 10599 ||
                 org_id == 10597 ||
                 org_id == 10599 || 
-                org_id == 10610) &&
+                org_id == 10612) &&
                 org_id!=10387
             "
           >
@@ -337,7 +337,7 @@
               && org_id!=10432 && org_id!=10445
               && org_id!=10410 && org_id!=10495 &&
                org_id!=10485 && org_id!=10395 && org_id!=10375
-               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10610)
+               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612)
               || org_id == 10387
             "
           >
@@ -393,7 +393,7 @@
                 org_id == 10410 ||
                 org_id == 10495  ||
                 org_id == 10395
-                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10610)
+                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612)
                 && org_id!=10387
             "
           >
@@ -446,7 +446,7 @@
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 && org_id!=10495
-              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10610 ) ||
+              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 ) ||
               org_id == 10387
             "
           >
@@ -1177,7 +1177,7 @@
                 org_id== 10432 ||
                 org_id== 10445 ||
                 org_id== 10410 ||
-                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10610) &&
+                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612) &&
                 org_id!=10387
             "
           >
@@ -1225,7 +1225,7 @@
               org_id!=10445 &&
               org_id!=10410 &&
               org_id!=10485 &&
-              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10610)
+              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612)
               || org_id == 10387
             "
           >
@@ -1289,7 +1289,7 @@
                 org_id == 10551 ||
                 org_id == 10597||
                 org_id == 10599 ||
-                org_id ==10610)
+                org_id ==10612)
                 && org_id!=10387
             "
           >
@@ -1353,7 +1353,7 @@
               org_id!=10551 &&
               org_id!=10597 &&
               org_id!=10599 &&
-              org_id!=10610
+              org_id!=10612
               )
               || org_id == 10387
             "

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -15,10 +15,10 @@
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10610) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && 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!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10610) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10610) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10610 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && 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!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410) && org_id!=10558" width="92px" > 置换率(ml/min) </th>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1606,7 +1606,7 @@
                           置换量<br />(ml)
                         </td>
                         <td width="50" v-if="org_id == 3877 || org_id == 0 || org_id == 10449">滤前压(mmHg)</td>
-                        <td width="50" v-if="org_id == 9538 || org_id ==10600">KT/V</td>
+                        <td width="50" v-if="org_id == 9538 || org_id ==10600 || org_id ==10587">KT/V</td>
                         <td width="50" v-if="org_id == 9919">在线尿素监测</td>  
                         <td width="50" v-if="org_id == 9671">在线尿素监测</td>  
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id== 9671">血容量<br />(L)</td>
@@ -1735,7 +1735,7 @@
                           </span>
                         </td>
                         <td width="50" v-if="org_id == 3877 || org_id == 0 || org_id == 10449">{{ monitor.filter_pressure?monitor.filter_pressure:""}}</td>
-                        <td width="50" v-if="org_id == 9919 || org_id == 9538 || org_id == 9671 || org_id ==10600">
+                        <td width="50" v-if="org_id == 9919 || org_id == 9538 || org_id == 9671 || org_id ==10600 || org_id ==10587">
                           {{ monitor.ktv?monitor.ktv:"" }}
                         </td>
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id == 9671">
@@ -3554,7 +3554,7 @@
 import CheckBox from "../batch_print/option_check_box";
 import { getDialysisRecord } from "@/api/dialysis";
 import { getDataConfig } from "@/utils/data";
-import { jsGetAge, uParseTime } from "@/utils/tools";
+import { jsGetAge, uParseTime,jsGetAgeOne } from "@/utils/tools";
 
 import LabelBox from "../printItem/LabelBox";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
@@ -3689,6 +3689,7 @@ export default {
       },
       org_id: 0,
       projectsOne: [],
+      ageDate:""
     };
   },
   methods: {
@@ -4209,6 +4210,7 @@ export default {
         } else {
           this.patientInfo.first_dialysis_date = "";
         }
+        this.ageDate = uParseTime(response.data.data.schedule.schedule_date,"{y}-{m}-{d}");
         this.check = response.data.data.check;
         this.xtdate = response.data.data.xtdate;
         this.predialysis = response.data.data.PredialysisEvaluation;
@@ -4707,15 +4709,28 @@ export default {
         } else {
           birth = val.id_card_no.substr(6, 8)
         }
-        var birthtwo =
-          birth.substr(0, 4) +
-          '-' +
-          birth.substr(4, 2) +
-          '-' +
-          birth.substr(6, 2)
-
-        var age = jsGetAge(birthtwo, '-')
-        return age
+      
+        if(this.org_id == 0){
+          console.log("this.ageDattewowow",this.ageDate)
+          var birthtwo = birth.substr(0, 4)  + birth.substr(4, 2)  + birth.substr(6, 2)
+          var year = birth.substr(0,4) 
+          var month = birth.substr(4, 2)
+          var day = birth.substr(6, 2)
+         
+          var age = jsGetAgeOne(birthtwo,"-",year,month,day)
+          return age
+        }else{
+            var birthtwo =
+            birth.substr(0, 4) +
+            '-' +
+            birth.substr(4, 2) +
+            '-' +
+            birth.substr(6, 2)
+            console.log("brithwo3333",birthtwo)
+            var age = jsGetAge(birthtwo, '-')
+            return age
+        }
+       
       }
     },
     newAdviceGroupObject: function () {

src/xt_pages/dialysis/template/DialysisPrintOrderseventyone.vue

@@ -444,8 +444,9 @@
                 <p style="height:15px;line-height:15px">上次透后体重</p>
               </td>
               <td style="width:8%;">
+              
                  <span v-if="assessmentafter.weight_after == 0">
-                  {{ afterdialysis.last_after_weight ? assessmentafter.last_after_weight : "0" }}kg
+                  {{ afterdialysis.last_after_weight ? afterdialysis.last_after_weight : "0" }}kg
                  </span>
                  <span v-if="assessmentafter.weight_after>0">
                   {{ assessmentafter.weight_after ? assessmentafter.weight_after : "0" }}kg
@@ -460,7 +461,7 @@
                 <span v-if="advice.parent_id > 0">---></span>
                 <span>{{ advice.advice_name }}</span>
                 <span v-if="advice && advice.advice_desc">({{ advice.advice_desc }}{{ advice.drug_spec_unit }})</span>
-                <span v-if="advice.prescribing_number">&nbsp;&nbsp; {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</span>
+                <!-- <span v-if="advice.prescribing_number">&nbsp;&nbsp; {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</span> -->
                 <span v-if="advice.single_dose != 0">{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
                 <span v-if="advice.parent_id == 0">{{ advice.delivery_way }}</span>
                 <span v-if="advice.parent_id == 0">{{ advice.execution_frequency }}</span>
@@ -476,7 +477,15 @@
               <td v-if="advice_index === 0">透前体重</td>
               <td v-if="advice_index === 0">{{ predialysis.weight_before }}kg</td>
               <td v-if="advice_index === 1">体重增加量</td>
-              <td v-if="advice_index === 1">{{ (predialysis.weight_before - assessmentafter.weight_after).toFixed(1) }}kg</td>
+              <td v-if="advice_index === 1">
+                <span v-if="assessmentafter.weight_after == 0">
+                  {{ (predialysis.weight_before - afterdialysis.last_after_weight ).toFixed(1) }}kg
+                 </span>
+                 <span v-if="assessmentafter.weight_after>0">
+                   {{ (predialysis.weight_before - assessmentafter.weight_after).toFixed(1) }}kg
+                 </span>
+                 
+              </td>
               <td v-if="advice_index === 2">干体重(DW)</td>
               <td v-if="advice_index === 2">{{ predialysis.dry_weight }}kg</td>
               <td v-if="advice_index === 3">较干体重增加量</td>

src/xt_pages/medicalScheduling/index.vue

@@ -57,7 +57,7 @@
                                 <div v-if="name==scope.row.user_name&&column_lie =='周一' ? true:false">
                                   <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true" >
                                     <el-button type="danger" size="mini" icon="el-icon-close" 
-                                      circle @click.stop="toClick(scope.row,scope.$index)"   
+                                      circle @click.stop="toClick(getClassId(scope.row.user_name,1))"   
                                     ></el-button>
                                   </div>
                                 </div>
@@ -81,7 +81,7 @@
                               <div v-if="name==scope.row.user_name&&column_lie =='周二' ? true:false">
                                 <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
                                   <el-button type="danger" size="mini" icon="el-icon-close" 
-                                    circle @click.stop=""   
+                                    circle @click.stop="toClick(getClassId(scope.row.user_name,2))"   
                                   ></el-button>
                                 </div>
                               </div>
@@ -106,7 +106,7 @@
                                 <div v-if="name==scope.row.user_name&&column_lie =='周三' ? true:false">
                                   <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
                                     <el-button type="danger" size="mini" icon="el-icon-close" 
-                                      circle @click.stop=""   
+                                      circle @click.stop="toClick(getClassId(scope.row.user_name,3))"   
                                     ></el-button>
                                   </div>
                                 </div>
@@ -130,7 +130,7 @@
                                 <div v-if="name==scope.row.user_name&&column_lie =='周四' ? true:false">
                                   <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
                                     <el-button type="danger" size="mini" icon="el-icon-close" 
-                                      circle @click.stop=""   
+                                      circle @click.stop="toClick(getClassId(scope.row.user_name,4))"   
                                     ></el-button>
                                   </div>
                                 </div>
@@ -154,7 +154,7 @@
                                 <div v-if="name==scope.row.user_name&&column_lie =='周五' ? true:false">
                                   <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
                                     <el-button type="danger" size="mini" icon="el-icon-close" 
-                                      circle @click.stop=""   
+                                      circle @click.stop="toClick(getClassId(scope.row.user_name,5))"   
                                     ></el-button>
                                   </div>
                                 </div>
@@ -178,7 +178,7 @@
                                 <div v-if="name==scope.row.user_name&&column_lie =='周六' ? true:false">
                                   <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
                                     <el-button type="danger" size="mini" icon="el-icon-close" 
-                                      circle @click.stop=""   
+                                      circle @click.stop="toClick(getClassId(scope.row.user_name,6))"   
                                     ></el-button>
                                   </div>
                                 </div>
@@ -202,7 +202,7 @@
                                 <div v-if="name==scope.row.user_name&&column_lie =='周日' ? true:false">
                                   <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
                                     <el-button type="danger" size="mini" icon="el-icon-close" 
-                                      circle @click.stop=""   
+                                      circle @click.stop="toClick(getClassId(scope.row.user_name,0))"   
                                     ></el-button>
                                   </div>
                                 </div>
@@ -916,7 +916,7 @@ export default {
                         sixStr = strSix
                      }
                     }
-
+                   console.log("staffList",staffList)
                     let tempArr = [], newArr = []
                     for (let i = 0; i < staffList.length; i++) {
                         if (tempArr.indexOf(staffList[i].user_name) == -1) {
@@ -927,14 +927,14 @@ export default {
                                 user_type:staffList[i].doctor_type,
                                 is_sort:staffList[i].is_sort,
                                 sort:staffList[i].sort,
-                                list: [{class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week,user_type:staffList[i].doctor_type,class_attributes:staffList[i].class_attributes}]
+                                list: [{class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week,user_type:staffList[i].doctor_type,class_attributes:staffList[i].class_attributesk,id:staffList[i].id}]
                             })
                             tempArr.push(staffList[i].user_name);
                         } else {
                             console.log("staffList",staffList[i].user_name)
                             for (let j = 0; j < newArr.length; j++) {
                                 if (newArr[j].admin_user_id == staffList[i].admin_user_id) {
-                                    newArr[j].list.push({class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week,user_type:staffList[i].doctor_type,class_attributes:staffList[i].class_attributes})
+                                    newArr[j].list.push({class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week,user_type:staffList[i].doctor_type,class_attributes:staffList[i].class_attributes,id:staffList[i].id})
                                 }
                             }
                         }
@@ -1051,6 +1051,26 @@ export default {
                 return newClass
             }
 
+        },
+        getClassId(name,index){
+           
+            if(name != undefined){
+                let id = '';
+                this.tableData.map(item => {
+                if(item.user_name == name){
+                    if(item.list){
+                        item.list.map(it => {
+                            if(it.schedule_week == index){
+                                id = it.id
+                            }
+                        })
+                    }
+
+                }
+                })
+                return id
+            }
+
         },
         getClassAttributes(name,index){
             if(name != undefined){
@@ -2051,7 +2071,7 @@ export default {
         return jsonData.map(v => filterVal.map(j => v[j]))
        },
 
-       toClick(row,index){
+       toClick(id,index){
           this.$confirm(
             '是否要清除当前排班? <br>清除后,信息将无法恢复',
             '删除提示',
@@ -2062,8 +2082,9 @@ export default {
                 type: 'warning'
             }
             ).then(()=>{
-
-            DeleteStaffScheduleById(row.id).then(response=>{
+             console.log("rowwoowowow",id)
+           
+            DeleteStaffScheduleById(id).then(response=>{
                 if(response.data.state == 1){
                     var msg =  response.data.data.msg
                     this.$message.success("清除成功")

src/xt_pages/role/admin.vue

@@ -25,12 +25,12 @@
         >医药师登记</el-button>
 
 
-       <el-button
+       <!-- <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toJiaBan">首拼</el-button>
+          @click="toJiaBan">首拼</el-button> -->
 
 
           <!-- <el-button

src/xt_pages/stock/drugs/cancelDrugStockOrderDetail.vue

@@ -64,6 +64,7 @@
           </template>
         </el-table-column>
 
+       
 
       </el-table>
     </el-row>

src/xt_pages/stock/drugs/components/drugCancelDetail.vue

@@ -143,6 +143,11 @@
             {{scope.row.count}}
           </template>
         </el-table-column>
+        <el-table-column label="单位" align="center">
+          <template slot-scope="scope">
+            {{scope.row.unit}}
+          </template>
+        </el-table-column>
         <el-table-column label="总价" align="center">
           <template slot-scope="scope">
             {{scope.row.total_price}}
@@ -472,10 +477,10 @@ export default {
     exportListOne(){
       // let obj = {'index':'合计','total_price':0}
     
- 
+      console.log("@332322323232332",this.tableList)
        for(let i=0;i<this.tableList.length;i++){
           this.tableList[i].index = i+1
-          this.tableList[i].unit = this.tableList[i].dose + this.tableList[i].dose_unit + "*"+this.tableList[i].min_number + this.tableList[i].min_unit+"/"+this.tableList[i].max_unit
+          this.tableList[i].unit_one = this.tableList[i].dose + this.tableList[i].dose_unit + "*"+this.tableList[i].min_number + this.tableList[i].min_unit+"/"+this.tableList[i].max_unit
           if(this.tableList[i].drug_type == 1){
              this.tableList[i].drugtype = "西药"
           }
@@ -490,11 +495,13 @@ export default {
 
         }
     
-      console.log("@332322323232332",this.tableList)
+    
+
+  
       
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','单据编号', '药品类型','药品名称', '规格型号','生产厂商','进销商','操作时间','制单人','退货价','数量','总价']
-       const filterVal = ['index','order_number','drugtype','drug_name', 'specification_name','manufacturer_name','dealer_name', 'time','user_name','price','count','total_price']
+       const tHeader = ['序号','单据编号', '药品类型','药品名称', '规格型号','生产厂商','进销商','操作时间','制单人','退货价','数量','单位','总价']
+       const filterVal = ['index','order_number','drugtype','drug_name', 'specification_name','manufacturer_name','dealer_name', 'time','user_name','price','count','unit','total_price']
 
        const data = this.formatJson(filterVal, this.tableList)
 

src/xt_pages/stock/drugs/drugCancelDetailPrint.vue

@@ -21,6 +21,7 @@
               <td style="line-height: 50px" width="250">规格型号</td>
               <td style="line-height: 50px" width="50">单位</td>
               <td style="line-height: 50px" width="80">数量</td>
+              <td style="line-height: 50px" width="80">单位</td>
               <td style="line-height:50px" width="80">单价</td>
               <td style="line-height:50px" width="80">总价</td>
               <td style="line-height: 50px" width="80">备 注</td>
@@ -43,6 +44,10 @@
               <td style="line-height: 50px">
                   {{item.count}}
                
+              </td>
+              <td style="line-height: 50px">
+                  {{item.unit}}
+               
               </td>
               <td style="line-height:50px">
                   {{item.price}}

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -152,6 +152,11 @@
              <span > {{getDrugCount(scope.row.over_count,scope.row.BaseDrugLib.max_unit,scope.row.BaseDrugLib.min_unit,scope.row.BaseDrugLib.min_number)}}</span>
            </template>
         </el-table-column>
+        <el-table-column prop="remark" label="备注" align="center">
+           <template slot-scope="scope">
+             <span > {{scope.row.remark}}</span>
+           </template>
+        </el-table-column>
         <!-- <el-table-column prop="drug_name" label="批号" align="center">
            <template slot-scope="scope">
              <span>{{scope.row.batch_number}}</span>

src/xt_pages/stock/stockFlow.vue

@@ -154,6 +154,11 @@
              <span > {{scope.row.over_count}}</span>
            </template>
         </el-table-column>
+        <el-table-column prop="remark" label="备注" align="center">
+           <template slot-scope="scope">
+             <span > {{scope.row.remark}}</span>
+           </template>
+        </el-table-column>
        </el-table>
        
       <el-pagination

src/xt_pages/user/Sitemap.vue

@@ -830,14 +830,14 @@ export default{
 
       var fileType = file.type
       const isJPG = fileType.indexOf('image') > -1
-      const isLt2M = file.size / 1024 / 1024 < 5
+      const isLt2M = file.size / 1024 / 1024 < 20
 
       if (!isJPG) {
         this.$message.error('只能上传图片')
         return false
       }
       if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 5MB!')
+        this.$message.error('上传头像图片大小不能超过 20MB!')
         return false
       }