Commit Graph

66 Commits

Author SHA1 Message Date
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
liuhongrui
af3cb64988 ServiceRequest表 新加字段核对人 2025-03-05 13:08:01 +08:00
Wang.Huan
6b219fb219 事务调整 2025-03-05 12:20:34 +08:00
Wang.Huan
f1fe7077df 部分枚举调整 2025-03-04 19:18:54 +08:00
Wang.Huan
6ba56c8841 id Json String 2025-03-04 16:38:30 +08:00
Wang.Huan
d6418785f7 服务管理必填项校验 2025-03-04 16:11:25 +08:00
Wang.Huan
a430f9157e AOP处理事务 2025-03-04 09:29:31 +08:00
liuhongrui
f3d71f95e7 up 2025-03-03 16:31:05 +08:00
liuhongrui
69556927eb 病人信息 2025-03-03 14:42:44 +08:00
liuhongrui
94b06a84d2 枚举类显示查询相关更新 2025-03-03 13:54:41 +08:00
Wang.Huan
f90c7ec4ca 服务管理 2025-02-28 18:01:05 +08:00
duhe
a9b01023bc 供应商后台 up by dh 2025-02-28 17:37:14 +08:00
Wang.Huan
33c174b386 服务管理-新增 2025-02-28 14:10:56 +08:00
liuhongrui
8d4539bf83 联系人关系类型 改为 枚举类型 2025-02-28 09:46:29 +08:00
liuhongrui
f7fc5d9a53 患者血型信息 改为枚举 2025-02-27 15:21:06 +08:00
liupanting
b861e4d4b8 诊疗目录更新 2025-02-27 11:41:11 +08:00
anxin
def047e59b 机构位置关系,岗位 2025-02-26 19:07:18 +08:00
anxin
215d87133e Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis 2025-02-26 18:32:49 +08:00
anxin
63b6ab796c org启用flag 2025-02-26 18:32:33 +08:00
liupanting
e500a2374d 器材,诊疗目录更新 2025-02-26 18:31:26 +08:00
Wang.Huan
9097f69c7d 服务管理-部分 2025-02-26 17:57:39 +08:00
Wang.Huan
4078acba45 服务管理初始化 2025-02-26 15:54:44 +08:00
Zhang.YC
153011c18c 机构树列表 2025-02-26 14:30:14 +08:00
anxin
602501c76f Org 2025-02-26 09:35:42 +08:00
anxin
2dc2c61173 Org 2025-02-26 09:28:56 +08:00
anxin
0d0742d174 机构Org修改 2025-02-25 18:52:22 +08:00
liupanting
10242e6f7c 基础数据-药品目录 2025-02-25 18:01:36 +08:00
liuhongrui
80b2f04555 删除通过机构id查询机构名的方法 2025-02-25 16:41:05 +08:00
liuhongrui
6a5e6eb4b9 病人信息 2025-02-25 16:28:12 +08:00
liuhongrui
c698fea2bf Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis 2025-02-25 16:18:21 +08:00
liupanting
b8430e3fec 疾病目录更新 2025-02-25 16:18:11 +08:00
liuhongrui
e952f3ce2f Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis 2025-02-25 14:27:24 +08:00
duhe
f53635b340 厂商/供应商后台 疾病目录前台 up by dh 2025-02-25 13:09:44 +08:00
Zhang.WH
a4e34e2beb Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis
# Conflicts:
#	openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java
2025-02-25 11:35:25 +08:00
Zhang.WH
10b44933ab 常量修改 2025-02-25 11:33:33 +08:00
anxin
b5cf465f3d 机构org 2025-02-25 09:51:02 +08:00
liuhongrui
472123230a up 2025-02-25 09:38:47 +08:00
anxin
e44ccb2e07 机构org修改 2025-02-25 09:22:03 +08:00
liuhongrui
9347476518 通过机构ID查询机构名称 2025-02-24 19:53:40 +08:00
Zhang.YC
3c80eab39d Merge branch 'master' of codeup.aliyun.com:61c0318acd8b75daa5a125f7/medical/openhis 2025-02-24 17:17:09 +08:00
Zhang.YC
515280f8a3 后台书写病历相关/前端基础目录搭建 2025-02-24 17:17:04 +08:00
liupanting
6cb9019cfb 病种目录更新 2025-02-24 17:15:34 +08:00
anxin
616726390d Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis 2025-02-24 17:04:13 +08:00
anxin
3bcfe18bab 机构organization新增 2025-02-24 17:03:58 +08:00
liupanting
e4764d9f8c Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis 2025-02-24 15:25:23 +08:00
liupanting
3c82374029 病种目录更新 2025-02-24 15:24:52 +08:00
FayneLi
517123f996 Merge remote-tracking branch 'origin/master' 2025-02-24 12:45:45 +08:00
FayneLi
ade11cb2a6 添加了枚举类 2025-02-24 12:45:33 +08:00
Zhuangxingyu
fe3a467e9b 代码提交 字段修改整理 2025-02-24 09:19:46 +08:00