qiuyt
|
1610a0657f
|
1、查询码信息更改
|
9 months ago |
|
qiuyt
|
5acbb896c6
|
1、查询码信息更改
|
9 months ago |
chenhc
|
e7a5145063
|
feat: 阿里采购送货单的业务对接
|
9 months ago |
yewj
|
afe12bf5ff
|
添加iocodeLost唯一索引
|
9 months ago |
|
yewj
|
b3da30fdc4
|
提交todo
|
9 months ago |
|
yewj
|
72d4d04a8d
|
提交todo
|
9 months ago |
|
qiuyt
|
72d9611ccc
|
1、编辑药品选入产品标识重新建个请求写逻辑
2、药品编辑维护选入查询阿里逻辑
|
9 months ago |
|
chenhc
|
3e1de294b0
|
feat: 阿里采购送货单的业务对接
|
9 months ago |
|
chenhc
|
3e00e28df1
|
feat: 阿里采购送货单的业务对接
|
9 months ago |
|
chenhc
|
d4dce20a19
|
feat: 阿里采购送货单的业务对接
|
9 months ago |
|
qiuyt
|
f518c41472
|
1、阿里获取单据加上往来单位查询
|
9 months ago |
|
chenhc
|
5cf64403df
|
feat: 阿里采购送货单的业务对接
|
9 months ago |
|
qiuyt
|
315436f4be
|
1、阿里获取单据
|
9 months ago |
|
qiuyt
|
caddab8ce4
|
1、阿里获取单据
|
9 months ago |
|
qiuyt
|
b0d5378f43
|
1、阿里获取单据
|
9 months ago |
|
chenhc
|
c95a5cf291
|
feat: 阿里采购送货单的业务对接
|
9 months ago |
|
qiuyt
|
0c5d88c1db
|
1、扫码补齐阿里的批次号 等信息
2、解决扫码扫码详情出不来的bug
|
9 months ago |
|
chenhc
|
dd9be6e8fe
|
feat: 阿里采购送货单的业务对接
|
9 months ago |
|
yewj
|
4a92d3d323
|
Merge remote-tracking branch 'origin/dev_drug' into dev_drug
|
9 months ago |
|
yewj
|
fb8bbb8b4f
|
修改带校验，库存等
|
9 months ago |
|
qiuyt
|
4221c7f8fb
|
1、阿里一些对象先上传 初始化一些访问接口方法
2、杰哥改的东西上传
3、循环导入药品没加类型查的问题
|
9 months ago |
|
qiuyt
|
ec747944bf
|
1、阿里一些对象先上传 初始化一些访问接口方法
2、杰哥改的东西上传
3、循环导入药品没加类型查的问题
|
9 months ago |
|
yewj
|
f2ebe1872b
|
单据提交按照业务单提交
|
9 months ago |
wangwei
|
c92d07bdcf
|
12/9 药品选入价格问题1.0 订单主标识一样根据产品uuid分组
|
9 months ago |
|
qiuyt
|
d2c006cf43
|
1、阿里单据拉取参数（还差一些对照）
2、产品选入问题
|
9 months ago |
|
yewj
|
38f66bc445
|
产品查询查询全部问题
|
9 months ago |
|
yewj
|
e8d558bbf3
|
产品查询查询全部问题
|
9 months ago |
|
qiuyt
|
42785d87a5
|
1、选入药品调用国家库或者阿里接口进行拉取药品码段数据插入我们的表
2、医保接口也没有的时候也调用接口
3、key使用阿里用户表获取
|
9 months ago |
|
qiuyt
|
a240f24839
|
选入药品逻辑更改
|
10 months ago |
|
yewj
|
f1a16d24b7
|
最小数量修改
|
10 months ago |
|
qiuyt
|
2409d88b58
|
选入药品问题 并且查不到阿里也会新增一条 查不到医保库也同理
|
10 months ago |
|
qiuyt
|
b3b8376d9a
|
选入药品阿里不能抛出异常
|
10 months ago |
|
qiuyt
|
94fff63ebb
|
选入药品阿里字段问题
|
10 months ago |
|
qiuyt
|
9a7f359524
|
选入药品阿里字段问题
|
10 months ago |
|
qiuyt
|
99b53dfa1c
|
1、扫码自动获取关联关系对象属性变化
2、生产企业通过时间段批量查询入出库单信息阿里接口
|
10 months ago |
|
qiuyt
|
85512b32b7
|
1、
|
10 months ago |
|
qiuyt
|
610408ac5c
|
增加调用阿里查询药品码段信息
选入药品之后判断国家库有没有有就获取 没有就去调用阿里接口(厂家ID获取有问题先写死)
|
10 months ago |
|
qiuyt
|
864ec46a6e
|
增加调用阿里查询药品码段信息
选入药品之后判断国家库有没有有就获取 没有就去调用阿里接口
|
10 months ago |
|
wangwei
|
9d0c16cb86
|
11/28 优化
|
10 months ago |
|
chenhc
|
559d6e5197
|
fix: 增加药品单据的一个判断是否全部维护关联关系
|
10 months ago |
|
chenhc
|
9dd6b11940
|
fix: 增加药品单据的一个判断是否全部维护关联关系
|
10 months ago |
|
yewj
|
2057364f55
|
Merge remote-tracking branch 'origin/dev_drug' into dev_drug
|
10 months ago |
|
yewj
|
9a715c85b8
|
bug修改
|
10 months ago |
|
chenhc
|
cdd570723c
|
fix: 修复
|
10 months ago |
|
chenhc
|
7c3e12ab04
|
fix: 修复
|
10 months ago |
|
wangwei
|
ecd6316359
|
11/27 新增第三方产品
|
10 months ago |
|
wangwei
|
47c22da4ac
|
11/22 单据扫码详情表设置药品包装规格
|
10 months ago |
|
wangwei
|
db8e7651c0
|
11/22 查询字段优化1.0
|
10 months ago |
|
qiuyt
|
5be468c250
|
增加关联关系获取接口用于关联系统用
阿里调用接口逻辑变更
|
10 months ago |
|
wangwei
|
b3c8dfecf8
|
11/20 库存查询优化
|
10 months ago |
|
yewj
|
135981aca1
|
耗材字典审核
|
10 months ago |
|
wangwei
|
4e1353f1c0
|
11/19 查询优化
|
10 months ago |
|
yewj
|
c396226dd4
|
Merge remote-tracking branch 'origin/dev_drug' into dev_drug
|
10 months ago |
|
yewj
|
cabf9eeb5f
|
关联关系同步问题
|
10 months ago |
|
wangwei
|
16342e510d
|
11/19 药品基础数据明细分类同步
|
10 months ago |
|
wangwei
|
8a674aca2e
|
11/19 供应商耗材选入优化
|
10 months ago |
|
yewj
|
da5b51268c
|
关联关系修改，扫码补齐修改，bug修改
|
10 months ago |
|
qiuyt
|
ebecb976e1
|
Merge branch 'dev_drug' of http://116.204.71.86:3000/UDI/udi-spms-java into dev_drug
|
10 months ago |
|
qiuyt
|
b1b91af660
|
扫码的时候如果没查到码关联关系数据去调用阿里接口进行插入
|
10 months ago |
|
wangwei
|
9ac558a038
|
Merge remote-tracking branch 'origin/dev_drug' into dev_drug
|
10 months ago |
|
wangwei
|
78034bb355
|
供应商选入 耗材 修改
|
10 months ago |
|
qiuyt
|
a970e840be
|
扫码的时候如果没查到码关联关系数据去调用阿里接口进行插入
|
10 months ago |
|
yewj
|
efce84554c
|
代码备份
|
10 months ago |
|
wangwei
|
8af8506be2
|
11/18 界面查询优化1.0
|
10 months ago |
|
wangwei
|
03782d19f3
|
11/18 关联关系查询字段
|
10 months ago |
|
chenhc
|
1200db9be9
|
fix: 修复
|
10 months ago |
|
wangwei
|
14af1e3b8e
|
Merge remote-tracking branch 'origin/dev_drug' into dev_drug
|
10 months ago |
|
wangwei
|
15b676dbef
|
10/15 界面优化1.0
|
10 months ago |
|
qiuyt
|
20cb246f4d
|
提供一个方法新增这个供应商的code阿里健康关联的所有关联关系存储(三级码的关系不知道阿里返回的什么结构的无法测试 可能要改代码)
|
10 months ago |
|
qiuyt
|
5cc35709ed
|
提供一个方法新增这个供应商的code阿里健康关联的所有关联关系存储(三级码的关系不知道阿里返回的什么结构的无法测试 可能要改代码)
|
10 months ago |
|
qiuyt
|
634775a6c8
|
1、封装阿里健康入参和返回 设计成通用方式后面再加个新接口比较方便
2、供应商增加码上放心企业信息增加阿里健康需要的信息
3、提供一个方法新增这个供应商的code阿里健康关联的所有关联关系存储
|
10 months ago |
|
wangwei
|
6188451289
|
11/15 供应商新增入院药品优化1.0
|
10 months ago |
|
wangwei
|
a5504c85de
|
11/15 供应商选入药品优化1.0
|
10 months ago |
|
wangwei
|
32570637c9
|
11/15 供应商药品库存查询
|
10 months ago |
|
wangwei
|
87140090dc
|
11/14 供应商药品维护高级查询
|
10 months ago |
|
wangwei
|
5d1b1f894e
|
11/14 增加是否查用字段 供应商选入药品增加模糊搜索 测试高级搜索
|
10 months ago |
|
chenhc
|
ce6d2d2b58
|
fix: 修复
|
10 months ago |
|
yewj
|
90e09f8bff
|
代码备份
|
10 months ago |
|
yewj
|
4db47217c4
|
关联关系问题
|
10 months ago |
|
chenhc
|
3a4d5fffc0
|
fix: 修复药品关联关系失败不再次上传
|
10 months ago |
|
chenhc
|
14baf9e1d5
|
fix: 修复
|
10 months ago |
|
yewj
|
7204aac90e
|
产品信息维护问题
|
10 months ago |
|
qiuyt
|
07d2029e96
|
Merge remote-tracking branch 'origin/dev_drug' into dev_drug
# Conflicts:
# src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
|
10 months ago |
|
chenhc
|
3f1deed064
|
fix: 修复
|
10 months ago |
|
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: 码明细到国家同步库
|
10 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 |
