chenqi 48c42ac3c2 Merge remote-tracking branch 'origin/develop' into develop ...

# Conflicts:
#	healthlink-his-ui/src/views/charge/cliniccharge/index.vue
#	healthlink-his-ui/src/views/inpatientDoctor/home/components/diagnosis/chineseMedicineDialog.vue
#	healthlink-his-ui/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue
#	healthlink-his-ui/src/views/pharmacymanagement/westernmedicine/index.vue

2026-06-25 11:16:15 +08:00

..

cliniccharge

Merge remote-tracking branch 'origin/develop' into develop

2026-06-25 11:16:15 +08:00

clinicRecord

feat(i18n): migrate billing, triage, pharmacy pages to vue-i18n (206+120+60 keys)

2026-06-24 22:04:53 +08:00

clinicrefund

feat(i18n): migrate billing, triage, pharmacy pages to vue-i18n (206+120+60 keys)

2026-06-24 22:04:53 +08:00

outpatientregistration

feat(i18n): migrate nursing, inpatient, mobile nursing pages + billing remaining components to vue-i18n

2026-06-24 22:37:08 +08:00

patientCardRenewal

feat(i18n): migrate billing, triage, pharmacy pages to vue-i18n (206+120+60 keys)

2026-06-24 22:04:53 +08:00

patientSearch

feat(i18n): migrate billing, triage, pharmacy pages to vue-i18n (206+120+60 keys)

2026-06-24 22:04:53 +08:00

registerRecords

feat(i18n): migrate billing, triage, pharmacy pages to vue-i18n (206+120+60 keys)

2026-06-24 22:04:53 +08:00

schedule

feat(i18n): migrate billing, triage, pharmacy pages to vue-i18n (206+120+60 keys)

2026-06-24 22:04:53 +08:00

surgerycharge

feat(i18n): migrate billing, triage, pharmacy pages to vue-i18n (206+120+60 keys)

2026-06-24 22:04:53 +08:00

threePayRecord

feat(i18n): migrate billing, triage, pharmacy pages to vue-i18n (206+120+60 keys)

2026-06-24 22:04:53 +08:00