提交merge1.3

2025-12-27 15:30:40 +08:00
parent 088861f66e
commit 3c497417dc
167 changed files with 0 additions and 17577 deletions
--- a/openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/prescription.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/prescription.vue
@@ -27,11 +27,7 @@
          <span>CF0000000001</span>
        </div>
        <div style="text-align: center">
-<<<<<<< HEAD
-          <h2>长春大学医院</h2>
-=======
          <h2>长春市朝阳区中医院医院</h2>
->>>>>>> v1.3
        </div>
        <div style="text-align: center">
          <h3>处方单</h3>