Commit Graph

100 Commits

Author SHA1 Message Date
Wang.Huan
4beae6b80b 格式化 2025-03-12 15:00:06 +08:00
liuhongrui
ae8070849c 门诊皮试 up 2025-03-12 14:55:52 +08:00
Zhang.WH
4d5c89466b 商品盘点相关代码新增 2025-03-12 10:44:59 +08:00
Wang.Huan
a96b47b41f 医生站-诊断 2025-03-11 19:10:40 +08:00
liuhongrui
7d16b35f6f 门诊皮试记录up 2025-03-11 16:50:07 +08:00
Zhang.WH
d67dfea964 改价判断修改,入库换算新增 2025-03-11 11:18:03 +08:00
Wang.Huan
6be0294284 医生站-代码层级初始化 2025-03-10 19:11:47 +08:00
Zhang.WH
c114e27223 采购入库代码补全 2025-03-10 17:54:26 +08:00
Wang.Huan
f78d8902da 医生站-部分 2025-03-10 13:52:31 +08:00
Zhang.WH
78ef62b675 层级优化,方法内容优化,字段修改 2025-03-08 16:17:35 +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
Wang.Huan
5982969401 门诊挂号 2025-03-07 11:18:07 +08:00
liuhongrui
278994c46a 新增过敏与不耐受 2025-03-07 09:31:22 +08:00
Wang.Huan
562a34abad 门诊挂号-部分 2025-03-06 18:12:36 +08:00
Wang.Huan
64c00e7785 就诊-元数据 2025-03-06 15:03:22 +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
f1fe7077df 部分枚举调整 2025-03-04 19:18:54 +08:00
liuhongrui
7b20de9c3d up 2025-03-04 18:00:40 +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
Zhang.WH
323d6ffd51 入库分页修改,新建表名常量 2025-03-04 10:13:57 +08:00
anxin
b8ced534fe 诊疗器材枚举增加 2025-03-03 16:02:09 +08:00
Wang.Huan
5fce7d604a reName 2025-03-03 14:58:50 +08:00
liuhongrui
94b06a84d2 枚举类显示查询相关更新 2025-03-03 13:54:41 +08:00
Wang.Huan
4d1d2db899 枚举类回显赋值 2025-03-03 12:24:18 +08:00
Wang.Huan
33c174b386 服务管理-新增 2025-02-28 14:10:56 +08:00
liupanting
b861e4d4b8 诊疗目录更新 2025-02-27 11:41:11 +08:00
liupanting
0285cdb629 疾病目录种类增加 2025-02-26 18:38:56 +08:00
Wang.Huan
9097f69c7d 服务管理-部分 2025-02-26 17:57:39 +08:00
Wang.Huan
4078acba45 服务管理初始化 2025-02-26 15:54:44 +08:00
Zhuangxingyu
dea1ea05e5 代码提交 项目定价修改 2025-02-26 13:07:53 +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
Wang.Huan
345e71f7cf 分页方法改造 2025-02-25 13:27:50 +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
Wang.Huan
7e5f3614fa 构造Mapper.selectPage分页查询条件 2025-02-24 18:52:14 +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
d56a2a7e03 Merge branch 'master' of codeup.aliyun.com:61c0318acd8b75daa5a125f7/medical/openhis 2025-02-24 10:32:58 +08:00
Zhuangxingyu
2058a93ef4 代码修改 项目定价代码修改 2025-02-24 10:32:55 +08:00
Wang.Huan
7ad5ee6877 表名常量类 2025-02-24 10:22:44 +08:00
FayneLi
006c4ec6d8 添加了枚举类 2025-02-24 09:08:59 +08:00
Zhang.WH
eaa01f2fca Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis
# Conflicts:
#	openhis-server/openhis-application/src/main/java/com/openhis/web/InventoryManage/controller/PurchaseInventoryController.java
2025-02-20 19:26:07 +08:00
Zhang.WH
62c2a8ac92 demo作成 2025-02-20 19:00:51 +08:00
Wang.Huan
1e45775c1c 封装文言提示 2025-02-20 18:30:39 +08:00
guorui
dad6d41cbc 1 2025-02-19 10:29:04 +08:00