ZYT/zyt
2
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "出丸 计算公式修改"

Browse Source 
This reverts commit ee1b140902.
This commit is contained in:
long
2026-05-08 17:02:31 +08:00
parent ee1b140902
commit c78ba50331
3 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/src/views/consumer/prescription/index.vue
-16
View File
@@ -2138,22 +2138,6 @@ const rxOutPelletText = computed(() => {
function computeOutPellet(v: any): string {
if (!v) return ''
if ((v.prescription_type || '浓缩水丸') === '浓缩水丸') {
const days = Number(v.medication_days ?? v.usage_days ?? v.dose_count)
const times = Number(v.times_per_day)
const doseG = Number(v.dosage_amount)
const bags = Number(v.dosage_bag_count) > 0 ? Number(v.dosage_bag_count) : 1
if (
Number.isFinite(days) &&
Number.isFinite(times) &&
Number.isFinite(doseG) &&
days > 0 &&
times > 0 &&
doseG > 0
) {
return formatNum(days * times * doseG * bags)
}
}
const explicit = v.out_pellet || v.total_weight
if (explicit && Number(explicit) > 0) return formatNum(Number(explicit))
const list = slipHerbsList.value
admin/src/views/consumer/prescription/order_list.vue
+3 -4
View File
@@ -4701,14 +4701,13 @@ const slipPerBagDosageText = computed(() => {
const slipPillGrams = computed(() => {
const d = prescriptionViewData.value
if (!d || (d.prescription_type || '浓缩水丸') !== '浓缩水丸') return null
/** 用药疗程以业务订单 medication_days 为准，缺省时回退处方 usage_days / 剂数；出丸 = 每袋用量×袋数×每天次数×服用天数 */
/** 用药疗程以业务订单 medication_days 为准，缺省时回退处方 usage_days / 剂数 */
const days = Number(d.medication_days ?? d.usage_days ?? d.dose_count)
const times = Number(d.times_per_day)
const doseG = Number(d.dosage_amount)
const bags = Number(d.dosage_bag_count) > 0 ? Number(d.dosage_bag_count) : 1
if (!Number.isFinite(days) || !Number.isFinite(times) || !Number.isFinite(doseG)) return null
if (days <= 0 || times <= 0 || doseG <= 0) return null
return days * times * doseG * bags
return days * times * doseG
})
/* ============================================================
@@ -4819,7 +4818,7 @@ const rxUsageText = computed(() => {
return seg.join(', ')
})
/** 出丸：优先用 slipPillGrams（每袋用量×袋数×每天次数×服用天数），否则按药材总量×剂数 */
/** 出丸：优先用 slipPillGrams（按医嘱天数·次数·每包克数），否则按药材总量×剂数 */
const rxOutPelletGrams = computed(() => {
const pill = slipPillGrams.value
if (typeof pill === 'number' && isFinite(pill) && pill > 0) return formatNum(pill)
admin/src/views/consumer/prescription/order_list_h5.vue
+3 -4
View File
@@ -4653,14 +4653,13 @@ const slipPerBagDosageText = computed(() => {
const slipPillGrams = computed(() => {
const d = prescriptionViewData.value
if (!d || (d.prescription_type || '浓缩水丸') !== '浓缩水丸') return null
/** 用药疗程以业务订单 medication_days 为准，缺省时回退处方 usage_days / 剂数；出丸 = 每袋用量×袋数×每天次数×服用天数 */
/** 用药疗程以业务订单 medication_days 为准，缺省时回退处方 usage_days / 剂数 */
const days = Number(d.medication_days ?? d.usage_days ?? d.dose_count)
const times = Number(d.times_per_day)
const doseG = Number(d.dosage_amount)
const bags = Number(d.dosage_bag_count) > 0 ? Number(d.dosage_bag_count) : 1
if (!Number.isFinite(days) || !Number.isFinite(times) || !Number.isFinite(doseG)) return null
if (days <= 0 || times <= 0 || doseG <= 0) return null
return days * times * doseG * bags
return days * times * doseG
})
/* ============================================================
@@ -4771,7 +4770,7 @@ const rxUsageText = computed(() => {
return seg.join(', ')
})
/** 出丸：优先用 slipPillGrams（每袋用量×袋数×每天次数×服用天数），否则按药材总量×剂数 */
/** 出丸：优先用 slipPillGrams（按医嘱天数·次数·每包克数），否则按药材总量×剂数 */
const rxOutPelletGrams = computed(() => {
const pill = slipPillGrams.value
if (typeof pill === 'number' && isFinite(pill) && pill > 0) return formatNum(pill)