Browse Source

提交代码

陈少旭 2 years ago
parent
commit
261b169286

+ 4 - 4
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue View File

125
 
125
 
126
 
126
 
127
 
127
 
128
-            <el-button  size="small"  v-if="org_id == 10138 || org_id == 10278"
128
+            <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)"
129
                        @click="openZF(1)"
129
                        @click="openZF(1)"
130
                        type="primary">自费门诊就医上传(4205)
130
                        type="primary">自费门诊就医上传(4205)
131
             </el-button>
131
             </el-button>
132
 
132
 
133
-            <el-button  size="small" v-if="org_id == 10138  || org_id == 10278"
133
+            <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) "
134
                         @click="openZF(2)"
134
                         @click="openZF(2)"
135
                         type="primary">自费上传确认(4203)
135
                         type="primary">自费上传确认(4203)
136
             </el-button>
136
             </el-button>
3051
 
3051
 
3052
               } else {
3052
               } else {
3053
                 that.$message({ message: '上传成功', type: 'success', duration: 5000 })
3053
                 that.$message({ message: '上传成功', type: 'success', duration: 5000 })
3054
-
3054
+                that.changeRadioAndPatient(2)
3055
               }
3055
               }
3056
 
3056
 
3057
             }
3057
             }
3081
 
3081
 
3082
               } else {
3082
               } else {
3083
                 that.$message({ message: '确认成功', type: 'success', duration: 5000 })
3083
                 that.$message({ message: '确认成功', type: 'success', duration: 5000 })
3084
-
3084
+                that.changeRadioAndPatient(2)
3085
               }
3085
               }
3086
 
3086
 
3087
             }
3087
             }

+ 11 - 15
src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue View File

191
   },
191
   },
192
   methods: {
192
   methods: {
193
     getAge(patient){
193
     getAge(patient){
194
-      var thisLen = patient.id_card_no.length
195
-      var birth = ''
196
-      if (thisLen == 15) {
197
-        birth = '19' + patient.id_card_no.substr(6, 6)
198
-      } else {
199
-        birth = patient.id_card_no.substr(6, 8)
200
-      }
201
-      var births =
202
-        birth.substr(0, 4) +
203
-        '-' +
204
-        birth.substr(4, 2) +
205
-        '-' +
206
-        birth.substr(6, 2)
207
-      return jsGetAge(births, '-')
208
-
194
+      // 将时间戳转换为 Date 对象
195
+      const birthday = new Date(patient.birthday* 1000);
196
+
197
+      // 获取当前日期
198
+      const now = new Date();
199
+      // 计算年龄差
200
+      const ageDiffMs = now - birthday;
201
+      const ageDate = new Date(ageDiffMs); // 不需要减掉 1970 年的时间戳
202
+      // 提取年份
203
+      const age = ageDate.getUTCFullYear() - 1970;
204
+      return age
209
     },
205
     },
210
     getPatientCaseHistory() {
206
     getPatientCaseHistory() {
211
       const params = {
207
       const params = {