Commit Graph

529 Commits

Author SHA1 Message Date
anxin
9e0860c569 Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis 2025-03-10 15:19:54 +08:00
anxin
7f041c0fe3 Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis 2025-03-10 15:19:37 +08:00
liuhongrui
eb966de4a5 门诊皮试记录 2025-03-10 15:19:36 +08:00
anxin
d3dc418929 role_code修改 2025-03-10 15:19:26 +08:00
duhe
0644d46008 门诊挂号查询 up by dh 2025-03-10 15:18:03 +08:00
Wang.Huan
f78d8902da 医生站-部分 2025-03-10 13:52:31 +08:00
duhe
e2d17ce60c 门诊挂号 save接口 ,收费服务管理页面名称为服务类型 + 分类 + 专业 up by dh 2025-03-10 13:10:00 +08:00
liuhongrui
1a95e279c9 字段驼峰 2025-03-10 11:05:28 +08:00
Zhang.WH
df6843d5a6 Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis 2025-03-08 16:17:40 +08:00
Zhang.WH
78ef62b675 层级优化,方法内容优化,字段修改 2025-03-08 16:17:35 +08:00
Wang.Huan
dcfd2792c1 查询当日就诊数据 2025-03-08 15:18:32 +08:00
菲菲
5453f84b0b 门诊皮试,病人信息,病人记录 2025-03-07 18:01:25 +08:00
liuhongrui
85d9cd2e31 日期类更新 2025-03-07 17:55:09 +08:00
duhe
ac63ce64c6 门诊挂号项目画面 up by dh 2025-03-07 17:52:35 +08:00
duhe
6547415f8a Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis 2025-03-07 17:51:22 +08:00
anxin
f006a01db8 角色dto 2025-03-07 17:51:06 +08:00
duhe
e24261a04c Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis 2025-03-07 17:51:04 +08:00
Zhang.WH
56a68f78a3 Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis
# Conflicts:
#	openhis-server/openhis-common/src/main/java/com/openhis/common/constant/PromptMsgConstant.java
#	openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java
2025-03-07 17:48:55 +08:00
Zhang.WH
93ae75b915 采购入库 2025-03-07 17:44:46 +08:00
anxin
e9acd4e759 practitioner相关 2025-03-07 16:38:08 +08:00
duhe
2d3ec07af4 Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis 2025-03-07 15:19:14 +08:00
Wang.Huan
ea2405595f 生成就诊序号 2025-03-07 13:42:03 +08:00
Wang.Huan
2093b2408f 门诊挂号查询病人时返回初复诊 2025-03-07 11:41:23 +08:00
Wang.Huan
5982969401 门诊挂号 2025-03-07 11:18:07 +08:00
liuhongrui
278994c46a 新增过敏与不耐受 2025-03-07 09:31:22 +08:00
duhe
3fa74d1933 Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis 2025-03-07 09:08:04 +08:00
Wang.Huan
562a34abad 门诊挂号-部分 2025-03-06 18:12:36 +08:00
duhe
1dea876c32 Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis 2025-03-06 15:43:37 +08:00
Wang.Huan
8af1bb3baa 患者元数据查询修改 2025-03-06 15:22:41 +08:00
Wang.Huan
64c00e7785 就诊-元数据 2025-03-06 15:03:22 +08:00
duhe
cc2cf6653a 收费挂号项目 up by dh 2025-03-06 14:55:17 +08:00
anxin
57d1f08fb3 Location的tree 2025-03-06 10:59:03 +08:00
Wang.Huan
c6b93680b3 就诊-元数据 2025-03-06 09:34:29 +08:00
Wang.Huan
ccf39ae556 就诊-元数据 2025-03-05 19:58:48 +08:00
liuhongrui
64fc445214 up 2025-03-05 19:31:33 +08:00
zhuwanli
1f830fddb4 Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis 2025-03-05 18:33:20 +08:00
zhuwanli
083a84534c upd 个人中心页面 2025-03-05 18:33:07 +08:00
Wang.Huan
5f2d98f8e5 Merge remote-tracking branch 'origin/master' 2025-03-05 17:48:18 +08:00
Wang.Huan
247de5b837 服务管理调整 2025-03-05 17:47:24 +08:00
duhe
7865c8cb6f 收费挂号删除接口调用 2025-03-05 17:43:15 +08:00
Wang.Huan
6c9d4fc0ea 机构树 2025-03-05 17:14:28 +08:00
Wang.Huan
540688bee7 Merge remote-tracking branch 'origin/master' 2025-03-05 16:58:15 +08:00
Wang.Huan
a3272c015e tb 2025-03-05 16:57:31 +08:00
liuhongrui
4c1f703fb4 up 2025-03-05 16:45:51 +08:00
菲菲
b5a460b951 门诊记录 2025-03-05 16:25:05 +08:00
菲菲
046884e0fb Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis 2025-03-05 14:16:24 +08:00
菲菲
64fe4bd6a6 . 2025-03-05 14:16:19 +08:00
Wang.Huan
fb8321a8ef 门诊挂号-元数据 2025-03-05 14:14:41 +08:00
Wang.Huan
4f0f9a994a Merge remote-tracking branch 'origin/master' 2025-03-05 13:51:39 +08:00
Wang.Huan
9ea63da6cc tb 2025-03-05 13:50:57 +08:00