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

2025-12-10 15:45:19 +08:00
parent 391506e423 b1117b4157
commit 67a8351d70
37 changed files with 192 additions and 923 deletions
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionMedicineList.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionMedicineList.vue
@@ -15,7 +15,6 @@
      <el-table-column label="规格" align="center" prop="volume" /> -->
      <!-- <el-table-column label="用法" align="center" prop="methodCode_dictText" />
      <el-table-column label="单次剂量" align="center" prop="dose" />
-<<<<<<< HEAD
      <el-table-column
        label="剂量单位"
        align="center"