Commit Graph

302 Commits (64bba380a48d16479f952afcf68289a29fae3680)

Author SHA1 Message Date
wangwei 952171b068 11/7 供应商添加药品信息优化1.0 8 months ago
chenhc 1f04f07f84 fix:优化关联关系 8 months ago
wangwei 8728cfb94b 11/7 同步更改时间 8 months ago
yewj 3bb20f08f9 新增阿里药品信息目录 8 months ago
chenhc f31b78522c feat: 码明细到国家同步库 9 months ago
chenhc 359b0fb636 feat: 多码融合 9 months ago
chenhc bfa841ffa7 feat: 多码融合 9 months ago
chenhc 5a395d84f7 feat: 多码融合 9 months ago
qyt bbf9d799c1 仓库逻辑改变仓库详情的逻辑都改成仓库表(第一次更新) 9 months ago
wangwei c96d76d1b3 10/15 同步优化1.0 9 months ago
yewj 70ce57e267 修改流通时,使用时数量计算 9 months ago
wangwei f2f90af9f0 10/21 优化1 9 months ago
chenhc e3603c4e42 feat: 药品关联关系是否存在 9 months ago
chenhc e2ba897fc3 feat: 药品关联关系是否存在 9 months ago
chenhc 4f1258572d feat: 药品关联信息上下传输功能 9 months ago
wangwei 11a52f4fd3 10/17 单据增加单据类型 9 months ago
chenhc 11b1c70394 feat: 药品关联关系功能 9 months ago
chenhc bb10befc0f feat: 手工关联、拼箱关联数据同步 9 months ago
qyt 69e256dd37 1、移植耗材管理编辑功能的所有相关
2、sql增加字段
9 months ago
wangwei f4c9afc4f5 Merge remote-tracking branch 'origin/dev_drug' into dev_drug 9 months ago
wangwei 036048bddd 10/14 yaopin 9 months ago
chenhc 3d3855af70 feat: 手工关联、拼箱关联 9 months ago
wangwei 9b9b478364 10/14 药品基础数据优化 9 months ago
anthonywj 15b093a2df 药品扫码流程修改 11 months ago
wangwei f2d7b3ab2d 8/8 药品管理 11 months ago
wangwei 686a88991a 8/5 优化1.1入院药品维护,以及响应字段 12 months ago
wangwei d1eaf16000 8-01 药品管理 12 months ago
anthonywj b3006e5870 新增是否组套,出入库明细改造, 12 months ago
chenhc a13a3b9fab feat: 0702-扫码校验功能 1 year ago
wangwei 7e14b47152 6/21 同步优化 1 year ago
anthonywj d8e113bef1 发票打印问题 1 year ago
chenhc 8388ad0412 feat: 0531增加是否需要扫码字段 1 year ago
anthonywj 8a41d006cc 新增耗材类别校验 1 year ago
chenhc 1ca947ba0a feat: sql更新、设备管理迁移、小程序接口暴露 1 year ago
wangwei 2b74cbd33a Merge branch 'dev_test1.0' into dev_ksck
# Conflicts:
#	src/main/resources/schemas/schema_v2.3.sql
1 year ago
wangwei 629f9ca983 5-20 设备数据 1 year ago
anthonywj 003fbc5205 第三方产品信息导入 1 year ago
wangwei fe0beef80d 5-10 数据同步 1.2 1 year ago
wangwei 54f9289737 5-10 数据同步 更改 设备管理 1 year ago
anthonywj f28f4cccfb Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck 1 year ago
anthonywj 21bd1841c8 修改登录权限验证等 1 year ago
chenhc 4fd81d62c5 feat: 代码加注释 1 year ago
chenhc ad5a1458b1 feat: 医保编码增加catalogCode相关字段 1 year ago
chenhc c02bfb9b6a feat: 增加校验产品属性 1 year ago
anthonywj b57aaeb5cc 代码备份 1 year ago
anthonywj e5ddbd2fd2 代码备份 1 year ago
anthonywj 6f66d106f2 Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
# Conflicts:
#	src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
#	src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
#	src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
1 year ago
anthonywj 9a9a94bb37 新增配送产品,申请与审核,创建后回填 1 year ago
chenhc dc060dc2c9 feat: 增加医保耗材信息接口调用 1 year ago
chenhc 3d535fd0e1 feat: 增加医保耗材信息接口调用 1 year ago
anthonywj 48c0ce5269 资质证书预警等相关修改 1 year ago
anthonywj be9a844ebf 新增耗材分类 1 year ago
anthonywj 552367c4d3 供应商产品维护更新问题 1 year ago
anthonywj ef9f01c674 新增产品属性 1 year ago
anthonywj de3e184f9c 采购类型相关修改 1 year ago
chenhc 00899954ae fix: 帮助页面配置修改 1 year ago
yuanwei f44b5e9727 Merge remote-tracking branch 'origin/dev_price' into 20231126-yw 1 year ago
anthonywj b306c6a951 长泰集采问题修改 1 year ago
anthonywj 88848d671d 长泰集采非集采问题,产品关联;数据库升级问题 1 year ago
anthonywj 1eea81cef6 代码备份 1 year ago
anthonywj ee6a7a6775 耗材字典新增货号等字段,协调平台查询新增序列号查询 2 years ago
yuanwei 91be062416 页面修改 2 years ago
yuanwei 35c6557734 Merge remote-tracking branch 'origin/dev_price' into 20231126-yw 2 years ago
anthonywj 0fa3c04d98 第三方物资类别修改 2 years ago
yuanwei 2d83718b42 初始化动态配置 2 years ago
yuanwei 09151052c2 初始化动态配置 2 years ago
anthonywj 3aaefed829 单据新增灭菌日期灭菌批号 2 years ago
anthonywj 383d060283 预验收单据类型新增带回与不带回 2 years ago
anthonywj 871433c022 新增物价类别 2 years ago
anthonywj bbcdd1dbd2 Merge remote-tracking branch 'origin/dev2.0' into dev_price
# Conflicts:
#	src/main/java/com/glxp/api/dao/system/SysMsgTodoMapper.java
#	src/main/java/com/glxp/api/entity/system/SysMsgTodoEntity.java
#	src/main/java/com/glxp/api/service/system/SysMsgTodoService.java
#	src/main/resources/mybatis/mapper/system/SysMsgTodoMapper.xml
2 years ago
wj 4b0099fa2d sys_msg_todo相关 2 years ago
wj b5467f4dcf sys_msg_todo相关 2 years ago
anthonywj 8792e1e7ab 代办消息列表 2 years ago
anthonywj ffe583217d 库存发票相关 2 years ago
anthonywj 49bef11dd9 物资入院申请等相关修改 2 years ago
anthonywj 43e1d463b8 价格先进先出,耗材字典问题,确认单据人问题 2 years ago
anthonywj 1807df0e31 单据类型添加编辑类型 2 years ago
anthonywj 302e204781 物资字典对照问题 2 years ago
anthonywj 6dea372e6a 系统繁忙问题 2 years ago
anthonywj c83c5fd8d3 删除任务同步相关调整(后续还需调整) 2 years ago
anthonywj 5f0ed5705d 修改设备任务ID为雪花ID(自增同步会有问题),其他相关bug修改 2 years ago
郑明梁 eec47d10ce 设备任务代码提交 2 years ago
wangwei 131c6f297f 同步删除基础数据 2 years ago
anthonywj 6b0a8cf8cc 新增同步操作日志相关方法 2 years ago
anthonywj 7ed62f3b38 新增websocket通信(中继服务同步相关) 2 years ago
anthonywj d2cc2d992f bug修改 耗材字典字段修改 2 years ago
anthonywj b23d7397bb bug修改 2 years ago
黄泽腾 388d68b3ae 生成对应内部码 2 years ago
anthonywj 15e6b8d168 新增备注字段 2 years ago
anthonywj 3583d17057 国家库更新版本问题 2 years ago
anthonywj eb48e66a36 int型修改 2 years ago
anthonywj 5e9d092264 修改ms查询单据类型 2 years ago
wj 0b93501508 属性copy调整 2 years ago
anthonywj b78a5a35c3 单据业务详情丢失,单据未补单,使用出库多补退货单等问题 2 years ago
anthonywj d6f9e3f06a 临床使用出库单新增备注字段 2 years ago
anthonywj 3caf75626b bug修改,提供协调平台追溯查询接口 2 years ago
anthonywj ce0da2cd18 ,bug修改 2 years ago
anthonywj b4243db10c 更新审核人,核对人,供应商编辑信息bug 2 years ago
郑明梁 5236bfaf39 单据上传功能代码提交 2 years ago
郑明梁 dbcb7bbaf1 Merge remote-tracking branch 'origin/pro' into dev
# Conflicts:
#	src/main/java/com/glxp/api/controller/auth/LoginController.java
2 years ago