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

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