|
|
05cc4adf82
|
Merge remote-tracking branch 'origin/develop' into guanyu
|
2026-06-18 10:09:52 +08:00 |
|
|
|
e40695224c
|
fix(#770): zhaoyun (文件合入)
|
2026-06-18 10:07:44 +08:00 |
|
|
|
46a5b6509c
|
Merge remote-tracking branch 'origin/develop' into guanyu
|
2026-06-18 10:05:17 +08:00 |
|
wangjian963
|
5ea218d9bf
|
682 【住院医生工作站】历史医嘱的报卡的布局有些字段被覆盖
|
2026-06-18 10:04:24 +08:00 |
|
|
|
c8b0ce3f62
|
Merge remote-tracking branch 'origin/develop' into guanyu
|
2026-06-18 09:50:27 +08:00 |
|
Ranyunqiao
|
745ca570b7
|
bug 698
|
2026-06-18 09:42:01 +08:00 |
|
|
|
4951da5ca7
|
Merge remote-tracking branch 'origin/develop' into guanyu
|
2026-06-18 09:39:33 +08:00 |
|
wangjian963
|
85ef4cb1c5
|
将V66__update_menu_icons的版本号修改为V67.
|
2026-06-18 09:38:55 +08:00 |
|
|
|
4613f6dfe4
|
Merge remote-tracking branch 'origin/develop' into guanyu
|
2026-06-18 09:18:02 +08:00 |
|
|
|
50857cb440
|
fix(#767): zhaoyun (文件合入)
|
2026-06-18 09:17:50 +08:00 |
|
|
|
f591c5856d
|
Merge remote-tracking branch 'origin/develop' into guanyu
|
2026-06-18 07:35:54 +08:00 |
|
|
|
81cf607dec
|
Merge remote-tracking branch 'origin/develop' into develop
|
2026-06-18 06:21:17 +08:00 |
|
|
|
7fd05a0b42
|
fix(#787): zhaoyun (文件合入)
|
2026-06-18 06:10:10 +08:00 |
|
|
|
ff9c950cc5
|
Merge remote-tracking branch 'origin/develop' into guanyu
|
2026-06-18 03:10:23 +08:00 |
|
|
|
7c375f5af8
|
fix(#723): zhaoyun (文件合入)
|
2026-06-18 01:05:57 +08:00 |
|
|
|
3f164d4585
|
fix(#783): zhaoyun (文件合入)
|
2026-06-17 23:53:27 +08:00 |
|
|
|
fe2a60f379
|
fix(#783): zhaoyun (文件合入)
|
2026-06-17 23:49:11 +08:00 |
|
|
|
d21a2f49c1
|
fix(#786): zhaoyun (文件合入)
|
2026-06-17 23:35:11 +08:00 |
|
|
|
e2bacf61c0
|
Merge remote-tracking branch 'origin/develop' into guanyu
|
2026-06-17 23:19:49 +08:00 |
|
|
|
767619e308
|
fix(#783): zhaoyun (文件合入)
|
2026-06-17 22:53:07 +08:00 |
|
|
|
1911278570
|
fix(#783): zhaoyun (文件合入)
|
2026-06-17 22:33:57 +08:00 |
|
|
|
95919b5afd
|
Merge remote-tracking branch 'origin/develop' into guanyu
|
2026-06-17 22:03:52 +08:00 |
|
|
|
f0f4a95fe9
|
fix(#774): zhaoyun (文件合入)
|
2026-06-17 21:39:36 +08:00 |
|
|
|
1787ae0ccc
|
Merge remote-tracking branch 'origin/develop' into guanyu
|
2026-06-17 19:54:36 +08:00 |
|
|
|
3a454189b0
|
fix(#791): zhaoyun (文件合入)
|
2026-06-17 19:53:53 +08:00 |
|
|
|
51acc3f91c
|
fix(#783): zhaoyun (文件合入)
|
2026-06-17 19:39:28 +08:00 |
|
|
|
baf459d53b
|
Merge remote-tracking branch 'origin/develop' into guanyu
|
2026-06-17 19:30:10 +08:00 |
|
|
|
5ec3c8425a
|
fix(#791): zhaoyun (文件合入)
|
2026-06-17 18:52:09 +08:00 |
|
|
|
dbb4504be9
|
fix(#783): zhaoyun (文件合入)
|
2026-06-17 18:03:51 +08:00 |
|
wangjian963
|
a380ad93d9
|
fix: 修复 vxe-table 列宽 px 单位导致宽度失效
vxe-table 的 min-width/width 仅接受纯数字，带 px/% 单位的设置会被
静默忽略。统一去掉 vxe-column/vxe-table 上的 px 后缀，将百分比
min-width 改为 width（vxe 的 width 支持百分比字符串）。
|
2026-06-17 18:03:29 +08:00 |
|
|
|
97f3708f18
|
Merge remote-tracking branch 'origin/develop' into guanyu
|
2026-06-17 16:57:28 +08:00 |
|
wangjian963
|
ad90af44a2
|
783 【住院医生工作站-诊断录入】新增诊断时，可以不保存一直新增诊断，不符合逻辑
|
2026-06-17 16:47:29 +08:00 |
|
|
|
fcf21e66f6
|
Merge remote-tracking branch 'origin/develop' into guanyu
|
2026-06-17 16:35:19 +08:00 |
|
|
|
86cb6be013
|
fix(#786): zhaoyun (文件合入)
|
2026-06-17 16:35:11 +08:00 |
|
|
|
06111ef284
|
fix(#784): guanyu (文件合入)
|
2026-06-17 16:28:55 +08:00 |
|
|
|
0f6c6ec3c8
|
fix(#784): 请修复 Bug #784：【住院护士站-医嘱校对】在已校对的的医嘱中，只有核对通过和退回，没有执行和不执行
|
2026-06-17 16:28:16 +08:00 |
|
|
|
b3e938540b
|
Merge remote-tracking branch 'origin/develop' into guanyu
|
2026-06-17 16:19:33 +08:00 |
|
wangjian963
|
f56aa2ad2e
|
780 【护士工作站-已出院】列表上的【特级】【一级】【二级】【三级】的筛选查询无响应
|
2026-06-17 16:18:34 +08:00 |
|
|
|
775d37481f
|
Merge remote-tracking branch 'origin/develop' into guanyu
|
2026-06-17 16:15:18 +08:00 |
|
|
|
84cc974597
|
在 mrhomepage.js 中补了缺失的三个 API 函数导出：saveDeathDiscussion、listDeathDiscussions、getPendingDeadline
|
2026-06-17 16:00:26 +08:00 |
|
|
|
dfdfa53ce9
|
Merge remote-tracking branch 'origin/develop' into guanyu
|
2026-06-17 15:46:22 +08:00 |
|
|
|
36acf6c513
|
补充"vxe-pc-ui"依赖
|
2026-06-17 15:43:20 +08:00 |
|
|
|
702fc7b757
|
Merge remote-tracking branch 'origin/develop' into guanyu
|
2026-06-17 15:31:55 +08:00 |
|
|
|
bbd86abbe7
|
feat(menu): 更新菜单图标配置
- 为系统管理模块的所有菜单项添加相应的图标
- 为门诊管理、住院管理、收费工作站等核心功能配置图标
- 为药房管理、库房管理、财务管理等业务模块设置图标
- 为医生工作站、护士站、检查检验等医疗专业功能分配图标
- 为医保管理、报表管理、接口管理等系统功能配置图标
- 为麻醉管理、合理用药、急诊管理等专科模块添加图标
- 为护理管理、病理管理、影像管理等医技科室设置图标
-
|
2026-06-17 15:27:26 +08:00 |
|
|
|
8e9308faf6
|
fix(consultation): 修复会诊意见列表接口参数验证问题
- 将consultationId参数设置为非必需，解决空值传递导致的验证异常
- 保持原有的会诊意见查询功能逻辑不变
- 提升接口的容错性和用户体验
|
2026-06-17 15:27:09 +08:00 |
|
|
|
5eb9b62d32
|
fix(medicine): 移除未使用的响应式变量并修复会诊确认逻辑
- 移除了 medicineDialog.vue 中未使用的 supplierListOptions、statusRestrictedOptions、
partAttributeEnumOptions 和 tempOrderSplitPropertyOptions 响应式变量
- 修复了 consultationconfirmation/index.vue 中加载会诊意见时缺少
consultationId 验证的问题
- 防止在会诊 ID 不存在时尝试加载会诊意见导致的潜在错误
|
2026-06-17 15:23:22 +08:00 |
|
|
|
808c0305c9
|
Merge remote-tracking branch 'origin/develop' into develop
|
2026-06-17 15:19:58 +08:00 |
|
|
|
d5f177ae56
|
refactor(diagnosistreatment): 优化诊断治疗对话框组件结构
- 移除未使用的 title 响应式变量
- 移除未使用的下拉选项响应式变量（diagnosisCategoryOptions、statusFlagOptions、exeOrganizations、typeEnumOptions）
- 简化组件初始化逻辑，直接使用 props 数据
- 清理多余的赋值操作，提高代码可读性
- 优化图标SVG路径定义，调整矩形绘制方式
|
2026-06-17 15:19:33 +08:00 |
|
wangjian963
|
d7d76c922e
|
712 【收费工作站-预交金管理】“预交金管理”页面缺失展示“支付方式”列及患者“床号”、“费用类型”
|
2026-06-17 15:18:48 +08:00 |
|
wangjian963
|
b6eec300a9
|
696 [收费工作站-住院登记] 优化姓名搜索框，增设“身份证号”与“申请时间段”检索条件，及列表字段补充显示
|
2026-06-17 15:01:38 +08:00 |
|
