解决合并冲突

openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/prescription.vue

@@ -27,7 +27,7 @@
           <span>CF0000000001</span>
         </div>
         <div style="text-align: center">
-          <h2>医院</h2>
+          <h2>长春大学医院</h2>
         </div>
         <div style="text-align: center">
           <h3>处方单</h3>

openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/index.vue

@@ -112,7 +112,7 @@ import historicalPrescriptionDetail from './component/details.vue';
 import Prescription from './component/prescription.vue';
 const { proxy } = getCurrentInstance();
 
-const { item_type } = proxy.useDict('item_type');
+const { item_category_code } = proxy.useDict('item_category_code');
 const prescriptionNo = ref('');
 const typeDetail = ref('1');
 const purchaseinventoryList = ref([]);