Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/dialysis.js

@@ -566,4 +566,13 @@ export function getDialysisProject(params){
     method:"Get",
     params:params
   })
+}
+
+export function getPatientBefor(params){
+ 
+  return request({
+    url:"/api/schedule/getpatientbefor",
+    method:"Get",
+    params:params,
+  })
 }

src/xt_pages/dialysis/batch_print/batch_print_order_eighty.vue

@@ -40,10 +40,11 @@
               </div>
             </div>
             <div class="inline_block" style="flex: 1;">
-              年龄:
+              年龄1:
               <div class="under_line" style="width: 30px; text-align: center">
                 <!-- {{ record.patient.age }} -->
-                {{ getAge(record.patient) }}
+                <!-- {{ getAge(record.patient) }} -->
+                {{ calculateAge(record.patient.id_card_no,record.prescription.record_date) }}
               </div>
               岁
             </div>
@@ -1931,6 +1932,47 @@ export default {
       });
   },
   methods: {
+    calculateAge(idNumber,created_time) {
+    var year = this.getTimeOne(created_time)
+
+    var month = this.getTimeTwo(created_time)
+
+    var day = this.getTimeThree(created_time)
+    console.log("start_time=====",year)
+    // 假设身份证号码是18位，且生日在第7位到第14位
+    const birthYear = parseInt(idNumber.substring(6, 10), 10);
+    const birthMonth = parseInt(idNumber.substring(10, 12), 10);
+    const birthDay = parseInt(idNumber.substring(12, 14), 10);
+ 
+    const today = new Date();
+    // console.log("today============",today)
+    var ageYear = year - birthYear;
+    let ageMonth = month - birthMonth; // 月份是从0开始的
+    let ageDay = day - birthDay;
+ 
+    // 调整月份和日期，以便于正确计算
+      if (ageDay < 0) {
+          ageMonth -= 1;
+          // 获取上个月的天数
+          const pastMonthDay = new Date(year,month, 0).getDate();
+          ageDay += pastMonthDay;
+      }
+      if (ageMonth < 0) {
+          ageYear -= 1;
+          ageMonth += 12;
+      }
+   
+     return ageYear 
+    },
+    getTimeOne(val) {
+      return uParseTime(val, "{y}");
+    },
+    getTimeTwo(val) {
+      return uParseTime(val, "{m}");
+    },
+    getTimeThree(val) {
+      return uParseTime(val, "{h}");
+    },
     getmode(id){
       const options = this.modeOptions
       if(id !=0){

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -2980,9 +2980,10 @@
                           />
                         </div>
                       </div>
-                      <div class="inline_block" style="flex: 1">
+                      <div class="inline_block" style="flex: 1" >
                         治疗医生：
                         <div
+                          v-if="org_id!=10677"
                           class="under_line"
                           style="width: 80px; text-align: center"
                         >

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -1921,7 +1921,7 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
-          if(this.org_id ==10206){
+          if(this.org_id ==10206 || this.org_id == 0){
             this.template_id = 80
             // this.template_id = 81
             console.log("templage-i233232323232322323233232323223",this.template_id)

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

@@ -1476,7 +1476,7 @@
 </template>
 
 <script>
-  import { CreateGroupAdvice, GetSolution, postPrescription, postSoulution,saveInformation,getPatientRecordList } from '@/api/dialysis'
+  import { CreateGroupAdvice, GetSolution, postPrescription, postSoulution,saveInformation,getPatientRecordList,getPatientBefor } from '@/api/dialysis'
   import { getDataConfig } from '@/utils/data'
   import { calculateAnticoagulantZL, uParseTime,replacementFlow } from '@/utils/tools'
   import store from '@/store'
@@ -2634,16 +2634,17 @@ mu
         }
       },
       show(pre, schedual, last, his_is_open,is_advice_open,admins) {
-
+        console.log("除非=======================")
+      
         if(this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635  || this.$store.getters.xt_user.template_info.org_id==0   || this.$store.getters.xt_user.template_info.org_id==10721){
           if(this.predialysis!=undefined){
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
-              this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)
+              this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(1)
             }
 
             if(this.dialysisPrescription.prescription_water==0 || this.dialysisPrescription.prescription_water==""){
-              if((this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)>0){
-                this.dialysisPrescription.prescription_water = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)
+              if((this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(1)>0){
+                this.dialysisPrescription.prescription_water = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(1)
               }
 
             }
@@ -3100,6 +3101,10 @@ mu
         this.pre = pre
         // console.log("pre1", pre);
         this.getPermission()
+        if(this.$store.getters.xt_user.template_info.org_id==10164 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==0){
+          this.getPatientBefor()
+        }
+      
 
         let last_weight_after = 0
         let weight_before = 0
@@ -4884,6 +4889,53 @@ mu
           }
         })
     },
+    getPatientBefor(){
+     
+       var patient_id = 0
+       var record_date =""
+       if(this.$route.query.patient_id!=undefined){
+        patient_id =this.$route.query.patient_id
+        record_date = uParseTime(this.$route.query.date, '{y}-{m}-{d}')
+       }else{
+        patient_id = this.patient.id
+        record_date = this.record_date
+       }
+       var params = {
+        patient_id:patient_id,
+        record_date:record_date
+       }
+       console.log("param----------------",params)
+      getPatientBefor(params).then(response=>{
+         if(response.data.state == 1){
+          var patientBefor = response.data.data.patientBefor
+          var prescription = response.data.data.prescription
+          if(patientBefor!=undefined){
+            if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
+              this.dialysisPrescription.target_ultrafiltration = (patientBefor.weight_before - patientBefor.dry_weight - patientBefor.additional_weight).toFixed(1)
+            }
+
+            if(this.dialysisPrescription.prescription_water==0 || this.dialysisPrescription.prescription_water==""){
+              if((patientBefor.weight_before - patientBefor.dry_weight - patientBefor.additional_weight).toFixed(1)>0){
+                this.dialysisPrescription.prescription_water = (patientBefor.weight_before - patientBefor.dry_weight - patientBefor.additional_weight).toFixed(1)
+              }
+
+            }
+
+            // if(this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10164 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==0){
+            //   this.dialysisPrescription.target_ultrafiltration = prescription.target_ultrafiltration
+            //   this.dialysisPrescription.prescription_water = prescription.prescription_water
+
+            // }
+          }
+          if(prescription!=undefined){
+           
+            this.dialysisPrescription.target_ultrafiltration = prescription.target_ultrafiltration
+            this.dialysisPrescription.prescription_water = prescription.prescription_water
+          }
+
+         }
+      }) 
+    },
     unique(arr) {
       const res = new Map()
       return arr.filter((arr) => !res.has(arr.name) && res.set(arr.name, 1))

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -2686,7 +2686,7 @@ export default {
           this.patient_id = response.data.data.patientInfo.DialysisSchedule.patient_id
           this.patient_name = response.data.data.patientInfo.name
 
-          if(this.org_id !=10206){
+          if(this.org_id !=10206 && this.org_id !=0){
             this.org_template_info.template_id= response.data.data.org_template_info.template_id
             this.org_template_info = response.data.data.org_template_info;
           }else{

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -2527,7 +2527,7 @@
                         />
                       </div>
                       <div
-                        v-if="org_id!=10191"
+                        v-if="org_id!=10191 && org_id!=10677"
                         class="under_line"
                         style="width: 80px; text-align: center"
                       >

src/xt_pages/dialysis/template/DialysisPrintOrdereighty.vue

@@ -35,7 +35,8 @@
           <div class="inline_block" style="flex: 1;">
             年龄:
             <div class="under_line" style="width: 30px; text-align: center">
-              {{ getAge(patientInfo) }}
+              <!-- {{ getAge(patientInfo) }} -->
+              {{ calculateAge(patientInfo.id_card_no,prescription.record_date) }}
             </div>
             岁
           </div>
@@ -1365,7 +1366,8 @@
         <div class="inline_block" style="margin-left: 10px;">
           年龄：
           <div class="under_line" style="width: 30px;text-align: left">
-            {{ getAge(patientInfo) }}
+            <!-- {{ getAge(patientInfo) }} -->
+            {{ calculateAge(patientInfo.id_card_no,prescription.record_date) }}
           </div>
           岁
         </div>
@@ -3432,7 +3434,83 @@ export default {
       }else{
         this.$message.success('核对完成')
       }
-    }
+    },
+    calculateAge(idNumber,created_time) {
+    var year = this.getTimeOne(created_time)
+
+    var month = this.getTimeTwo(created_time)
+
+    var day = this.getTimeThree(created_time)
+    console.log("start_time=====",year)
+    // 假设身份证号码是18位，且生日在第7位到第14位
+    const birthYear = parseInt(idNumber.substring(6, 10), 10);
+    const birthMonth = parseInt(idNumber.substring(10, 12), 10);
+    const birthDay = parseInt(idNumber.substring(12, 14), 10);
+ 
+    const today = new Date();
+    // console.log("today============",today)
+    var ageYear = year - birthYear;
+    let ageMonth = month - birthMonth; // 月份是从0开始的
+    let ageDay = day - birthDay;
+ 
+    // 调整月份和日期，以便于正确计算
+      if (ageDay < 0) {
+          ageMonth -= 1;
+          // 获取上个月的天数
+          const pastMonthDay = new Date(year,month, 0).getDate();
+          ageDay += pastMonthDay;
+      }
+      if (ageMonth < 0) {
+          ageYear -= 1;
+          ageMonth += 12;
+      }
+   
+     return ageYear 
+    },
+    getTime(val) {
+      return uParseTime(val, "{y}年{m}月{d}日");
+    },
+    getTimeOne(val) {
+      return uParseTime(val, "{y}");
+    },
+    getTimeTwo(val) {
+      return uParseTime(val, "{m}");
+    },
+    getTimeThree(val) {
+      return uParseTime(val, "{h}");
+    },
+    calculateAge(idNumber,created_time) {
+    var year = this.getTimeOne(created_time)
+
+    var month = this.getTimeTwo(created_time)
+
+    var day = this.getTimeThree(created_time)
+    console.log("start_time=====",year)
+    // 假设身份证号码是18位，且生日在第7位到第14位
+    const birthYear = parseInt(idNumber.substring(6, 10), 10);
+    const birthMonth = parseInt(idNumber.substring(10, 12), 10);
+    const birthDay = parseInt(idNumber.substring(12, 14), 10);
+ 
+    const today = new Date();
+    // console.log("today============",today)
+    var ageYear = year - birthYear;
+    let ageMonth = month - birthMonth; // 月份是从0开始的
+    let ageDay = day - birthDay;
+ 
+    // 调整月份和日期，以便于正确计算
+      if (ageDay < 0) {
+          ageMonth -= 1;
+          // 获取上个月的天数
+          const pastMonthDay = new Date(year,month, 0).getDate();
+          ageDay += pastMonthDay;
+      }
+      if (ageMonth < 0) {
+          ageYear -= 1;
+          ageMonth += 12;
+      }
+   
+     return ageYear 
+    },
 
   },
   watch: {

src/xt_pages/user/components/PatientDetail.vue

@@ -1332,7 +1332,9 @@
                     年龄
                   </td>
                   <td style="padding: 5px 0px;font-size: 22px;width:10%;">
-                    {{ patientPrint.age }}岁
+                    <!-- {{ patientPrint.age }} -->
+                     {{ calculateAge(patientPrint.id_card_no,patientPrint.created_time) }}
+                    岁
                   </td>
                   <td style="padding: 5px 0px;font-size: 22px;font-weight: 500;width:12%;">
                     医保类型
@@ -1835,9 +1837,50 @@ export default {
     this.printDate = data.getFullYear() + "-" + month + "-" + date;
   },
   methods: {
+   calculateAge(idNumber,created_time) {
+    var year = this.getTimeOne(created_time)
+
+    var month = this.getTimeTwo(created_time)
+
+    var day = this.getTimeThree(created_time)
+    console.log("start_time=====",year)
+    // 假设身份证号码是18位，且生日在第7位到第14位
+    const birthYear = parseInt(idNumber.substring(6, 10), 10);
+    const birthMonth = parseInt(idNumber.substring(10, 12), 10);
+    const birthDay = parseInt(idNumber.substring(12, 14), 10);
+ 
+    const today = new Date();
+    // console.log("today============",today)
+    var ageYear = year - birthYear;
+    let ageMonth = month - birthMonth; // 月份是从0开始的
+    let ageDay = day - birthDay;
+ 
+    // 调整月份和日期，以便于正确计算
+      if (ageDay < 0) {
+          ageMonth -= 1;
+          // 获取上个月的天数
+          const pastMonthDay = new Date(year,month, 0).getDate();
+          ageDay += pastMonthDay;
+      }
+      if (ageMonth < 0) {
+          ageYear -= 1;
+          ageMonth += 12;
+      }
+   
+     return ageYear 
+    },
     getTime(val) {
       return uParseTime(val, "{y}年{m}月{d}日");
     },
+    getTimeOne(val) {
+      return uParseTime(val, "{y}");
+    },
+    getTimeTwo(val) {
+      return uParseTime(val, "{m}");
+    },
+    getTimeThree(val) {
+      return uParseTime(val, "{h}");
+    },
     printThisInfo() {
       var ptime = Math.round(new Date().getTime() / 1000);
       this.print_time = uParseTime(ptime, "{y}年{m}月{d}日");

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))