yewj
|
b27b4df7fa
|
代码备份
|
1 year ago |
chenhc
|
02b06f6dbd
|
fix: 自动分配库存预警修改
|
1 year ago |
|
chenhc
|
c9df2458cc
|
fix: 单据库存预警字段
|
1 year ago |
|
chenhc
|
5bccbd41cc
|
fix: 自动分配工位存量到单据明细
|
1 year ago |
|
yewj
|
ccf16c7128
|
追溯码查询
|
1 year ago |
wangwei
|
4a79d728e2
|
8/26 耗材加入工位预警数量 是否拆零
|
1 year ago |
|
yewj
|
5e215abf0a
|
库存详情
|
1 year ago |
zane
|
1aaa9bd2bf
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
1 year ago |
|
zane
|
6a37fede1f
|
置顶 排序时间
|
1 year ago |
|
yewj
|
f77bd91177
|
插入到码表
|
1 year ago |
|
yewj
|
fa9a264df8
|
代码备份
|
1 year ago |
|
yewj
|
5db5a8b63d
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
1 year ago |
|
wangwei
|
47ea535377
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
1 year ago |
|
wangwei
|
6415acad80
|
8/25 业务类型关联第三方单据
|
1 year ago |
|
chenhc
|
d83ab87193
|
fix: 修复
|
1 year ago |
|
chenhc
|
445514e2cc
|
fix: 修复
|
1 year ago |
|
chenhc
|
1738822d07
|
feat: 自动过滤用户工位列表
|
1 year ago |
|
yewj
|
201d03bf4e
|
扫码作业问题
|
1 year ago |
|
chenhc
|
52b08c7afc
|
feat: 工位分页排序修改
|
1 year ago |
|
yewj
|
67123a1011
|
扫码作业问题
|
1 year ago |
|
yewj
|
b1eca2aab3
|
代码备份
|
1 year ago |
|
yewj
|
4dac4209af
|
后端相关修改
|
1 year ago |
|
yewj
|
43ecb66850
|
单据流程修改
|
1 year ago |
|
chenhc
|
840f411779
|
feat: 单据备注字段响应出去
|
1 year ago |
|
chenhc
|
1360a8463c
|
feat: 单据备注字段
|
1 year ago |
|
yewj
|
d71bb120f8
|
单据流程修改
|
1 year ago |
|
wangwei
|
a0d22dbc6c
|
8/23 采集工位根据用户搜索
|
1 year ago |
|
wangwei
|
00bde6626c
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
1 year ago |
|
yewj
|
b424a12df9
|
扫码问题修改
|
1 year ago |
|
chenhc
|
8d06717f05
|
feat: 扫码单减一删除biz
|
1 year ago |
|
yewj
|
34a75705fe
|
代码备份
|
1 year ago |
|
wangwei
|
e597b19779
|
8/22 工位优化
|
1 year ago |
|
yewj
|
5c8f6a7d00
|
正在处理单据
|
1 year ago |
|
yewj
|
e7fbdab3c0
|
拆零整取数量重新计算
|
1 year ago |
|
yewj
|
9609d4a343
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
1 year ago |
|
wangwei
|
6ae6c1c329
|
8/22 现场管理工位调整，单据
|
1 year ago |
|
chenhc
|
062919ccfa
|
feat: 处理单据选择单据类型
|
1 year ago |
|
yewj
|
ad9ee6fd7a
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
1 year ago |
|
yewj
|
f79c6de737
|
数据初始化计算计量单元数量
|
1 year ago |
|
chenhc
|
082f302507
|
feat: 器械参数设置
|
1 year ago |
|
yewj
|
4f5b4282e1
|
代码备份
|
1 year ago |
|
chenhc
|
88513a51f4
|
feat: 修改
|
1 year ago |
|
chenhc
|
350703e9f5
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
1 year ago |
|
wangwei
|
cdd330787d
|
,,
|
1 year ago |
|
chenhc
|
1150a2bec9
|
feat: 修改
|
1 year ago |
|
wangwei
|
f8cabf42ec
|
8/21 工查询优化
|
1 year ago |
|
wangwei
|
64489e8740
|
单据类型，工位删除判断
|
1 year ago |
|
chenhc
|
1e2282ab49
|
feat: 修改
|
1 year ago |
|
wangwei
|
1bb1291753
|
8/20 工位绑定单据类型
|
1 year ago |
anthonywj
|
5e1d1e51e2
|
代码备份
|
1 year ago |
|
chenhc
|
91a200d439
|
feat: 修改
|
1 year ago |
|
anthonywj
|
ec0cadbe21
|
代码备份
|
1 year ago |
|
anthonywj
|
e04b28efe1
|
代码备份
|
1 year ago |
|
chenhc
|
2284b641b7
|
feat: 修改
|
1 year ago |
|
wangwei
|
fb4ec1218d
|
8/19 响应工位code
|
1 year ago |
|
anthonywj
|
1a3d5dbc9a
|
代码备份
|
1 year ago |
|
anthonywj
|
44b8a8d04b
|
代码备份
|
1 year ago |
|
anthonywj
|
8f0d0a8aad
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
1 year ago |
|
chenhc
|
5db06d994c
|
feat: 修改
|
1 year ago |
|
anthonywj
|
3fe4496e79
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
1 year ago |
|
chenhc
|
243a6c3be9
|
feat: 修改
|
1 year ago |
|
anthonywj
|
e56d3770b6
|
代码备份
|
1 year ago |
|
anthonywj
|
9ee2f38b05
|
代码备份
|
1 year ago |
|
anthonywj
|
0d2db0eb60
|
单据校验修改
|
1 year ago |
|
anthonywj
|
dce16042f0
|
测试数据
|
1 year ago |
|
anthonywj
|
0e0c19f095
|
bug修改
|
1 year ago |
|
wangwei
|
8abe46cd10
|
优化 绑定工位
|
1 year ago |
|
anthonywj
|
5fae2eb944
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
1 year ago |
|
anthonywj
|
f32ac0d5a7
|
单据生成问题
|
1 year ago |
|
chenhc
|
317cc8e65c
|
feat: 修改现场作业分页接口key增加模糊字段
|
1 year ago |
|
wangwei
|
fed1c4174d
|
调整工位单据类型维护 1.0 8/17
|
1 year ago |
|
anthonywj
|
b545ccd651
|
手动扫码
|
1 year ago |
|
anthonywj
|
5e7af56b93
|
自动拆零查询详情
|
1 year ago |
|
anthonywj
|
e9b939e99d
|
单据拆零赋码优化修改
|
1 year ago |
|
wangwei
|
7a219014e1
|
7/11 优化工位
|
1 year ago |
|
anthonywj
|
ed03b900fd
|
拆零上货入库数量计算问题，获取下一单据
|
1 year ago |
|
wangwei
|
fccf06cb0e
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
1 year ago |
|
wangwei
|
25111c05cc
|
修改药品第一次选入流通失效
|
1 year ago |
|
anthonywj
|
21e3e4e4d7
|
自动拆零问题
|
1 year ago |
|
chenhc
|
ab91277787
|
feat: 页面修改-业务类型、来源系统
|
1 year ago |
|
wangwei
|
595651c193
|
1.2 增加往来单位类型
|
1 year ago |
|
wangwei
|
c80ba75d39
|
小优化
|
1 year ago |
|
wangwei
|
0ede93fd8d
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
1 year ago |
|
wangwei
|
e16769409f
|
8/16 code
|
1 year ago |
|
anthonywj
|
70c109e0ee
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
1 year ago |
|
anthonywj
|
d79001655c
|
代码备份
|
1 year ago |
|
wangwei
|
67726020ec
|
8/15 搜索用户加入仓库字段
|
1 year ago |
|
anthonywj
|
dcd227d367
|
校验方式修改，1.三期，无三期，扫码单生成业务单，等一些功能修改
|
1 year ago |
|
chenhc
|
08b714b43b
|
feat: 单据in查询
|
1 year ago |
|
chenhc
|
76c9764465
|
feat: 单据in查询
|
1 year ago |
|
anthonywj
|
4cbd788597
|
备份
|
1 year ago |
|
wangwei
|
c6859d461f
|
8-15 工位管理 1.0
|
1 year ago |
|
anthonywj
|
3ee4e9caf9
|
单据详情接口修改
|
1 year ago |
|
anthonywj
|
6b60cc0244
|
代码备份
|
1 year ago |
|
wangwei
|
b2983b6c77
|
工位搜索
|
1 year ago |
|
wangwei
|
0a28aa21f6
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
1 year ago |
|
wangwei
|
4db6d15acf
|
工位管理
|
1 year ago |
|
chenhc
|
2ff822c07a
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
1 year ago |
|
wangwei
|
904e8a9950
|
8/14 工位单据管理
|
1 year ago |
|
chenhc
|
b697699668
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo_z
# Conflicts:
# src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
# src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java
# src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java
# src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java
# src/main/java/com/glxp/api/res/inv/InvProductResponse.java
# src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java
# src/main/resources/application-dev.yml
# src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
# src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
# src/main/resources/mybatis/mapper/inv/invProductDao.xml
# src/main/resources/schemas/schema_v2.4.sql
|
1 year ago |
|
chenhc
|
a5c6d5b44e
|
feat: 首页复制
|
1 year ago |
|
chenhc
|
4cfe42b996
|
feat: 首页复制
|
1 year ago |
|
anthonywj
|
fda2478831
|
切换分支备份
|
1 year ago |
|
chenhc
|
c268e0d067
|
feat: 库存预警
|
1 year ago |
|
anthonywj
|
b481843d24
|
切换分支备份
|
1 year ago |
|
anthonywj
|
5af357d158
|
专为平潭写的删除所有科室出库单据的接口
|
1 year ago |
|
anthonywj
|
b30a908894
|
重写采集点代码
|
1 year ago |
|
anthonywj
|
9278b88162
|
采集点代码生成
|
1 year ago |
|
anthonywj
|
8f67e20d19
|
缺了个预出库队列校验
|
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
|
c8c57e2f86
|
新增产品上传
|
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
|
aeffbc51ab
|
切换分支备份
|
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
|
c2b8f4bf2e
|
处方分配工位修改
|
1 year ago |
|
anthonywj
|
0f1ee49172
|
预出库扫码修改，处方赋码修改
|
1 year ago |
|
wangwei
|
26d23af14a
|
8/02 选入收费项目
|
1 year ago |
|
chenhc
|
2860529256
|
feat: 处方下载
|
1 year ago |
|
anthonywj
|
01d873f317
|
基础数据修改
|
1 year ago |
|
anthonywj
|
3bf34db4f8
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
1 year ago |
|
anthonywj
|
a6e0e99ec5
|
切换分支备份
|
1 year ago |
|
anthonywj
|
cf6978979b
|
切换分支备份
|
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
|
4e21a083b2
|
新增拆零队列
|
1 year ago |
|
anthonywj
|
0cc61f9f59
|
新增拆零队列
|
1 year ago |
|
anthonywj
|
17b98d8ab0
|
药品信息编辑以及层级包装数量换算
|
1 year ago |
|
anthonywj
|
0ec915d253
|
平潭收费出库明细
|
1 year ago |
|
anthonywj
|
4409ea42e3
|
药品字典修改
|
1 year ago |
|
anthonywj
|
791f8c09fd
|
切换分支备份,选择库存自定义界面
|
1 year ago |
|
anthonywj
|
521310d144
|
切换分支备份,选择库存自定义界面
|
1 year ago |
|
anthonywj
|
de18e59417
|
切换分支备份,选择库存自定义界面
|
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 |
|
anthonywj
|
cb12947cf6
|
切换分支备份
|
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
|
3f0bffd21a
|
收费明细多个供应商问题
|
1 year ago |
|
anthonywj
|
08182d3d68
|
新增是否组套，单据出入库明细查询
|
1 year ago |
|
anthonywj
|
eaa0c50011
|
无批次号出库默认赋予批次号
|
1 year ago |
|
wangwei
|
4d6291d1f3
|
Merge branch 'dev_fifo_z1' into dev_fifo_z
|
1 year ago |
|
wangwei
|
6ab09e803f
|
7/29
|
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
|
7fd4b216aa
|
第三方收费明细修改
|
1 year ago |
|
anthonywj
|
4ad90672fa
|
平潭收费相关修改
|
1 year ago |
|
anthonywj
|
c0bcbe75fc
|
PDA登录修改
|
1 year ago |
|
anthonywj
|
1211a2d256
|
发票登记过滤
|
1 year ago |
|
anthonywj
|
28b2a5d7ee
|
调拨出库往来部门问题
|
1 year ago |
|
anthonywj
|
9f4c6fa539
|
平台收费出入库明细修改
|
1 year ago |
|
anthonywj
|
6b099bff4c
|
南靖高值扫码查库存
|
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
|
92592beb48
|
南靖收费退费修改
|
1 year ago |
|
anthonywj
|
a508f850a2
|
南靖新增第三方产品编码返回
|
1 year ago |
|
anthonywj
|
184b3c8139
|
南靖接口调用查库存修改
|
1 year ago |
|
anthonywj
|
3a879c604e
|
单据校验耗材问题
|
1 year ago |
|
anthonywj
|
027c1cf7e5
|
耗材字典查询
|
1 year ago |
|
chenhc
|
8f13173a7c
|
feat: 扫码校验功能
|
1 year ago |
|
chenhc
|
b96ddd10f6
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
|
1 year ago |
|
chenhc
|
8f054d1410
|
feat: 0702-扫码校验功能
|
1 year ago |
|
anthonywj
|
024f027f6b
|
高值耗材扫码实时出库
|
1 year ago |
|
anthonywj
|
993f541fd4
|
高值，普耗库存查询
|
1 year ago |
|
chenhc
|
6ce53c5bea
|
feat: 0702-扫码校验功能
|
1 year ago |
|
anthonywj
|
160d36b0a0
|
收费项目，单据类型修改
|
1 year ago |
|
anthonywj
|
0887580f38
|
bzgg
|
1 year ago |
|
chenhc
|
fc1dbe0c6e
|
feat: 0701-是否需要扫码前判断单据是否为空
|
1 year ago |
|
chenhc
|
e33e19ec99
|
feat: 0701-是否需要扫码前判断单据是否为空
|
1 year ago |
|
wangwei
|
a4aad12e71
|
6/21 sql
|
1 year ago |
|
wangwei
|
bcbe3745b5
|
6/21 同步优化
|
1 year ago |
|
wangwei
|
8eb4db5673
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
|
1 year ago |
|
anthonywj
|
268a12c950
|
打印
|
1 year ago |
|
anthonywj
|
90153fcfe6
|
登录密码校验修改
|
1 year ago |
|
anthonywj
|
ec843e3b00
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
|
1 year ago |
|
anthonywj
|
0c7e170101
|
登录密码校验修改
|
1 year ago |
|
wangwei
|
7cc185f22d
|
6/12 pdf优化加入备注
|
1 year ago |
|
wangwei
|
b630f392f5
|
6/11 单据查询页面
|
1 year ago |
|
wangwei
|
d2a7f661a0
|
6/7 单据搜索
|
1 year ago |
|
chenhc
|
52ff3ecd4a
|
feat: 0606注释掉是否需要扫码
|
1 year ago |
|
chenhc
|
96aec50efe
|
feat: 0606修复
|
1 year ago |
|
wangwei
|
5d6084864c
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
|
1 year ago |
|
wangwei
|
e5968ba6c8
|
6/5 pdf单据打印修改
|
1 year ago |
|
anthonywj
|
c3d9e8d717
|
发票打印
|
1 year ago |
|
wangwei
|
caee0a5991
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
|
1 year ago |
|
wangwei
|
2572ca2b7e
|
6/4 优化发票确认时间以及相关带票查询
|
1 year ago |
|
chenhc
|
bb7cdfa80b
|
feat: 0604增加是否需要扫码字段
|
1 year ago |
|
chenhc
|
8bf33df981
|
feat: 0531增加是否需要扫码字段
|
1 year ago |
|
chenhc
|
ddb0a24f8d
|
feat: 0531科室出库
|
1 year ago |
|
anthonywj
|
a6c355c091
|
单据同步删除
|
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 |
|
chenhc
|
b32cb77089
|
feat: 设备管理优化-0515-设备卡片-采购订单
|
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 |
|
anthonywj
|
163e8c8b4d
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
|
1 year ago |
|
anthonywj
|
2a5c095915
|
设备巡检任务处理
|
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-合同管理复制
|
2 years ago |
|
chenhc
|
770caa552c
|
feat: 设备管理优化-0512-增加移除设备的审批流程
|
2 years ago |
|
wangwei
|
c584701c32
|
5-10 数据同步返回设置
|
2 years ago |
|
chenhc
|
11754a27bb
|
feat: 设备管理优化-0512-增加移除类型
|
2 years ago |
|
chenhc
|
44bc4aa00a
|
feat: 设备管理优化-0512-修改提示语
|
2 years ago |
|
wangwei
|
f9b273fcb6
|
5-10 数据同步
|
2 years ago |
|
chenhc
|
958aa625ad
|
feat: 设备管理优化-0510
|
2 years ago |
|
chenhc
|
58ace1f05d
|
feat: 设备管理优化
|
2 years ago |
|
chenhc
|
5f9b6437da
|
feat: 设备管理优化
|
2 years ago |
|
chenhc
|
b6ac849ce5
|
feat: 优化
|
2 years ago |
|
chenhc
|
46ae4e7141
|
feat: 本部门保修单、报修单大厅、我的报修单、我的维修单
|
2 years ago |
|
anthonywj
|
308f817e82
|
设备巡检任务处理
|
2 years ago |
|
anthonywj
|
9815904b31
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
|
2 years ago |
|
anthonywj
|
3cb3fcfdec
|
设备巡检管理
|
2 years ago |
|
chenhc
|
ec00d0d605
|
feat: 设备入库-信息保存-医保编码
|
2 years ago |
|
chenhc
|
f81d29c601
|
feat: 设备入库、变更、报废
|
2 years ago |
|
chenhc
|
1731ad25ec
|
feat: 设备信息增加字段
|
2 years ago |
|
chenhc
|
c6bdd36a42
|
feat: 设备登记、设备入库
|
2 years ago |
|
chenhc
|
944eb77b92
|
feat: 提交
|
2 years ago |
|
anthonywj
|
139d85a9b1
|
新增下载收费项目字典
|
2 years ago |
|
anthonywj
|
8fa91cee91
|
新增下载收费项目字典
|
2 years ago |
|
anthonywj
|
40d97991e8
|
高耗出库明细校验采购类型，高耗自动生成校验单据是否异常
|
2 years ago |
|
anthonywj
|
36a026f075
|
申购仓库修改
|
2 years ago |
|
anthonywj
|
8850df37f8
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
|
2 years ago |
|
anthonywj
|
ee737966d2
|
登录密码验证
|
2 years ago |
|
chenhc
|
20699097fe
|
feat: 明细列表增加术式模板id
|
2 years ago |
|
chenhc
|
baff72c8ef
|
feat: 术式名称修改
|
2 years ago |
|
chenhc
|
449de7adb4
|
feat: 术士套包、定数包功能开发优化
|
2 years ago |
|
chenhc
|
9c6b03fb1b
|
feat: 术士套包、定数包功能开发
|
2 years ago |
|
chenhc
|
50490a88dc
|
feat: 术士套包、定数包功能开发
|
2 years ago |
|
anthonywj
|
bfca9fa283
|
科室出库修改
|
2 years ago |
|
anthonywj
|
5cc8365472
|
科室出库修改
|
2 years ago |
|
chenhc
|
85d9561d65
|
feat: 新增业务单据加上单据类型过滤物资录入
|
2 years ago |
|
chenhc
|
ad57946821
|
feat: 产品增加采购类型校验
|
2 years ago |
|
chenhc
|
d4a5f6d67f
|
feat: 定数包项目
|
2 years ago |
|
anthonywj
|
56ee67d92e
|
业务单生成扫码单数量不匹配问题
|
2 years ago |
|
anthonywj
|
e795be4b02
|
业务单生成扫码单数量不匹配问题
|
2 years ago |
|
chenhc
|
8b740b8d33
|
feat: 打印功能增加字段
|
2 years ago |
|
chenhc
|
11270c57dc
|
feat: 第三方明细下载增加字段
|
2 years ago |
|
chenhc
|
fda7209233
|
feat: 科室医保分类功能
|
2 years ago |
|
chenhc
|
26ae4069bc
|
feat: 科室医保分类功能
|
2 years ago |
|
anthonywj
|
543c7c0f6d
|
收费出库问题
|
2 years ago |
|
chenhc
|
879b532494
|
dev_ksck → origin/dev_ksck
|
2 years ago |
|
anthonywj
|
f4bcdbb267
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
|
2 years ago |
|
anthonywj
|
a58e9e6229
|
盘点修改，审核重复提交问题
|
2 years ago |
|
chenhc
|
a273cbce06
|
feat: 部门与医保耗材信息分类接口开发
|
2 years ago |
|
chenhc
|
961bd20bbc
|
feat: 部门与医保耗材信息分类关联关系初始化
|
2 years ago |
|
anthonywj
|
ae36a483fe
|
盘点修改
|
2 years ago |
|
anthonywj
|
600dc8edf8
|
盘点问题，service类生成
|
2 years ago |
|
chenhc
|
e53afb5e33
|
feat: 医保耗材信息分类sql脚本
|
2 years ago |
|
anthonywj
|
44ba28c823
|
权限问题。耗材字典下载问题
|
2 years ago |
|
anthonywj
|
e7ae556f8d
|
新增配送产品，申请与审核，创建后回填
|
2 years ago |
|
anthonywj
|
5e62af17e7
|
平潭收费生成单据问题
|
2 years ago |
|
chenhc
|
2983a32c3e
|
feat: 医保耗材信息增加字段
|
2 years ago |
|
chenhc
|
fc91a02cf4
|
feat: 医保耗材信息增加字段
|
2 years ago |
|
chenhc
|
4b5be8fb3b
|
feat: 增加定时扫描三方的明细表-生成单据
|
2 years ago |
|
chenhc
|
d1743d12b4
|
feat: 增加定时扫描三方的明细表-生成单据
|
2 years ago |
|
chenhc
|
b50b981c65
|
feat: 增加页面的医保耗材信息调用功能
|
2 years ago |
|
chenhc
|
df9f529ed0
|
feat: 增加界面配置sql
|
2 years ago |
|
chenhc
|
493b1b6ca6
|
feat: 设备管理-设备登记-动态加载子组件
|
2 years ago |
|
chenhc
|
371c37c35f
|
feat: 设备管理-卡片开发
|
2 years ago |
|
anthonywj
|
8fa0556e89
|
长泰高值耗材下载后自动生成出入库单据
|
2 years ago |
|
anthonywj
|
a60ac30187
|
科室出库补单问题
|
2 years ago |
|
anthonywj
|
9cd21f4c54
|
科室出库补单问题
|
2 years ago |
|
anthonywj
|
6c640a2072
|
新增设备管理初始化sql语句
|
2 years ago |
|
chenhc
|
255b6f1826
|
feat: 设备管理开发
|
2 years ago |
|
chenhc
|
07be51ee6f
|
feat: 审核开关-业务页面修改
|
2 years ago |
|
chenhc
|
9acdef9af4
|
feat: 审核开关
|
2 years ago |
|
chenhc
|
afd1e7fb7d
|
feat: 供三方调用接口开发
|
2 years ago |
|
chenhc
|
db533938c8
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
# Conflicts:
# src/main/resources/schemas/schema_v2.4.sql
|
2 years ago |
|
chenhc
|
1cde4618ad
|
feat: 供三方调用接口开发
|
2 years ago |
|
anthonywj
|
e6b51b0637
|
收费项目添加价格与计量单位
|
2 years ago |
|
anthonywj
|
9c6f7e9e4d
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
|
2 years ago |
|
anthonywj
|
34a728e6cb
|
平潭出库明细调整
|
2 years ago |
|
chenhc
|
6dc6e5ab3b
|
feat: 审核流程配置功能
|
2 years ago |
|
chenhc
|
45b7fad953
|
feat: 审核流程配置功能-sql删除
|
2 years ago |
|
anthonywj
|
778f4424ac
|
xm包名问题
|
2 years ago |
|
anthonywj
|
57c1d8b144
|
新增下载单据后自动生成出入库单据
|
2 years ago |
|
anthonywj
|
1a50e8a480
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
|
2 years ago |
|
anthonywj
|
c9d87c8070
|
收费出库明细生成单据bug修改
|
2 years ago |
|
chenhc
|
54d3d3244a
|
feat: 审核流程配置功能
|
2 years ago |
|
chenhc
|
79314bbe8c
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
|
2 years ago |
|
chenhc
|
79496895ad
|
Merge remote-tracking branch 'origin/dev_20240306' into dev_fifo
# Conflicts:
# src/main/resources/schemas/schema_v2.4.sql
|
2 years ago |
|
anthonywj
|
ef16874927
|
平潭出入库明细更新
|
2 years ago |
|
anthonywj
|
70caeaf21f
|
普耗收费出入库明细单据生成后自动流转
|
2 years ago |
|
anthonywj
|
75b29b956e
|
业务单生成扫码单双重校验
|
2 years ago |
|
anthonywj
|
bc4c32eb51
|
平潭科室收费出库为往来单位时问题
|
2 years ago |
|
anthonywj
|
fba3db5d38
|
新增收费出库是否过滤高值耗材
|
2 years ago |
|
anthonywj
|
778258acec
|
第三方出库明细
|
2 years ago |
|
anthonywj
|
1551cd46e2
|
长泰添加异常UDI码
|
2 years ago |
|
anthonywj
|
506c61bf64
|
库存检验问题
|
2 years ago |
|
anthonywj
|
53585f97a6
|
新增耗材分类
|
2 years ago |
|
anthonywj
|
d812b5c41f
|
业务单生成扫码单执行先进先出原则
|
2 years ago |
|
anthonywj
|
04cbe6afc8
|
业务单生成扫码单执行先进先出原则
|
2 years ago |
|
anthonywj
|
692c07d961
|
出入库明细下载
|
2 years ago |
|
anthonywj
|
8c150bdd3b
|
出入库明细下载问题
|
2 years ago |
|
chenhc
|
c347996bf2
|
feat: 提交
|
2 years ago |
|
chenhc
|
dd6e057554
|
feat: 提交
|
2 years ago |
|
chenhc
|
fa55bd5ab8
|
feat: 提交
|
2 years ago |
|
chenhc
|
79c5ac8ef4
|
feat: 代码保存
|
2 years ago |
|
anthonywj
|
17c2f222e5
|
高值出库明细生成库存校验等
|
2 years ago |
|
anthonywj
|
38257800c0
|
高值出库明细生成单据优化
|
2 years ago |
|
anthonywj
|
13ac0d742f
|
普耗，收费出库生成单据优化
|
2 years ago |
|
anthonywj
|
e685fb17dc
|
往来类型为患者，根据患者进行拆单
|
2 years ago |
|
anthonywj
|
ddb5a981a4
|
收费明细添加供应商ID
|
2 years ago |
|
anthonywj
|
207f3324d4
|
项目组套新增供应商ID
|
2 years ago |
|
anthonywj
|
a706fd8952
|
添加供应商是否关联校验
|
2 years ago |
|
anthonywj
|
2053441176
|
登录界面标题配置
|
2 years ago |
|
chenhc
|
394ee7e585
|
feat: 高耗码校验 代码todo
|
2 years ago |
|
chenhc
|
ab3f8f57c6
|
feat: 高耗生成码校验 代码todo
|
2 years ago |
|
chenhc
|
fe1aa8230a
|
feat: 三方出入库明细功能优化url获取
|
2 years ago |
|
chenhc
|
8e68e2d8d2
|
feat: 三方出入库明细功能
|
2 years ago |
|
chenhc
|
9e75867541
|
feat: 三方出入库明细功能
|
2 years ago |
|
anthonywj
|
eea1eab737
|
ThrInvResultResponse 字段修改
|
2 years ago |
|
chenhc
|
1f116efd92
|
feat: 三方出入库明细功能
|
2 years ago |
|
chenhc
|
8c0e5a73ba
|
feat: 三方出入库明细功能
|
2 years ago |
|
chenhc
|
96dba85918
|
feat: 三方出入库明细功能
|
2 years ago |
|
chenhc
|
d4ac5e9fcf
|
feat: 增加产品-产品属性字段
|
2 years ago |
|
chenhc
|
9b652cd815
|
feat: 保存代码
|
2 years ago |
|
anthonywj
|
c3c232ccf8
|
ThrInvResultResponse 字段修改
|
2 years ago |
|
chenhc
|
f9dc77b126
|
feat: 删除测试代码
|
2 years ago |
|
chenhc
|
63958a1963
|
feat: 删除测试代码
|
2 years ago |
|
chenhc
|
4db974d0df
|
feat: 代码提交
|
2 years ago |
|
chenhc
|
eb02f7b4cc
|
Merge branch '20231126-yw' into dev_ksck
# Conflicts:
# src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java
# src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java
# src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java
|
2 years ago |
|
chenhc
|
8a1f122230
|
feat: 代码提交
|
2 years ago |
|
anthonywj
|
c30ba149f9
|
切换分支备份
|
2 years ago |
|
chenhc
|
da429ea7dc
|
feat: 产品新增
|
2 years ago |
|
anthonywj
|
a0b6eb4b27
|
新增产品字典字段补齐
|
2 years ago |
|
anthonywj
|
9e79e7cda9
|
Merge branch '20231126-yw' into dev_ksck
# Conflicts:
# src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderDetailMapper.java
# src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderMapper.java
# src/main/java/com/glxp/api/service/thrsys/ThrInvOrderDetailService.java
# src/main/java/com/glxp/api/service/thrsys/ThrInvOrderService.java
# src/main/resources/mybatis/mapper/thrsys/ThrInvOrderDetailMapper.xml
# src/main/resources/mybatis/mapper/thrsys/ThrInvOrderMapper.xml
|
2 years ago |
|
anthonywj
|
1aa81fe5de
|
科室出库，集采拆单
|
2 years ago |
|
chenhc
|
85c9db2ae5
|
feat: 项目组套和三方出入库明细
|
2 years ago |
|
chenhc
|
2de35f3091
|
feat: 项目组套和三方出入库明细
|
2 years ago |
|
anthonywj
|
34ac7603bd
|
Merge branch '20231126-yw' into dev_ksck
|
2 years ago |
|
anthonywj
|
e3fc4cd3dc
|
第三方出入库明细
|
2 years ago |
|
chenhc
|
a20becfb13
|
feat: 耗材字典新增功能
|
2 years ago |
|
anthonywj
|
be5ce3104b
|
新增产品属性
|
2 years ago |
|
anthonywj
|
584bbcaed6
|
临床使用出库修改，新增采购类型，使用出库拆单补单等
|
2 years ago |
|
chenhc
|
a83523fe58
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
2 years ago |
|
chenhc
|
87600e2b3e
|
Merge remote-tracking branch 'origin/dev_price' into dev_price
|
2 years ago |
|
chenhc
|
6c859a9470
|
fix: 修复临床出库过滤库存数0的供应商
|
2 years ago |
|
anthonywj
|
ea708c5303
|
预验收库存校验问题
|
2 years ago |
yuanwei
|
65cd5b0ec5
|
合并冲突
|
2 years ago |
|
yuanwei
|
7a74235bcd
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
2 years ago |
|
anthonywj
|
04f790caf8
|
单据重复上传问题，东山第三方产品信息新增库房代码
|
2 years ago |
|
anthonywj
|
6b22bfb862
|
第三方产品信息过滤问题
|
2 years ago |
|
yuanwei
|
7ffe727deb
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
# Conflicts:
# src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java
|
2 years ago |
|
anthonywj
|
805c82e972
|
新增生产企业字典维护
|
2 years ago |
|
anthonywj
|
1ed3360997
|
新增第三方生产企业
|
2 years ago |
|
anthonywj
|
3f06c5a1dd
|
审核人问题
|
2 years ago |
|
anthonywj
|
4854df1f7f
|
申购问题
|
2 years ago |
|
anthonywj
|
0a0155a967
|
1：东山nginx转发问题(头部参数修改);
2：再次领用；再次申购问题；
3.生成内部码是否以最小使用单元问题
|
2 years ago |
|
anthonywj
|
c065ed3a6d
|
集采拆单问题
|
2 years ago |
|
anthonywj
|
d970162fca
|
库存对比修改
|
2 years ago |
|
anthonywj
|
640e3ed137
|
校验后处方结果保存
|
2 years ago |
|
anthonywj
|
bc4b627077
|
患者信息远程下载，提供中医院设备查询界面
|
2 years ago |
|
anthonywj
|
b73e4a3826
|
预验收补单多个供应商带入不同产品
|
2 years ago |
|
anthonywj
|
3ff1367628
|
协调平台查询出入库新增序列号查询
|
2 years ago |
|
anthonywj
|
77525665e9
|
设备入库，变更，销毁等修改，自定义汇总统修改
|
2 years ago |
|
anthonywj
|
5fad9e2835
|
新增自定义库存明细汇总
|
2 years ago |
|
anthonywj
|
4508e48438
|
患者往来单位问题
|
2 years ago |
|
anthonywj
|
f6ecc65386
|
患者处方相关修改优化
|
2 years ago |
|
anthonywj
|
d345794cdb
|
患者处方相关修改
|
2 years ago |
|
anthonywj
|
270410daea
|
s设备标签打印问题
|
2 years ago |
|
anthonywj
|
c73e2bf1f2
|
第三方接口修改，第三接口容错处理，患者信息相关修改，单据类型患者相关修改，临床出库患者信息选择，是否对照处方等相关配置
|
2 years ago |
|
anthonywj
|
5f110bea39
|
患者处方相关修改
|
2 years ago |
wj
|
1df50657b0
|
设备相关
|
2 years ago |
|
anthonywj
|
33676f7c2f
|
Merge remote-tracking branch 'origin/dev_price' into dev_price
|
2 years ago |
|
anthonywj
|
27cc68ff98
|
新增库存出库模式，总库库存，上级库存，当前库存
|
2 years ago |
|
wj
|
45bd2c8e1e
|
调整
|
2 years ago |
|
yuanwei
|
b5108288a5
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
2 years ago |
|
yuanwei
|
e8a0c53057
|
集成动态表单
|
2 years ago |
|
anthonywj
|
be1475a5da
|
新增库存出库模式，总库库存，上级库存，当前库存
|
2 years ago |
|
yuanwei
|
ba23b3e90e
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
2 years ago |
yuanwei
|
b382a19fc4
|
出入库单管理配置
|
2 years ago |
|
anthonywj
|
6d0090c058
|
长泰新增配送产品，物资分类问题
|
2 years ago |
|
yuanwei
|
508e93bb91
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
2 years ago |
|
yuanwei
|
9b4ac353f7
|
单据管理
|
2 years ago |
|
anthonywj
|
f79458bb45
|
长泰新增配送产品，物资分类问题
|
2 years ago |
|
anthonywj
|
a0f90b9653
|
库存显示数量
|
2 years ago |
|
anthonywj
|
1372f4d92f
|
第三方产品信息上传
|
2 years ago |
|
anthonywj
|
e7cdbf7140
|
第三方产品信息上传
|
2 years ago |
|
anthonywj
|
81a57129f8
|
价格问题
|
2 years ago |
|
anthonywj
|
7ef66921cf
|
切换分支备份
|
2 years ago |
|
anthonywj
|
d17110bcaf
|
Merge remote-tracking branch 'origin/dev_price' into dev_price
|
2 years ago |
|
anthonywj
|
9dba332648
|
切换分支备份
|
2 years ago |
|
yuanwei
|
498c3be047
|
出入库单管理配置
|
2 years ago |
|
yuanwei
|
6502b3a7a7
|
出入库单管理配置
|
2 years ago |
|
yuanwei
|
91b6e4ff2f
|
采购订单管理配置
|
2 years ago |
|
yuanwei
|
0d2eb0d69c
|
计划管理配置
|
2 years ago |
|
yuanwei
|
a257c8a3a7
|
申购管理配置
|
2 years ago |
|
yuanwei
|
600a688072
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
2 years ago |
|
wj
|
08d4462530
|
调整
|
2 years ago |
|
yuanwei
|
9112dbdf08
|
领用管理提交
|
2 years ago |
|
yuanwei
|
31144b596b
|
字典功能处理
|
2 years ago |
|
anthonywj
|
426b966cb3
|
合并分支备份
|
2 years ago |
|
yuanwei
|
1ad478b286
|
初始化动态配置
|
2 years ago |
|
yuanwei
|
1eab520dfd
|
初始化动态配置
|
2 years ago |
|
anthonywj
|
399d6c3881
|
出入库明细单据类型
|
2 years ago |
|
anthonywj
|
677f368635
|
退货补单，多级仓库补单修改，新增灭菌批号，灭菌日期
|
2 years ago |
