提交代码

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -125,12 +125,12 @@
 
 
 
-            <el-button  size="small"  v-if="org_id == 10138 || org_id == 10278"
+            <el-button  size="small"  v-if="(org_id == 10138 && this.order.is_upload_diagnose == 0 && this.order.order_status == 2) || (org_id == 10278 && this.order.is_upload_diagnose == 0 && this.order.order_status == 2)"
                        @click="openZF(1)"
                        type="primary">自费门诊就医上传(4205)
             </el-button>
 
-            <el-button  size="small" v-if="org_id == 10138  || org_id == 10278"
+            <el-button  size="small" v-if="(org_id == 10138  && this.order.is_upload_success == 0 && this.order.order_status == 2) || (org_id == 10278  && this.order.is_upload_success == 0 && this.order.order_status == 2) "
                         @click="openZF(2)"
                         type="primary">自费上传确认(4203)
             </el-button>
@@ -3051,7 +3051,7 @@ export default {
 
               } else {
                 that.$message({ message: '上传成功', type: 'success', duration: 5000 })
-
+                that.changeRadioAndPatient(2)
               }
 
             }
@@ -3081,7 +3081,7 @@ export default {
 
               } else {
                 that.$message({ message: '确认成功', type: 'success', duration: 5000 })
-
+                that.changeRadioAndPatient(2)
               }
 
             }

src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue

@@ -191,21 +191,17 @@ export default {
   },
   methods: {
     getAge(patient){
-      var thisLen = patient.id_card_no.length
-      var birth = ''
-      if (thisLen == 15) {
-        birth = '19' + patient.id_card_no.substr(6, 6)
-      } else {
-        birth = patient.id_card_no.substr(6, 8)
-      }
-      var births =
-        birth.substr(0, 4) +
-        '-' +
-        birth.substr(4, 2) +
-        '-' +
-        birth.substr(6, 2)
-      return jsGetAge(births, '-')
-
+      // 将时间戳转换为 Date 对象
+      const birthday = new Date(patient.birthday* 1000);
+
+      // 获取当前日期
+      const now = new Date();
+      // 计算年龄差
+      const ageDiffMs = now - birthday;
+      const ageDate = new Date(ageDiffMs); // 不需要减掉 1970 年的时间戳
+      // 提取年份
+      const age = ageDate.getUTCFullYear() - 1970;
+      return age
     },
     getPatientCaseHistory() {
       const params = {