Commit Graph

466 Commits (bae3fb9c303f3d7339d3513aa12900f716d2731c)

Author SHA1 Message Date
anthonywj d4e2b85982 拆零优化 12 months ago
wangwei 95cd6628f5 8/9 药品管理字段优化,生成单据的时候设置产品类型,响应字段,带票出入库根据订单号分组过滤 12 months ago
anthonywj 7e021afe6e 药品扫码相关修改 12 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
12 months ago
anthonywj e7d743faa0 切换分支备份 12 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
12 months ago
wangwei dfe7b8769e 8/8 药品搜索字段以及插入字段维护 12 months ago
anthonywj c2b8f4bf2e 处方分配工位修改 12 months ago
wangwei 26d23af14a 8/02 选入收费项目 12 months ago
chenhc 2860529256 feat: 处方下载 12 months ago
anthonywj 01d873f317 基础数据修改 12 months ago
anthonywj f1cd9fd1d6 四级库库存查询 12 months ago
anthonywj 0cc61f9f59 新增拆零队列 1 year ago
anthonywj 17b98d8ab0 药品信息编辑以及层级包装数量换算 1 year ago
anthonywj 4409ea42e3 药品字典修改 1 year ago
anthonywj 791f8c09fd 切换分支备份,选择库存自定义界面 1 year ago
wangwei c84ff8236c 7/30 药品管理 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 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 8a614fd0bc 1.1 1 year ago
anthonywj 1211a2d256 发票登记过滤 1 year ago
anthonywj c064fa3629 患者信息修改, 1 year ago
chenhc 8f054d1410 feat: 0702-扫码校验功能 1 year ago
chenhc 6ce53c5bea feat: 0702-扫码校验功能 1 year ago
wangwei bcbe3745b5 6/21 同步优化 1 year ago
wangwei d2a7f661a0 6/7 单据搜索 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 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 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 b27ec0f73a feat: 0517优化 1 year ago
chenhc fc6daa33f2 feat: 0517优化 1 year ago
chenhc 325f6d6961 feat: 0516优化 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 67955cae03 增加 保养计划 1 year ago
chenhc 560af1ae62 feat: 设备管理优化-0514-设备卡片 1 year ago
chenhc 5e393ab5ab feat: 设备管理优化-0513-申购、计划、合同、订单复制到设备管理 1 year ago