Commit Graph

155 Commits (7cfe54fa391090620d0d86db89011bbd401c417e)

Author SHA1 Message Date
wangwei 7cfe54fa39 8/28 药品数据维护第三方药品 11 months ago
chenhc 489a1daefe fix: 修改 11 months ago
chenhc 560e6eb318 fix: 修改 11 months ago
wangwei 12ad4f6e00 8/26 追溯码查询 以及工位bug修改 11 months ago
chenhc c9df2458cc fix: 单据库存预警字段 11 months ago
chenhc 5bccbd41cc fix: 自动分配工位存量到单据明细 11 months ago
wangwei 4a79d728e2 8/26 耗材加入工位预警数量 是否拆零 11 months ago
chenhc 1360a8463c feat: 单据备注字段 11 months ago
yewj f79c6de737 数据初始化计算计量单元数量 11 months ago
chenhc 243a6c3be9 feat: 修改 11 months ago
chenhc 2ff822c07a Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
wangwei 904e8a9950 8/14 工位单据管理 11 months ago
chenhc b697699668 Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo_z
# Conflicts:
#	src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
#	src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java
#	src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java
#	src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java
#	src/main/java/com/glxp/api/res/inv/InvProductResponse.java
#	src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java
#	src/main/resources/application-dev.yml
#	src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
#	src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
#	src/main/resources/mybatis/mapper/inv/invProductDao.xml
#	src/main/resources/schemas/schema_v2.4.sql
11 months ago
chenhc 4cfe42b996 feat: 首页复制 11 months ago
chenhc c268e0d067 feat: 库存预警 11 months ago
anthonywj d4e2b85982 拆零优化 11 months ago
anthonywj 7e021afe6e 药品扫码相关修改 11 months ago
anthonywj e645d38789 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
11 months ago
anthonywj e7d743faa0 切换分支备份 11 months ago
wangwei f9a09de847 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
11 months ago
wangwei dfe7b8769e 8/8 药品搜索字段以及插入字段维护 11 months ago
anthonywj 274aefa911 处方相关修改 11 months ago
anthonywj 0f1ee49172 预出库扫码修改,处方赋码修改 12 months ago
chenhc 701d39e3ba feat: 就诊卡 12 months ago
anthonywj f1cd9fd1d6 四级库库存查询 12 months ago
anthonywj 4409ea42e3 药品字典修改 12 months ago
chenhc a4a05d4756 feat: 药品出入库明细、汇总、入账库 12 months ago
anthonywj 08182d3d68 新增是否组套,单据出入库明细查询 12 months ago
anthonywj acc2afebdf 切换分支备份 12 months ago
anthonywj 147c9f3fa9 拆零相关修改 12 months ago
wangwei dfd2e2bfce Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
12 months ago
wangwei 7b0a9dd058 7/27 1.1 12 months ago
anthonywj 878f571a3b 新增医保拆零,医保收费项目,中西药,中药饮品,医用耗材等 12 months ago
wangwei 502c13d74a 7/26 sql 12 months ago
wangwei bba7ed9e2b 7/26 sql 12 months ago
wangwei f5c5b10c21 7/11 sql 1 year ago
anthonywj f16521fbbb 平潭修改患者信息下载 1 year ago
chenhc 6ce53c5bea feat: 0702-扫码校验功能 1 year ago
anthonywj 0887580f38 bzgg 1 year ago
wangwei a4aad12e71 6/21 sql 1 year ago
wangwei d2a7f661a0 6/7 单据搜索 1 year ago
chenhc 52ff3ecd4a feat: 0606注释掉是否需要扫码 1 year ago
wangwei 2572ca2b7e 6/4 优化发票确认时间以及相关带票查询 1 year ago
chenhc 8bf33df981 feat: 0531增加是否需要扫码字段 1 year ago
anthonywj 3f649b0abf Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
1 year ago
anthonywj 87d3b9486f 新增耗材类别校验 1 year ago
chenhc a15afd2f5a feat: 0527开发论证功能 1 year ago
chenhc b70f4136cf feat: 0523开发论证功能 1 year ago
chenhc 0d9fc95ce0 feat: 0523开发询价模块 1 year ago
chenhc e4faa404e0 feat: 0523开发询价模块 1 year ago