解决合并冲突

2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
--- a/openhis-ui-vue3/src/views/doctorstation/components/eprescriptiondialog.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/eprescriptiondialog.vue
@@ -743,7 +743,6 @@ function selectMedRow(key, row, index) {
      const item = list.sort((a, b) => {
        return new Date(b.begndate) - new Date(a.begndate);
      });
-      //debugger
      if (item.length > 0) {
        if (item[0].medChrgitmType != '11' && item[0].medChrgitmType != '09') {
          form.medicationInfoList.shift();