Commit Graph

1257 Commits (1b688f400e7beaef65f8fe312ad7088e9d09caa9)

Author SHA1 Message Date
yewj 5f11772edb 选入产品带入层级 10 months ago
yewj 37f7a7ea76 bug修改,层级,阿里产品等 10 months ago
qiuyt d7c499a342 供应商和基础管理的药品字典维护 增加明细分类逻辑 增加药品层级逻辑更改 选入增加明细分类 增加耗材字典表字段 10 months ago
chenhc 389679926d fix: 修复 10 months ago
wangwei 2a735e688c 11/12 选入药品层级带入批准文号 10 months ago
yewj 33147dbece Merge remote-tracking branch 'origin/dev_drug' into dev_drug
# Conflicts:
#	src/main/resources/mybatis/mapper/thrsys/ThirdAliDrugMapper.xml
10 months ago
yewj 404f436e7f 药品字典修改 10 months ago
chenhc 4400eabe35 fix: 修复 10 months ago
chenhc 4f2bcd3095 fix: 修复 10 months ago
chenhc 3eee851ec1 fix: 修复 10 months ago
chenhc 011d559cfa fix: 修复 10 months ago
chenhc 9206192dd8 fix: 修复 10 months ago
chenhc 6632322541 feat: 阿里药品加批准文号 10 months ago
chenhc 47efbae8e6 feat: 药品关联关系查重功能 10 months ago
wangwei f1862398e4 11/12 供应商选入药品增加查询条件 包装规格 制剂规格 10 months ago
chenhc 4977273cd0 Merge remote-tracking branch 'origin/dev_drug' into dev_drug 10 months ago
chenhc 66ffa6bf98 fix:阿里药品关系维护 10 months ago
yewj 95c6d9ef47 Merge remote-tracking branch 'origin/dev_drug' into dev_drug 10 months ago
yewj f7843f2739 关联关系校验 10 months ago
wangwei 142929f131 11/11 药品送货发票登记 10 months ago
yewj 2e3df99740 获取扫码关联关系批次号等 10 months ago
yewj 9143281b2e 获取扫码关联关系批次号等 10 months ago
yewj ab094e6611 Merge remote-tracking branch 'origin/dev_drug' into dev_drug 10 months ago
yewj de4621f59d 扫码关联关系问题 10 months ago
chenhc 4cf197f3ae fix:阿里药品关系维护 10 months ago
wangwei e75234fc27 11/7 页面优化1.0 10 months ago
chenhc cbcc5cd994 fix:阿里药品关系维护 10 months ago
wangwei 952171b068 11/7 供应商添加药品信息优化1.0 10 months ago
chenhc eee367a1f1 fix:优化关联关系 10 months ago
chenhc ba00fbfb71 fix:优化关联关系 10 months ago
chenhc 1f04f07f84 fix:优化关联关系 10 months ago
wangwei 8728cfb94b 11/7 同步更改时间 10 months ago
chenhc 2920d23b7b fix:修复 10 months ago
yewj 3bb20f08f9 新增阿里药品信息目录 10 months ago
yewj 6ce5cdc9c1 扫码修改 10 months ago
chenhc f31b78522c feat: 码明细到国家同步库 11 months ago
chenhc 359b0fb636 feat: 多码融合 11 months ago
chenhc eda1d2232e feat: 多码融合 11 months ago
chenhc e4350529f1 feat: 多码融合 11 months ago
chenhc bfa841ffa7 feat: 多码融合 11 months ago
chenhc 3d7422ecd4 feat: 多码融合 11 months ago
chenhc c693fbc24a feat: 多码融合 11 months ago
chenhc 5a395d84f7 feat: 多码融合 11 months ago
qyt bbf9d799c1 仓库逻辑改变仓库详情的逻辑都改成仓库表(第一次更新) 11 months ago
wangwei c96d76d1b3 10/15 同步优化1.0 11 months ago
yewj 70ce57e267 修改流通时,使用时数量计算 11 months ago
yewj ab34a60b64 查询采购订单,处理采购订单 11 months ago
wangwei f2f90af9f0 10/21 优化1 11 months ago
chenhc e3603c4e42 feat: 药品关联关系是否存在 11 months ago
chenhc 998879daff feat: 药品关联关系是否存在 11 months ago
chenhc e2ba897fc3 feat: 药品关联关系是否存在 11 months ago
chenhc 4f1258572d feat: 药品关联信息上下传输功能 11 months ago
yewj 96c9a354ce 器械层级修改 11 months ago
wangwei 11a52f4fd3 10/17 单据增加单据类型 11 months ago
yewj b4586848b6 Merge remote-tracking branch 'origin/dev_drug' into dev_drug 11 months ago
yewj 10ca47d409 药品采购订单修改 11 months ago
chenhc 11b1c70394 feat: 药品关联关系功能 11 months ago
chenhc bb10befc0f feat: 手工关联、拼箱关联数据同步 11 months ago
qyt 69e256dd37 1、移植耗材管理编辑功能的所有相关
2、sql增加字段
11 months ago
wangwei f4c9afc4f5 Merge remote-tracking branch 'origin/dev_drug' into dev_drug 11 months ago
wangwei 036048bddd 10/14 yaopin 11 months ago
chenhc 7ed2265dec feat: 手工关联、拼箱关联数据同步 11 months ago
chenhc 3d3855af70 feat: 手工关联、拼箱关联 11 months ago
yewj ea4fc93a5d Merge remote-tracking branch 'origin/dev_drug' into dev_drug 11 months ago
yewj 8a838e91e9 是否组套 11 months ago
wangwei 9b9b478364 10/14 药品基础数据优化 11 months ago
anthonywj eb22007eb4 Merge remote-tracking branch 'origin/dev_drug' into dev_drug
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
1 year ago
anthonywj 405e9778f9 是否组套 1 year ago
wangwei 4316419c00 8/12 药品字段 1 year ago
anthonywj 15b093a2df 药品扫码流程修改 1 year ago
wangwei f2d7b3ab2d 8/8 药品管理 1 year ago
wangwei 686a88991a 8/5 优化1.1入院药品维护,以及响应字段 1 year ago
wangwei fdaef6479a 8/02 1.1 药品出入库明细查询药品出入库单据 1 year ago
wangwei d1eaf16000 8-01 药品管理 1 year ago
chenhc 09178327d6 feat: 选入入院药品 1 year ago
anthonywj 202f3c8959 新增是否组套,出入库明细改造, 1 year ago
anthonywj b3006e5870 新增是否组套,出入库明细改造, 1 year ago
anthonywj c3898425e6 发票登记过滤 1 year ago
anthonywj 97fae0e6cb Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck 1 year ago
anthonywj d1aad25a7c 打印,包装规格,第三方产品审核等问题 1 year ago
chenhc 5fd6f0511f feat: DI选入审核时进行是否需要扫码初始化 1 year ago
chenhc 3a52a67c49 feat: 导入入院物资修改 1 year ago
anthonywj f327aac379 单据校验耗材问题 1 year ago
anthonywj 9289dfa341 好词啊字典,发票等相关修改 1 year ago
chenhc 51a8ef9976 feat: 导入入院物资修改 1 year ago
chenhc 54e3556181 feat: 导入入院物资修改 1 year ago
chenhc 9a573b35af feat: 0702-扫码校验功能 1 year ago
chenhc a13a3b9fab feat: 0702-扫码校验功能 1 year ago
chenhc fdfa933336 feat: 0701-是否需要扫码前判断单据是否为空 1 year ago
chenhc d24fe63ca5 feat: 0701-是否需要扫码前判断单据是否为空 1 year ago
wangwei bbf0efa461 5-20 sql 1 year ago
wangwei 7e14b47152 6/21 同步优化 1 year ago
chenhc 38aec42f54 feat: 0606注释掉是否需要扫码 1 year ago
chenhc 9648212bd8 feat: 0605修复 1 year ago
anthonywj d8e113bef1 发票打印问题 1 year ago
chenhc a33b607376 feat: 0604增加是否需要扫码字段 1 year ago
chenhc 8388ad0412 feat: 0531增加是否需要扫码字段 1 year ago
anthonywj 1b232af9b6 单据同步删除 1 year ago
anthonywj 104fd02dfa Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck 1 year ago
anthonywj 8a41d006cc 新增耗材类别校验 1 year ago
chenhc 899f71188e feat: sql更新 1 year ago
chenhc 1ca947ba0a feat: sql更新、设备管理迁移、小程序接口暴露 1 year ago
chenhc b108828b54 feat: sql更新 1 year ago
wangwei 45d8c20e40 5-20 三张保养相关表 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
wangwei b952f02c2b 5-20 数据同步 1.3 修改sql语句 1 year ago
anthonywj 003fbc5205 第三方产品信息导入 1 year ago
wangwei fe0beef80d 5-10 数据同步 1.2 1 year ago
wangwei 54f9289737 5-10 数据同步 更改 设备管理 1 year ago
chenhc ffe4a8013e feat: 增加耗材类别编辑 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
anthonywj bec388063b 资质预警相关修改,医保编码判空 1 year ago
chenhc 6dc4bcf6d9 feat: 新增业务单据加上单据类型过滤物资录入 1 year ago
chenhc b9794887a9 feat: 校验产品采购类型修复 1 year ago
chenhc 4337b43a08 feat: 校验产品采购类型修复 1 year ago
anthonywj 5b468f2e2f 资质证书预警修改,扫码添加,医保分类等系统繁忙修改 1 year ago
chenhc ad5a1458b1 feat: 医保编码增加catalogCode相关字段 1 year ago
chenhc b9d5f590cf feat: 业务过滤采购类型字段 1 year ago
chenhc c02bfb9b6a feat: 增加校验产品属性 1 year ago
chenhc 40c55bc282 feat: menu 1 year ago
chenhc 3e5efc3c6b feat: 增加供应商物资字典转让 1 year ago
chenhc f07808df19 feat: 修复医保耗材分类审核通过未带 1 year ago
anthonywj 25fc2ef380 Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck 1 year ago
anthonywj b57aaeb5cc 代码备份 1 year ago
chenhc a48492a3da feat: bug修复 1 year ago
anthonywj e5ddbd2fd2 代码备份 1 year ago
chenhc cae7b2848d feat: bug修复 1 year ago
anthonywj ae10936884 新增配送产品,申请与审核,创建后回填 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: 增加医保耗材信息接口调用 2 years ago
chenhc 6478d75f10 feat: 增加界面配置sql 2 years ago
anthonywj 55a13b7f62 资质预警暂时修改成全部预警 2 years ago
chenhc c043a6ed69 feat: 资质预警信息-增加过滤框 2 years ago
anthonywj 0bb6bfc97a 资质修改 2 years ago
anthonywj 48c0ce5269 资质证书预警等相关修改 2 years ago
anthonywj bdd9306804 资质证书预警等相关修改 2 years ago
anthonywj 479705f562 资质证书预警等相关修改 2 years ago
chenhc c03a6b8cbf fix: 关闭校验 2 years ago
anthonywj 4c972d4ac6 bug修改 2 years ago
anthonywj be9a844ebf 新增耗材分类 2 years ago
chenhc 03faf34cb4 登录标题修改 2 years ago
chenhc 9a3fde6eed fix: 优化退货单再次分配 2 years ago
anthonywj 552367c4d3 供应商产品维护更新问题 2 years ago
anthonywj ef9f01c674 新增产品属性 2 years ago
anthonywj de3e184f9c 采购类型相关修改 2 years ago