Commit Graph

1059 Commits (201d03bf4e50f4f0dfdb1f371af08852a02c4e7b)

Author SHA1 Message Date
chenhc c268e0d067 feat: 库存预警 1 year ago
anthonywj b30a908894 重写采集点代码 1 year ago
anthonywj 9278b88162 采集点代码生成 1 year ago
anthonywj bae3fb9c30 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
anthonywj d4e2b85982 拆零优化 1 year ago
wangwei b757ab2ffb 8/12 药品字段数据 1 year ago
anthonywj e3410ca4c2 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei 95cd6628f5 8/9 药品管理字段优化,生成单据的时候设置产品类型,响应字段,带票出入库根据订单号分组过滤 1 year ago
anthonywj d96d75634f 切换分支备份 1 year ago
anthonywj 7e021afe6e 药品扫码相关修改 1 year ago
anthonywj e645d38789 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
1 year ago
anthonywj e7d743faa0 切换分支备份 1 year ago
wangwei f9a09de847 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
1 year ago
wangwei dfe7b8769e 8/8 药品搜索字段以及插入字段维护 1 year ago
anthonywj 274aefa911 处方相关修改 1 year ago
anthonywj 0f1ee49172 预出库扫码修改,处方赋码修改 1 year ago
wangwei 26d23af14a 8/02 选入收费项目 1 year ago
chenhc 4b6ac18da9 feat: 带票出入库明细 1 year ago
chenhc 701d39e3ba feat: 就诊卡 1 year ago
anthonywj 771886a42d Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
anthonywj f1cd9fd1d6 四级库库存查询 1 year ago
chenhc 8fdd2a487d feat: 带票出入库明细 1 year ago
wangwei b329488995 单据查看药品字典详情 1 year ago
anthonywj 0cc61f9f59 新增拆零队列 1 year ago
anthonywj 0ec915d253 平潭收费出库明细 1 year ago
anthonywj 4409ea42e3 药品字典修改 1 year ago
anthonywj 15fe481b72 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
anthonywj 6d2014e1f6 切换分支备份,选择库存自定义界面 1 year ago
anthonywj ed3b454631 切换分支备份,选择库存自定义界面 1 year ago
wangwei c84ff8236c 7/30 药品管理 1 year ago
anthonywj ca74b54400 切换分支备份 1 year ago
anthonywj 6cde6e6fee 单据删除 1 year ago
anthonywj d101ee2c2c 切换分支备份 1 year ago
wangwei 77f78557d6 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
1 year ago
wangwei 58a8377531 7/29 1.1 更改药品 1 year ago
chenhc a4a05d4756 feat: 药品出入库明细、汇总、入账库 1 year ago
anthonywj 08182d3d68 新增是否组套,单据出入库明细查询 1 year ago
anthonywj acc2afebdf 切换分支备份 1 year ago
anthonywj 147c9f3fa9 拆零相关修改 1 year ago
wangwei dfd2e2bfce Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
1 year ago
wangwei 7b0a9dd058 7/27 1.1 1 year ago
anthonywj 878f571a3b 新增医保拆零,医保收费项目,中西药,中药饮品,医用耗材等 1 year ago
anthonywj de0987058c Merge branch 'dev_fifo' into dev_fifo_z 1 year ago
wangwei 502c13d74a 7/26 sql 1 year ago
wangwei bba7ed9e2b 7/26 sql 1 year ago
wangwei 8a614fd0bc 1.1 1 year ago
anthonywj a74e1f0109 库存预警修改 1 year ago
anthonywj 1211a2d256 发票登记过滤 1 year ago
wangwei f5c5b10c21 7/11 sql 1 year ago
anthonywj c064fa3629 患者信息修改, 1 year ago
anthonywj 0cee7aee54 读患者信息问题 1 year ago
anthonywj f16521fbbb 平潭修改患者信息下载 1 year ago
anthonywj a508f850a2 南靖新增第三方产品编码返回 1 year ago
anthonywj 184b3c8139 南靖接口调用查库存修改 1 year ago
chenhc 8f054d1410 feat: 0702-扫码校验功能 1 year ago
chenhc 6ce53c5bea feat: 0702-扫码校验功能 1 year ago
anthonywj 160d36b0a0 收费项目,单据类型修改 1 year ago
anthonywj 0887580f38 bzgg 1 year ago
wangwei a4aad12e71 6/21 sql 1 year ago
wangwei bcbe3745b5 6/21 同步优化 1 year ago
wangwei b630f392f5 6/11 单据查询页面 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
chenhc ddb0a24f8d feat: 0531科室出库 1 year ago
anthonywj 8efc4c9533 评价相关操作类 1 year ago
anthonywj b86c064232 评价相关操作类 1 year ago
anthonywj 362d1fa353 评价体系重命名 1 year ago
anthonywj 571a992848 新增供应商评价相关类 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
chenhc 65e6bdf631 feat: 0521 优化 1 year ago
chenhc b20a361cf1 feat: 0520 优化 1 year ago
wangwei fd7dc88243 5-20 提交保养相关接口 1 year ago
wangwei a5ddecac51 5/17 保养计划优化 前端 巡检/维修/保养 记录 暂时没按钮 1 year ago
chenhc a411503f78 feat: sql优化 1 year ago
chenhc 75fb2ebc34 feat: sql优化 1 year ago
chenhc b27ec0f73a feat: 0517优化 1 year ago
chenhc fc6daa33f2 feat: 0517优化 1 year ago
anthonywj 0b257f3087 新增发票确认时间 1 year ago
chenhc 325f6d6961 feat: 0516优化 1 year ago
chenhc 14d345a8f6 feat: sql修改 1 year ago
chenhc 6f71299042 feat: sql修改 1 year ago
wangwei ed8ca33559 Merge branch 'dev_fifo1.0' into dev_fifo
# Conflicts:
#	src/main/java/com/glxp/api/entity/dev/DeviceCheckDetailEntity.java
#	src/main/java/com/glxp/api/entity/dev/DeviceInfoEntity.java
#	src/main/java/com/glxp/api/entity/dev/DeviceRepairApplyDetailEntity.java
#	src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderServiceImpl.java
#	src/main/resources/schemas/schema_v2.4.sql
1 year ago
wangwei 5c5561b070 增加更改 相关表 1 year ago
wangwei 67955cae03 增加 保养计划 1 year ago
chenhc 560af1ae62 feat: 设备管理优化-0514-设备卡片 1 year ago
anthonywj bd9af3f14d 采购订单关联单号 1 year ago
chenhc eaf83b2ca3 feat: 设备管理优化-0514-合同管理 1 year ago
chenhc 5e393ab5ab feat: 设备管理优化-0513-申购、计划、合同、订单复制到设备管理 1 year ago
chenhc 1c5e86da2d feat: 设备管理优化-0513-申购、计划、合同、订单复制到设备管理 1 year ago
chenhc b096280db6 feat: 设备管理优化-0513-合同管理复制 1 year ago
chenhc 770caa552c feat: 设备管理优化-0512-增加移除设备的审批流程 1 year ago
chenhc 11754a27bb feat: 设备管理优化-0512-增加移除类型 1 year ago
wangwei f9b273fcb6 5-10 数据同步 1 year ago