Commit Graph

543 Commits

Author SHA1 Message Date
Zhuangxingyu
044f571590 代码修改 项目定价代码修改 2025-02-26 13:32:05 +08:00
Zhuangxingyu
dea1ea05e5 代码提交 项目定价修改 2025-02-26 13:07:53 +08:00
Zhang.YC
e2930e5daf Merge branch 'master' of codeup.aliyun.com:61c0318acd8b75daa5a125f7/medical/openhis 2025-02-26 10:45:21 +08:00
Zhang.YC
421a9f5e14 机构列表 2025-02-26 10:45:16 +08:00
菲菲
5e2c70d7b6 Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis 2025-02-26 10:40:08 +08:00
菲菲
de40a5b9c1 病人管理页面 2025-02-26 10:40:03 +08:00
liupanting
dce64cc7b4 疾病目录,药品目录更改 2025-02-26 10:00:42 +08:00
anxin
602501c76f Org 2025-02-26 09:35:42 +08:00
anxin
5e157eec3c Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis 2025-02-26 09:29:13 +08:00
anxin
2dc2c61173 Org 2025-02-26 09:28:56 +08:00
Wang.Huan
1b8e9b1b96 @Dict注解:
适用两种场景
1:翻译字典表
  在DTO类需要翻译的字段上添加@Dict(dictCode = "xx_type"),并且新增一个String类型的文本字典;
   @Dict(dictCode = "status_enum") // 默认查询 sys_dict_data 表
   private Integer statusEnum;
   private String statusEnum_dictText;

2:翻译自定义表
    @Dict(dictCode = "id", dictText = "name", dictTable = "sys_user")
    private Integer roleId;
    private String roleId_dictText;
2025-02-26 09:28:02 +08:00
liuhongrui
47eaa28202 病人信息相关 更新 2025-02-25 19:21:24 +08:00
anxin
0d0742d174 机构Org修改 2025-02-25 18:52:22 +08:00
duhe
32e64e84d3 药品目录前台 up by dh 2025-02-25 18:09:32 +08:00
liupanting
10242e6f7c 基础数据-药品目录 2025-02-25 18:01:36 +08:00
liuhongrui
40d80db03e 病人信息相关更新 2025-02-25 17:24:23 +08:00
Zhuangxingyu
33180003d9 Merge branch 'master' of codeup.aliyun.com:61c0318acd8b75daa5a125f7/medical/openhis 2025-02-25 17:14:22 +08:00
Zhuangxingyu
9f2067745f 代码修改 项目定价修改 2025-02-25 17:14:17 +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
Zhuangxingyu
457fda5a8b Merge branch 'master' of codeup.aliyun.com:61c0318acd8b75daa5a125f7/medical/openhis 2025-02-25 13:55:04 +08:00
Zhuangxingyu
70b527ea00 代码提交 项目定价修改 2025-02-25 13:55:00 +08:00
Wang.Huan
108b936b21 Merge remote-tracking branch 'origin/master' 2025-02-25 13:28:25 +08:00
Wang.Huan
345e71f7cf 分页方法改造 2025-02-25 13:27:50 +08:00
Zhuangxingyu
62d1a3adb5 Merge branch 'master' of codeup.aliyun.com:61c0318acd8b75daa5a125f7/medical/openhis 2025-02-25 13:24:16 +08:00
Zhuangxingyu
24b16b6d97 代码提交 定价管理代码修改 2025-02-25 13:24:11 +08:00
duhe
f53635b340 厂商/供应商后台 疾病目录前台 up by dh 2025-02-25 13:09:44 +08:00
liupanting
cebe37809e 疾病目录修改 2025-02-25 11:48:30 +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
duhe
ede41782b4 疾病目录代码更新 up by dh 2025-02-25 10:56:05 +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
duhe
10d9b7bd6f 疾病目录前台代码 up by dh 2025-02-25 09:08:04 +08:00
liuhongrui
9e700b42c9 up 2025-02-24 20:18:01 +08:00
liuhongrui
9347476518 通过机构ID查询机构名称 2025-02-24 19:53:40 +08:00
liuhongrui
04d61916a5 根据出生日期算当前年龄 2025-02-24 19:38:50 +08:00
Wang.Huan
7e5f3614fa 构造Mapper.selectPage分页查询条件 2025-02-24 18:52:14 +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
Zhuangxingyu
2b699a8132 Merge branch 'master' of codeup.aliyun.com:61c0318acd8b75daa5a125f7/medical/openhis 2025-02-24 15:35:15 +08:00
Zhuangxingyu
3c5a16872b 代码修改 查询sql文位置修改 2025-02-24 15:35:11 +08:00
liupanting
e4764d9f8c Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis 2025-02-24 15:25:23 +08:00