yewj
|
6664d982a7
|
有三期业务单校验改成不校验三期
|
7 months ago |
qiuyt
|
9c8deca2b1
|
选入码上放心单据加上单据编码查询
|
7 months ago |
|
qiuyt
|
62602a7ce4
|
1、选入药品层级查询bug
|
7 months ago |
|
qiuyt
|
3a108a0419
|
1、优化选入药品层级增加连带选入
2、选入药品优化（医保有数据按照医保为准为空就用阿里的）
|
7 months ago |
|
yewj
|
726e46521e
|
层级数量换算
|
7 months ago |
wangwei
|
42154bee1a
|
12/20 bug优化
|
7 months ago |
|
qiuyt
|
36d193986d
|
1、每次选入有括号和罗马数字的等进行多次转换查询
2、查询睡眠写在接口上
3、药品选入层级增加连带选入 剔除已经存在的药品
|
7 months ago |
|
yewj
|
74fd21c176
|
换算数量
|
7 months ago |
|
qiuyt
|
30f6bca31e
|
调用阿里关联关系优化
选入药品查国家库加厂商条件查询
|
7 months ago |
|
yewj
|
1192f815da
|
Merge remote-tracking branch 'origin/dev_drug' into dev_drug
|
7 months ago |
|
yewj
|
6e4aa2537e
|
规格型号问题
|
7 months ago |
|
wangwei
|
2dbb4b2ae3
|
12/20 发票查询优化
|
7 months ago |
chenhc
|
860ce44e4d
|
fix：修复
|
7 months ago |
|
yewj
|
335a4b3432
|
Merge remote-tracking branch 'origin/dev_drug' into dev_drug
|
7 months ago |
|
yewj
|
baa11d9504
|
代码备份
|
7 months ago |
|
chenhc
|
1d657df24a
|
fix：修复
|
7 months ago |
|
yewj
|
16c86f330a
|
Merge remote-tracking branch 'origin/dev_drug' into dev_drug
|
7 months ago |
|
wangwei
|
66039057be
|
12/20 bug 优化1.0
|
7 months ago |
|
yewj
|
adb6a33c36
|
切换分支备份
|
7 months ago |
|
qiuyt
|
e671b6def7
|
调用阿里关联关系
|
7 months ago |
|
qiuyt
|
09c0571b41
|
调用阿里关联关系
|
7 months ago |
|
qiuyt
|
29f6245b7b
|
Merge branch 'dev_drug' of http://116.204.71.86:3000/UDI/udi-spms-java into dev_drug
|
7 months ago |
|
qiuyt
|
efaed81227
|
调用阿里关联关系
|
7 months ago |
|
yewj
|
69400e2969
|
单据审核问题
|
7 months ago |
|
qiuyt
|
adc9b36ebd
|
Merge branch 'dev_drug' of http://116.204.71.86:3000/UDI/udi-spms-java into dev_drug
|
7 months ago |
|
qiuyt
|
6e9a9177c0
|
调用阿里关联关系
|
7 months ago |
|
chenhc
|
38f92f7eea
|
feat: 多种包装规格
|
7 months ago |
|
qiuyt
|
7332db1c26
|
选入排序
|
7 months ago |
|
qiuyt
|
5a17fa49a2
|
选入药品做转换匹配阿里
阿里关联关系优化
|
7 months ago |
|
qiuyt
|
aefadc1062
|
选入药品做转换匹配阿里
阿里关联关系优化
|
7 months ago |
|
wangwei
|
1b688f400e
|
12/19 药品对照优化1.0
|
7 months ago |
|
qiuyt
|
8fd6e95bab
|
选入药品加上生产厂家对照查不到就改括号
|
7 months ago |
|
qiuyt
|
a753157d27
|
选入药品加上生产厂家对照查不到就改括号
|
7 months ago |
|
qiuyt
|
9edafea43d
|
选入药品加上生产厂家对照查不到就改括号
|
7 months ago |
|
qiuyt
|
1ac430e083
|
选入药品加上生产厂家对照查不到就改括号
|
7 months ago |
|
qiuyt
|
3eddd3676a
|
审核通过 医保上传单据并且调用查询关联关系入库
|
7 months ago |
|
yewj
|
d62caf7947
|
Merge remote-tracking branch 'origin/dev_drug' into dev_drug
|
7 months ago |
|
yewj
|
b603f534cc
|
单据审核后上传关联关系
|
7 months ago |
|
wangwei
|
223af215f0
|
12/17 扫码单类型
|
7 months ago |
|
wangwei
|
7b56a8565a
|
12/16 器械选入的规格型号
|
7 months ago |
|
yewj
|
16445b63a6
|
Merge remote-tracking branch 'origin/dev_drug' into dev_drug
|
7 months ago |
|
yewj
|
16e7e8179c
|
选入阿里单据,重复扫码
|
7 months ago |
|
chenhc
|
057a57300d
|
feat: 阿里采购送货单的业务对接
|
7 months ago |
|
chenhc
|
e412a73854
|
feat: 阿里采购送货单的业务对接
|
7 months ago |
|
yewj
|
72eca2dcbc
|
Merge remote-tracking branch 'origin/dev_drug' into dev_drug
|
7 months ago |
|
yewj
|
c69a08bac7
|
选入阿里单据
|
7 months ago |
|
qiuyt
|
1610a0657f
|
1、查询码信息更改
|
7 months ago |
|
qiuyt
|
5acbb896c6
|
1、查询码信息更改
|
7 months ago |
|
chenhc
|
e7a5145063
|
feat: 阿里采购送货单的业务对接
|
7 months ago |
|
yewj
|
afe12bf5ff
|
添加iocodeLost唯一索引
|
7 months ago |
|
yewj
|
b3da30fdc4
|
提交todo
|
7 months ago |
|
yewj
|
72d4d04a8d
|
提交todo
|
7 months ago |
|
qiuyt
|
72d9611ccc
|
1、编辑药品选入产品标识重新建个请求写逻辑
2、药品编辑维护选入查询阿里逻辑
|
7 months ago |
|
chenhc
|
3e1de294b0
|
feat: 阿里采购送货单的业务对接
|
7 months ago |
|
chenhc
|
3e00e28df1
|
feat: 阿里采购送货单的业务对接
|
7 months ago |
|
chenhc
|
d4dce20a19
|
feat: 阿里采购送货单的业务对接
|
7 months ago |
|
qiuyt
|
f518c41472
|
1、阿里获取单据加上往来单位查询
|
7 months ago |
|
chenhc
|
5cf64403df
|
feat: 阿里采购送货单的业务对接
|
7 months ago |
|
qiuyt
|
315436f4be
|
1、阿里获取单据
|
7 months ago |
|
qiuyt
|
caddab8ce4
|
1、阿里获取单据
|
7 months ago |
|
qiuyt
|
b0d5378f43
|
1、阿里获取单据
|
7 months ago |
|
chenhc
|
c95a5cf291
|
feat: 阿里采购送货单的业务对接
|
7 months ago |
|
qiuyt
|
0c5d88c1db
|
1、扫码补齐阿里的批次号 等信息
2、解决扫码扫码详情出不来的bug
|
7 months ago |
|
chenhc
|
dd9be6e8fe
|
feat: 阿里采购送货单的业务对接
|
7 months ago |
|
yewj
|
4a92d3d323
|
Merge remote-tracking branch 'origin/dev_drug' into dev_drug
|
7 months ago |
|
yewj
|
fb8bbb8b4f
|
修改带校验，库存等
|
7 months ago |
|
qiuyt
|
4221c7f8fb
|
1、阿里一些对象先上传 初始化一些访问接口方法
2、杰哥改的东西上传
3、循环导入药品没加类型查的问题
|
7 months ago |
|
qiuyt
|
ec747944bf
|
1、阿里一些对象先上传 初始化一些访问接口方法
2、杰哥改的东西上传
3、循环导入药品没加类型查的问题
|
7 months ago |
|
yewj
|
f2ebe1872b
|
单据提交按照业务单提交
|
7 months ago |
|
wangwei
|
c92d07bdcf
|
12/9 药品选入价格问题1.0 订单主标识一样根据产品uuid分组
|
7 months ago |
|
qiuyt
|
d2c006cf43
|
1、阿里单据拉取参数（还差一些对照）
2、产品选入问题
|
7 months ago |
|
yewj
|
38f66bc445
|
产品查询查询全部问题
|
7 months ago |
|
yewj
|
e8d558bbf3
|
产品查询查询全部问题
|
7 months ago |
|
qiuyt
|
42785d87a5
|
1、选入药品调用国家库或者阿里接口进行拉取药品码段数据插入我们的表
2、医保接口也没有的时候也调用接口
3、key使用阿里用户表获取
|
7 months ago |
|
qiuyt
|
a240f24839
|
选入药品逻辑更改
|
7 months ago |
|
yewj
|
f1a16d24b7
|
最小数量修改
|
7 months ago |
|
qiuyt
|
2409d88b58
|
选入药品问题 并且查不到阿里也会新增一条 查不到医保库也同理
|
7 months ago |
|
qiuyt
|
b3b8376d9a
|
选入药品阿里不能抛出异常
|
7 months ago |
|
qiuyt
|
94fff63ebb
|
选入药品阿里字段问题
|
7 months ago |
|
qiuyt
|
9a7f359524
|
选入药品阿里字段问题
|
7 months ago |
|
qiuyt
|
99b53dfa1c
|
1、扫码自动获取关联关系对象属性变化
2、生产企业通过时间段批量查询入出库单信息阿里接口
|
7 months ago |
|
qiuyt
|
85512b32b7
|
1、
|
7 months ago |
|
qiuyt
|
610408ac5c
|
增加调用阿里查询药品码段信息
选入药品之后判断国家库有没有有就获取 没有就去调用阿里接口(厂家ID获取有问题先写死)
|
7 months ago |
|
qiuyt
|
864ec46a6e
|
增加调用阿里查询药品码段信息
选入药品之后判断国家库有没有有就获取 没有就去调用阿里接口
|
7 months ago |
|
wangwei
|
9d0c16cb86
|
11/28 优化
|
8 months ago |
|
chenhc
|
559d6e5197
|
fix: 增加药品单据的一个判断是否全部维护关联关系
|
8 months ago |
|
chenhc
|
9dd6b11940
|
fix: 增加药品单据的一个判断是否全部维护关联关系
|
8 months ago |
|
yewj
|
2057364f55
|
Merge remote-tracking branch 'origin/dev_drug' into dev_drug
|
8 months ago |
|
yewj
|
9a715c85b8
|
bug修改
|
8 months ago |
|
chenhc
|
cdd570723c
|
fix: 修复
|
8 months ago |
|
chenhc
|
7c3e12ab04
|
fix: 修复
|
8 months ago |
|
wangwei
|
ecd6316359
|
11/27 新增第三方产品
|
8 months ago |
|
wangwei
|
47c22da4ac
|
11/22 单据扫码详情表设置药品包装规格
|
8 months ago |
|
wangwei
|
db8e7651c0
|
11/22 查询字段优化1.0
|
8 months ago |
|
qiuyt
|
5be468c250
|
增加关联关系获取接口用于关联系统用
阿里调用接口逻辑变更
|
8 months ago |
|
wangwei
|
b3c8dfecf8
|
11/20 库存查询优化
|
8 months ago |
|
yewj
|
135981aca1
|
耗材字典审核
|
8 months ago |
|
wangwei
|
4e1353f1c0
|
11/19 查询优化
|
8 months ago |
|
yewj
|
c396226dd4
|
Merge remote-tracking branch 'origin/dev_drug' into dev_drug
|
8 months ago |
|
yewj
|
cabf9eeb5f
|
关联关系同步问题
|
8 months ago |
|
wangwei
|
16342e510d
|
11/19 药品基础数据明细分类同步
|
8 months ago |
|
wangwei
|
8a674aca2e
|
11/19 供应商耗材选入优化
|
8 months ago |
|
yewj
|
da5b51268c
|
关联关系修改，扫码补齐修改，bug修改
|
8 months ago |
|
qiuyt
|
ebecb976e1
|
Merge branch 'dev_drug' of http://116.204.71.86:3000/UDI/udi-spms-java into dev_drug
|
8 months ago |
|
qiuyt
|
b1b91af660
|
扫码的时候如果没查到码关联关系数据去调用阿里接口进行插入
|
8 months ago |
|
wangwei
|
9ac558a038
|
Merge remote-tracking branch 'origin/dev_drug' into dev_drug
|
8 months ago |
|
wangwei
|
78034bb355
|
供应商选入 耗材 修改
|
8 months ago |
|
qiuyt
|
a970e840be
|
扫码的时候如果没查到码关联关系数据去调用阿里接口进行插入
|
8 months ago |
|
yewj
|
efce84554c
|
代码备份
|
8 months ago |
|
wangwei
|
8af8506be2
|
11/18 界面查询优化1.0
|
8 months ago |
|
wangwei
|
03782d19f3
|
11/18 关联关系查询字段
|
8 months ago |
|
chenhc
|
1200db9be9
|
fix: 修复
|
8 months ago |
|
wangwei
|
14af1e3b8e
|
Merge remote-tracking branch 'origin/dev_drug' into dev_drug
|
8 months ago |
|
wangwei
|
15b676dbef
|
10/15 界面优化1.0
|
8 months ago |
|
qiuyt
|
20cb246f4d
|
提供一个方法新增这个供应商的code阿里健康关联的所有关联关系存储(三级码的关系不知道阿里返回的什么结构的无法测试 可能要改代码)
|
8 months ago |
|
qiuyt
|
5cc35709ed
|
提供一个方法新增这个供应商的code阿里健康关联的所有关联关系存储(三级码的关系不知道阿里返回的什么结构的无法测试 可能要改代码)
|
8 months ago |
|
qiuyt
|
634775a6c8
|
1、封装阿里健康入参和返回 设计成通用方式后面再加个新接口比较方便
2、供应商增加码上放心企业信息增加阿里健康需要的信息
3、提供一个方法新增这个供应商的code阿里健康关联的所有关联关系存储
|
8 months ago |
|
wangwei
|
6188451289
|
11/15 供应商新增入院药品优化1.0
|
8 months ago |
|
wangwei
|
a5504c85de
|
11/15 供应商选入药品优化1.0
|
8 months ago |
|
wangwei
|
32570637c9
|
11/15 供应商药品库存查询
|
8 months ago |
|
wangwei
|
87140090dc
|
11/14 供应商药品维护高级查询
|
8 months ago |
|
wangwei
|
5d1b1f894e
|
11/14 增加是否查用字段 供应商选入药品增加模糊搜索 测试高级搜索
|
8 months ago |
|
chenhc
|
ce6d2d2b58
|
fix: 修复
|
8 months ago |
|
yewj
|
90e09f8bff
|
代码备份
|
8 months ago |
|
yewj
|
4db47217c4
|
关联关系问题
|
8 months ago |
|
chenhc
|
3a4d5fffc0
|
fix: 修复药品关联关系失败不再次上传
|
8 months ago |
|
chenhc
|
14baf9e1d5
|
fix: 修复
|
8 months ago |
|
yewj
|
7204aac90e
|
产品信息维护问题
|
8 months ago |
|
qiuyt
|
07d2029e96
|
Merge remote-tracking branch 'origin/dev_drug' into dev_drug
# Conflicts:
# src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
|
8 months ago |
|
chenhc
|
3f1deed064
|
fix: 修复
|
8 months ago |
|
yewj
|
5f11772edb
|
选入产品带入层级
|
8 months ago |
|
yewj
|
37f7a7ea76
|
bug修改，层级，阿里产品等
|
8 months ago |
|
qiuyt
|
d7c499a342
|
供应商和基础管理的药品字典维护 增加明细分类逻辑 增加药品层级逻辑更改 选入增加明细分类 增加耗材字典表字段
|
8 months ago |
|
chenhc
|
389679926d
|
fix: 修复
|
8 months ago |
|
wangwei
|
2a735e688c
|
11/12 选入药品层级带入批准文号
|
8 months ago |
|
yewj
|
33147dbece
|
Merge remote-tracking branch 'origin/dev_drug' into dev_drug
# Conflicts:
# src/main/resources/mybatis/mapper/thrsys/ThirdAliDrugMapper.xml
|
8 months ago |
|
yewj
|
404f436e7f
|
药品字典修改
|
8 months ago |
|
chenhc
|
4400eabe35
|
fix: 修复
|
8 months ago |
|
chenhc
|
4f2bcd3095
|
fix: 修复
|
8 months ago |
|
chenhc
|
3eee851ec1
|
fix: 修复
|
8 months ago |
|
chenhc
|
011d559cfa
|
fix: 修复
|
8 months ago |
|
chenhc
|
9206192dd8
|
fix: 修复
|
8 months ago |
|
chenhc
|
6632322541
|
feat: 阿里药品加批准文号
|
8 months ago |
|
chenhc
|
47efbae8e6
|
feat: 药品关联关系查重功能
|
8 months ago |
|
wangwei
|
f1862398e4
|
11/12 供应商选入药品增加查询条件 包装规格 制剂规格
|
8 months ago |
|
chenhc
|
4977273cd0
|
Merge remote-tracking branch 'origin/dev_drug' into dev_drug
|
8 months ago |
|
chenhc
|
66ffa6bf98
|
fix:阿里药品关系维护
|
8 months ago |
|
yewj
|
95c6d9ef47
|
Merge remote-tracking branch 'origin/dev_drug' into dev_drug
|
8 months ago |
|
yewj
|
f7843f2739
|
关联关系校验
|
8 months ago |
|
wangwei
|
142929f131
|
11/11 药品送货发票登记
|
8 months ago |
