From a9daab268bdae8e937348c695a14fcffdba03733 Mon Sep 17 00:00:00 2001 From: zhaoyun Date: Fri, 19 Jun 2026 14:28:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(#770):=20zhaoyun=20(=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=88=E5=85=A5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/surgery/surgeryApplication.vue | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/healthlink-his-ui/src/views/doctorstation/components/surgery/surgeryApplication.vue b/healthlink-his-ui/src/views/doctorstation/components/surgery/surgeryApplication.vue index af4be781f..b5cb03116 100755 --- a/healthlink-his-ui/src/views/doctorstation/components/surgery/surgeryApplication.vue +++ b/healthlink-his-ui/src/views/doctorstation/components/surgery/surgeryApplication.vue @@ -1761,7 +1761,6 @@ defineExpose({ /* 顶部操作栏样式 */ .top-operation-bar { height: 60px; - display: flex; align-items: center; margin-bottom: 16px; @@ -1816,9 +1815,6 @@ defineExpose({ /* Bug #770: Dialog flex 布局 — 防止 footer 按钮遮盖表单字段 */ :deep(.el-dialog) { display: flex; - flex-direction: column; - max-height: 90vh; - margin-top: 5vh; } :deep(.el-dialog__header) { @@ -1827,15 +1823,12 @@ defineExpose({ :deep(.el-dialog__body) { flex: 1; - overflow-y: auto; - overflow: hidden; min-height: 0; } :deep(.el-dialog__footer) { flex-shrink: 0; border-top: 1px solid #ebeef5; - padding: 12px 20px 16px; } /* 响应式：小屏幕下对话框宽度自适应 */ @@ -1845,4 +1838,10 @@ defineExpose({ margin: 2.5vh auto; } } - \ No newline at end of file + + display: flex; + flex-direction: column; + max-height: 85vh; + overflow-y: auto; + padding: 20px; + padding: 12px 20px 12px; \ No newline at end of file From b6b8f8be713b69fd458575527589403de014fecd Mon Sep 17 00:00:00 2001 From: guanyu Date: Fri, 19 Jun 2026 14:32:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(#782):=20guanyu=20(=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=88=E5=85=A5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appservice/impl/AdviceManageAppServiceImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java index ffb4806c5..0c73c4441 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java @@ -196,7 +196,6 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService { List activityList = regAdviceSaveList.stream() .filter(e -> ItemType.ACTIVITY.getValue().equals(e.getAdviceType()) || ItemType.SURGERY.getValue().equals(e.getAdviceType()) - || ItemType.TEXT.getValue().equals(e.getAdviceType()) || (e.getAdviceType() != null && e.getAdviceType() == 26)) .collect(Collectors.toList()); // 耗材 🔧 Bug #147 修复 @@ -1081,7 +1080,6 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService { // 诊疗（包含 医疗活动=3、手术=6、文字医嘱=8、护理=26 等，都属于 service_request） List activityList = paramList.stream() .filter(e -> ItemType.ACTIVITY.getValue().equals(e.getAdviceType()) - || ItemType.TEXT.getValue().equals(e.getAdviceType()) || ItemType.SURGERY.getValue().equals(e.getAdviceType()) || (e.getAdviceType() != null && e.getAdviceType() == 26)) .collect(Collectors.toList()); @@ -1310,4 +1308,4 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService { } -} \ No newline at end of file +}