提交merge1.3

2025-12-27 15:30:25 +08:00
parent 8c607c8749
commit 088861f66e
1245 changed files with 220442 additions and 77616 deletions
--- a/openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/prescription.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/prescription.vue
@@ -27,7 +27,11 @@
          <span>CF0000000001</span>
        </div>
        <div style="text-align: center">
+<<<<<<< HEAD
          <h2>长春大学医院</h2>
+=======
+          <h2>长春市朝阳区中医院医院</h2>
+>>>>>>> v1.3
        </div>
        <div style="text-align: center">
          <h3>处方单</h3>
@@ -235,4 +239,4 @@ getList();
  width: 80px;
  display: inline-block;
 }
-</style>
+</style>