Commit Graph

3828 Commits

Author SHA1 Message Date
3143a974ba Merge remote-tracking branch 'origin/develop' into guanyu 2026-06-18 12:06:17 +08:00
75f024267b fix(#768): guanyu (文件合入) 2026-06-18 12:03:30 +08:00
6fffc23e43 fix(#768): 请修复 Bug #768(诸葛亮分析完成,分配给你) 2026-06-18 12:02:53 +08:00
dca1bdac4a Merge remote-tracking branch 'origin/develop' into guanyu 2026-06-18 11:41:42 +08:00
wangjian963
12516a55fa 774 【门诊医生工作站】在门诊医生站的医嘱下的【个人】【科室】【全院】下的医嘱套件都没有数据回显但是可以点击 2026-06-18 11:25:11 +08:00
0767f3e6fd Merge remote-tracking branch 'origin/develop' into guanyu 2026-06-18 10:47:43 +08:00
wangjian963
a0b12d1229 修复关键警告 — emit 未声明 2026-06-18 10:45:16 +08:00
2ea25bd684 Merge remote-tracking branch 'origin/develop' into guanyu 2026-06-18 10:43:47 +08:00
wangjian963
67f1baf04a 759 【门诊医生工作站】电子处方点击新增处方,报卡在100%卡出屏幕且诊断等下拉框无数据回显 2026-06-18 10:42:52 +08:00
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