Commit Graph

105 Commits

Author SHA1 Message Date
abing
0b93d16b64 v0.2 2025-06-13 11:40:16 +08:00
abing
437bf23f09 v0.2 2025-06-13 11:39:43 +08:00
mayang
4ccd07d3af Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis
# Conflicts:
#	openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryInitDto.java
2025-03-31 10:42:41 +08:00
mayang
6e1204fbea 商品调拨代码 2025-03-31 10:25:06 +08:00
liuhongrui
5e6bc6facc 诊疗和疾病up 2025-03-31 09:46:11 +08:00
liuhongrui
cedf3fb275 诊疗目录代码修改 2025-03-30 12:59:46 +08:00
liuhongrui
98429b175f Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis 2025-03-30 12:59:14 +08:00
Zhang.WH
73f15d7ee9 退费部分代码完成 2025-03-30 12:41:44 +08:00
liuhongrui
24c11b86ca 诊疗编号追加 2025-03-30 11:11:05 +08:00
sunjiaqi
aede79b80e Merge remote-tracking branch 'origin/master' 2025-03-29 16:09:51 +08:00
sunjiaqi
7747130227 付款模块 2025-03-29 16:09:36 +08:00
wangyang
3004d5053f up 2025-03-29 14:59:12 +08:00
wangyang
c30380b756 update 2025-03-29 14:58:02 +08:00
Wang.Huan
22e46a0545 参与者改造 2025-03-28 17:33:32 +08:00
liuhongrui
34b6070f5d 器材目录更新 2025-03-28 14:33:49 +08:00
Wang.Huan
695e4b8cc6 Merge remote-tracking branch 'origin/master' 2025-03-28 14:26:56 +08:00
Wang.Huan
f767b93f0c 参与者改造 2025-03-28 14:26:20 +08:00
liuhongrui
b84cef1511 药品目录和器材目录更新 2025-03-28 14:05:27 +08:00
Zhang.WH
f81a553c21 发药代码格式修改 2025-03-28 13:43:44 +08:00
wangyang
fdf449453c 发药功能上传 2025-03-28 12:43:18 +08:00
liuhongrui
0a532b3978 住院临时医嘱拆分属性追加 2025-03-28 09:37:17 +08:00
liuhongrui
4d4fd87aaa 药品目录up 2025-03-27 21:20:46 +08:00
liuhongrui
dafb3d6de3 up 2025-03-27 17:37:51 +08:00
liuhongrui
52463542c0 拆分属性枚举类 2025-03-27 17:22:13 +08:00
Wang.Huan
0b12bbdb91 tb 2025-03-27 15:51:44 +08:00
Wang.Huan
f666458f68 参与者重写 - 部分 2025-03-25 20:08:44 +08:00
liuhongrui
83f53e3619 目录管理 2025-03-25 19:45:13 +08:00
liuhongrui
7cdfa58008 Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis 2025-03-25 17:41:28 +08:00
liuhongrui
b3e60bcc0f 疾病目录up 2025-03-25 17:41:22 +08:00
duhe
facbd89b40 供应商画面调整 up by dh 2025-03-25 17:25:30 +08:00
Wang.Huan
85a348b2fa 参与者重写 - 初始化 2025-03-25 16:10:04 +08:00
liuhongrui
8307b86d9e 目录更新 2025-03-25 15:32:39 +08:00
liuhongrui
76950ab7bc 门诊输液 up 2025-03-21 16:51:22 +08:00
Wang.Huan
c81a92e81d buildQueryWrapper修改 2025-03-21 14:13:42 +08:00
liuhongrui
3d09f06d1d 门诊输液 更新 2025-03-19 19:45:16 +08:00
Wang.Huan
21d21784f9 保存医嘱 2025-03-19 15:37:20 +08:00
Zhang.WH
b8e978f452 单据审批分页列表 2025-03-19 11:17:33 +08:00
Wang.Huan
3c5d1b551c 业务编码枚举 2025-03-19 10:54:28 +08:00
Zhang.WH
2d0decb7e9 采购代码调整,退费代码增加 2025-03-19 09:23:00 +08:00
Zhang.WH
dadf74bb67 Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis 2025-03-19 09:12:53 +08:00
Zhang.WH
cfc82078a1 常量新增 2025-03-19 09:12:47 +08:00
Zhang.WH
0f90dffd6b 枚举修改 2025-03-19 09:12:08 +08:00
liuhongrui
1bf7841fdd 门诊输液记录 更新 2025-03-18 20:12:05 +08:00
liuhongrui
1276b80a01 证件类型 枚举类追加 2025-03-18 14:58:25 +08:00
Wang.Huan
2a1b396fe6 医嘱定义表加字段 2025-03-18 11:45:16 +08:00
anxin
41e9d825eb Whether相关,药品设备格式 2025-03-18 10:31:01 +08:00
anxin
ba747fc22b Whether枚举修改 2025-03-18 09:33:21 +08:00
Wang.Huan
60bb08925a 枚举调整 2025-03-17 17:02:53 +08:00
Zhang.WH
a4e26d416b 新增门诊退费相关代码 2025-03-17 13:48:26 +08:00
Wang.Huan
3570ea007f Dict切面优化 2025-03-15 12:14:10 +08:00