From b5677479012e8edd059ae4b3f0f539bac8474132 Mon Sep 17 00:00:00 2001
From: chenqi <chen.qi@jin-group.cn>
Date: Tue, 30 Dec 2025 15:34:43 +0800
Subject: [PATCH] =?UTF-8?q?style(flowable):=20=E4=BC=98=E5=8C=96=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81=E7=9A=84import?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E5=92=8C=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/styles/ui-standard.scss        |  3 +-
 .../src/components/Pagination/index.vue       |  4 +--
 .../src/views/doctorstation/components/api.js |  2 +-
 .../inspection/inspectionApplication.vue      | 13 ++++----
 .../prescription/prescriptionlist.vue         |  2 +-
 .../src/views/system/notice/index.vue         | 30 +++++++------------
 6 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/openhis-ui-vue3/src/assets/styles/ui-standard.scss b/openhis-ui-vue3/src/assets/styles/ui-standard.scss
index 4691a084..40ce6608 100644
--- a/openhis-ui-vue3/src/assets/styles/ui-standard.scss
+++ b/openhis-ui-vue3/src/assets/styles/ui-standard.scss
@@ -198,8 +198,9 @@
    ============================================ */
 .pagination-container {
   margin-top: 16px;
-  padding: 0 8px;
+  padding: 0;
   text-align: right;
+  background-color: transparent;
 
   .el-pagination {
     .el-pager li {
diff --git a/openhis-ui-vue3/src/components/Pagination/index.vue b/openhis-ui-vue3/src/components/Pagination/index.vue
index 23e388b1..bc2ee3ea 100644
--- a/openhis-ui-vue3/src/components/Pagination/index.vue
+++ b/openhis-ui-vue3/src/components/Pagination/index.vue
@@ -96,8 +96,8 @@ function handleCurrentChange(val) {
 
 <style scoped>
 .pagination-container {
-  background: #fff;
-  padding: 32px 16px;
+  background: transparent;
+  padding: 0;
 }
 .pagination-container.hidden {
   display: none;
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/api.js b/openhis-ui-vue3/src/views/doctorstation/components/api.js
index 4af23876..76c45ad7 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/api.js
+++ b/openhis-ui-vue3/src/views/doctorstation/components/api.js
@@ -802,7 +802,7 @@ export function getTestResult(queryParams) {
  */
 export function getInspectionApplicationList(queryParams) {
   return request({
-    url: '/doctor-station/inspection/application-list',
+    url: '/reg-doctorstation/request-form/get-inspection',
     method: 'get',
     params: queryParams,
   });
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue b/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue
index 2a360356..5910f625 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue
@@ -587,18 +587,21 @@ function initData() {
     formData.departmentName = props.patientInfo.departmentName || ''
     formData.doctorName = props.patientInfo.doctorName || ''
   }
-  getInspectionList()
+  // 只有在存在 encounterId 时才调用接口
+  if (queryParams.encounterId) {
+    getInspectionList()
+  }
 }
 
 // 获取检验申请单列表
 function getInspectionList() {
   loading.value = true
 
-  // 调用真实的API
-  getInspectionApplicationList(queryParams.value).then((res) => {
+  // 调用真实的API，只传递 encounterId 参数
+  getInspectionApplicationList({ encounterId: queryParams.encounterId }).then((res) => {
     if (res.code === 200) {
-      inspectionList.value = res.data.records || []
-      total.value = res.data.total || 0
+      inspectionList.value = res.data || []
+      total.value = res.data?.length || 0
     } else {
       inspectionList.value = []
       total.value = 0
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
index b8d08264..ee811a9a 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
@@ -1106,7 +1106,7 @@ onMounted(() => {
   document.addEventListener('keydown', escKeyListener);
   // 初始化时自动创建第一个西药处方
   if (westernPrescriptions.value.length === 0) {
-    handleAddWesternPrescription();
+    handleAddPrescription();
   }
 });
 
diff --git a/openhis-ui-vue3/src/views/system/notice/index.vue b/openhis-ui-vue3/src/views/system/notice/index.vue
index 164dc89d..0896beae 100644
--- a/openhis-ui-vue3/src/views/system/notice/index.vue
+++ b/openhis-ui-vue3/src/views/system/notice/index.vue
@@ -129,17 +129,17 @@
           </template>
         </el-table-column>
       </el-table>
+    </div>
 
-      <!-- 分页 -->
-      <div class="pagination-container">
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          v-model:page="queryParams.pageNum"
-          v-model:limit="queryParams.pageSize"
-          @pagination="getList"
-        />
-      </div>
+    <!-- 分页 -->
+    <div class="pagination-container">
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
+      />
     </div>
 
     <!-- 添加或修改公告对话框 -->
@@ -192,15 +192,7 @@
 </template>
 
 <script setup name="Notice">
-import {
-  addNotice,
-  delNotice,
-  getNotice,
-  listNotice,
-  publishNotice,
-  unpublishNotice,
-  updateNotice
-} from "@/api/system/notice";
+import { listNotice, getNotice, delNotice, addNotice, updateNotice, publishNotice, unpublishNotice } from "@/api/system/notice";
 
 const { proxy } = getCurrentInstance();
 const { sys_notice_status, sys_notice_type } = proxy.useDict("sys_notice_status", "sys_notice_type");