Compare commits

...

7 Commits

Author SHA1 Message Date
26f170b948 fix(#770): 请修复 Bug #770(诸葛亮分析完成,分配给你)
根因:
- Bug #请修复 Bug #770(诸葛亮分析完成,分配给你) 存在的问题

修复:
- 查看对话框也使用了 `teleported`,但那是查看弹窗,内容较少不会遮盖。主要问题在新增/编辑对话框。已修复。
2026-06-18 10:05:09 +08:00
7fcedf0ab3 Merge remote-tracking branch 'origin/develop' into zhaoyun 2026-06-18 09:44:59 +08:00
Ranyunqiao
745ca570b7 bug 698 2026-06-18 09:42:01 +08:00
54f01cd8d7 Merge remote-tracking branch 'origin/develop' into zhaoyun 2026-06-18 09:40:22 +08:00
wangjian963
85ef4cb1c5 将V66__update_menu_icons的版本号修改为V67. 2026-06-18 09:38:55 +08:00
f3323965d5 Merge remote-tracking branch 'origin/develop' into zhaoyun 2026-06-18 09:30:24 +08:00
50857cb440 fix(#767): zhaoyun (文件合入) 2026-06-18 09:17:50 +08:00
4 changed files with 24 additions and 20 deletions

View File

@@ -176,9 +176,10 @@ public class InHospitalRegisterAppServiceImpl implements IInHospitalRegisterAppS
String searchKey, String registeredFlag, Integer pageNo, Integer pageSize, String searchKey, String registeredFlag, Integer pageNo, Integer pageSize,
Date startTime, Date endTime, Long organizationId, String idCard, HttpServletRequest request) { Date startTime, Date endTime, Long organizationId, String idCard, HttpServletRequest request) {
Integer encounterStatus = EncounterZyStatus.TO_BE_REGISTERED.getValue(); // 待登记 Integer encounterStatus = EncounterZyStatus.TO_BE_REGISTERED.getValue(); // 待登记
// startTime/endTime 直接传给 Mapper XML 参数,不通过 QueryWrapper // 清除过滤条件字段,避免 HisQueryUtils.buildQueryWrapper 生成无效的外部 SQL 条件(这些条件已在 Mapper XML 内部实现)
inHospitalRegisterQueryDto.setStartTime(null); inHospitalRegisterQueryDto.setStartTime(null)
inHospitalRegisterQueryDto.setEndTime(null); .setEndTime(null)
.setOrganizationId(null);
// 构建查询条件 // 构建查询条件
QueryWrapper<InHospitalRegisterQueryDto> queryWrapper QueryWrapper<InHospitalRegisterQueryDto> queryWrapper
= HisQueryUtils.buildQueryWrapper(inHospitalRegisterQueryDto, searchKey, = HisQueryUtils.buildQueryWrapper(inHospitalRegisterQueryDto, searchKey,

View File

@@ -55,6 +55,16 @@ public class InHospitalRegisterQueryDto {
*/ */
private String patientName; private String patientName;
/**
* 身份证号
*/
private String idCard;
/**
* 入院科室
*/
private String organizationName;
/** /**
* 性别编码 * 性别编码
*/ */
@@ -120,14 +130,4 @@ public class InHospitalRegisterQueryDto {
*/ */
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long organizationId; private Long organizationId;
/**
* 身份证号
*/
private String idCard;
/**
* 入院科室名称
*/
private String organizationName;
} }

View File

@@ -1,4 +1,4 @@
-- V66__update_menu_icons.sql -- V67__update_menu_icons.sql
-- 更新菜单图标 - 根据菜单功能名称匹配合适的图标 -- 更新菜单图标 - 根据菜单功能名称匹配合适的图标
-- 仅使用 src/assets/icons/svg/ 目录下实际存在的图标 -- 仅使用 src/assets/icons/svg/ 目录下实际存在的图标

View File

@@ -1,5 +1,3 @@
<!--
* @Description: 门诊手术申请
--> -->
<template> <template>
<div class="surgery-application-container"> <div class="surgery-application-container">
@@ -34,7 +32,6 @@
v-loading="loading" v-loading="loading"
:data="surgeryList" :data="surgeryList"
border border
:row-config="{ keyField: 'surgeryNo' }"
:row-class-name="getRowClassName" :row-class-name="getRowClassName"
height="calc(100vh - 250px)" height="calc(100vh - 250px)"
style="width: 100%" style="width: 100%"
@@ -199,7 +196,6 @@
v-model="open" v-model="open"
:title="title" :title="title"
width="1200px" width="1200px"
teleported
:close-on-click-modal="false" :close-on-click-modal="false"
@close="cancel" @close="cancel"
> >
@@ -1817,10 +1813,17 @@ defineExpose({
padding: 20px 0; padding: 20px 0;
} }
/* Bug #770: 确保对话框表单内容可滚动,防止操作按钮遮盖字段 */ /* Bug #770: 对话框 body 滚动区域限制,防止 footer 按钮遮盖表单字段 */
:deep(.el-dialog__body) { :deep(.el-dialog__body) {
max-height: calc(100vh - 200px); max-height: calc(100vh - 220px);
overflow-y: auto; overflow-y: auto;
padding-bottom: 10px; padding-bottom: 10px;
} }
/* Bug #770: 确保 footer 固定在对话框底部,不随内容滚动 */
:deep(.el-dialog__footer) {
flex-shrink: 0;
border-top: 1px solid #ebeef5;
padding: 12px 20px;
}
</style> </style>