提交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/medicationmanagement/statisticalManagement/patientMasterDetails.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/patientMasterDetails.vue
@@ -148,8 +148,13 @@ const queryParams = ref({
    pageNo: 1,
    pageSize: 10,
    searchKey: undefined,
+<<<<<<< HEAD
    occurrenceTimeSTime: undefined,
    occurrenceTimeETime: undefined,
+=======
+    encounterBusNo: undefined,
+    patientName: undefined,
+>>>>>>> v1.3
 });

 /** 查询调拨管理项目列表 */