yewj
|
c2a369c1a9
|
bug修改
|
10 months ago |
chenhc
|
b401e60198
|
fix: 修复
|
10 months ago |
|
chenhc
|
483a136e34
|
fix: 修复
|
10 months ago |
wangwei
|
b10849d785
|
9/11 youhua1.0
|
10 months ago |
|
wangwei
|
40913d3813
|
9/11 药品基础数据
|
10 months ago |
|
wangwei
|
4beefa4e05
|
9/11 药品字典优化
|
10 months ago |
|
wangwei
|
5c0fc021ec
|
9/10 优化1.0
|
10 months ago |
|
wangwei
|
9a9ae6dd51
|
9/9 查看常用业务类型和更多业务类型
|
10 months ago |
|
wangwei
|
645f311c70
|
9/9 业务类型增加顺序号
|
10 months ago |
|
wangwei
|
781b8faebb
|
9/9 药品层级 设置
|
10 months ago |
|
wangwei
|
a068acd71a
|
9/4 bug 修改
|
11 months ago |
|
chenhc
|
ace5595719
|
fix: 是否自动赋码
|
11 months ago |
|
yewj
|
3b7b118370
|
1.待处理单据库存锁定修改，2.单据拆零出库锁定修改，3；单据上下货库存修改，4.上货后触发单据锁定
|
11 months ago |
|
wangwei
|
f5932c79e1
|
8/29 损耗日志
|
11 months ago |
|
yewj
|
c14d32bf57
|
耗材字典使用单元，流通单元等配置修改
|
11 months ago |
|
wangwei
|
4a79d728e2
|
8/26 耗材加入工位预警数量 是否拆零
|
11 months ago |
|
wangwei
|
47ea535377
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
11 months ago |
|
wangwei
|
6415acad80
|
8/25 业务类型关联第三方单据
|
11 months ago |
|
chenhc
|
52b08c7afc
|
feat: 工位分页排序修改
|
11 months ago |
|
yewj
|
b1eca2aab3
|
代码备份
|
11 months ago |
|
yewj
|
4dac4209af
|
后端相关修改
|
11 months ago |
|
yewj
|
e7fbdab3c0
|
拆零整取数量重新计算
|
11 months ago |
|
wangwei
|
6ae6c1c329
|
8/22 现场管理工位调整，单据
|
11 months ago |
|
chenhc
|
082f302507
|
feat: 器械参数设置
|
11 months ago |
|
chenhc
|
88513a51f4
|
feat: 修改
|
11 months ago |
|
chenhc
|
1150a2bec9
|
feat: 修改
|
11 months ago |
|
wangwei
|
64489e8740
|
单据类型，工位删除判断
|
11 months ago |
|
wangwei
|
1bb1291753
|
8/20 工位绑定单据类型
|
11 months ago |
|
chenhc
|
243a6c3be9
|
feat: 修改
|
11 months ago |
anthonywj
|
0e0c19f095
|
bug修改
|
11 months ago |
|
wangwei
|
25111c05cc
|
修改药品第一次选入流通失效
|
11 months ago |
|
wangwei
|
595651c193
|
1.2 增加往来单位类型
|
11 months ago |
|
wangwei
|
67726020ec
|
8/15 搜索用户加入仓库字段
|
11 months ago |
|
wangwei
|
c6859d461f
|
8-15 工位管理 1.0
|
11 months ago |
|
wangwei
|
b2983b6c77
|
工位搜索
|
11 months ago |
|
wangwei
|
0a28aa21f6
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
11 months ago |
|
wangwei
|
4db6d15acf
|
工位管理
|
11 months ago |
|
chenhc
|
2ff822c07a
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
11 months ago |
|
wangwei
|
904e8a9950
|
8/14 工位单据管理
|
11 months 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
|
11 months ago |
|
anthonywj
|
9278b88162
|
采集点代码生成
|
11 months ago |
|
anthonywj
|
bae3fb9c30
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
11 months ago |
|
anthonywj
|
d4e2b85982
|
拆零优化
|
11 months ago |
|
wangwei
|
b757ab2ffb
|
8/12 药品字段数据
|
11 months ago |
|
anthonywj
|
e3410ca4c2
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
11 months ago |
|
wangwei
|
95cd6628f5
|
8/9 药品管理字段优化，生成单据的时候设置产品类型,响应字段，带票出入库根据订单号分组过滤
|
11 months ago |
|
anthonywj
|
d96d75634f
|
切换分支备份
|
11 months ago |
|
wangwei
|
dfe7b8769e
|
8/8 药品搜索字段以及插入字段维护
|
12 months ago |
|
anthonywj
|
0f1ee49172
|
预出库扫码修改，处方赋码修改
|
12 months ago |
|
wangwei
|
26d23af14a
|
8/02 选入收费项目
|
12 months ago |
|
wangwei
|
b329488995
|
单据查看药品字典详情
|
12 months ago |
|
anthonywj
|
4409ea42e3
|
药品字典修改
|
12 months ago |
|
wangwei
|
c84ff8236c
|
7/30 药品管理
|
12 months ago |
|
wangwei
|
58a8377531
|
7/29 1.1 更改药品
|
12 months ago |
|
anthonywj
|
08182d3d68
|
新增是否组套，单据出入库明细查询
|
12 months ago |
|
wangwei
|
7b0a9dd058
|
7/27 1.1
|
12 months ago |
|
wangwei
|
8a614fd0bc
|
1.1
|
12 months ago |
|
anthonywj
|
c064fa3629
|
患者信息修改,
|
1 year ago |
|
anthonywj
|
0cee7aee54
|
读患者信息问题
|
1 year ago |
|
chenhc
|
8f054d1410
|
feat: 0702-扫码校验功能
|
1 year ago |
|
wangwei
|
bcbe3745b5
|
6/21 同步优化
|
1 year ago |
|
chenhc
|
8bf33df981
|
feat: 0531增加是否需要扫码字段
|
1 year ago |
|
chenhc
|
ddb0a24f8d
|
feat: 0531科室出库
|
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
|
e4faa404e0
|
feat: 0523开发询价模块
|
1 year ago |
|
chenhc
|
b096280db6
|
feat: 设备管理优化-0513-合同管理复制
|
1 year ago |
|
chenhc
|
770caa552c
|
feat: 设备管理优化-0512-增加移除设备的审批流程
|
1 year ago |
|
anthonywj
|
40d97991e8
|
高耗出库明细校验采购类型，高耗自动生成校验单据是否异常
|
1 year ago |
|
chenhc
|
baff72c8ef
|
feat: 术式名称修改
|
1 year ago |
|
chenhc
|
449de7adb4
|
feat: 术士套包、定数包功能开发优化
|
1 year ago |
|
chenhc
|
50490a88dc
|
feat: 术士套包、定数包功能开发
|
1 year ago |
|
anthonywj
|
5cc8365472
|
科室出库修改
|
1 year ago |
|
chenhc
|
85d9561d65
|
feat: 新增业务单据加上单据类型过滤物资录入
|
1 year ago |
|
chenhc
|
ad57946821
|
feat: 产品增加采购类型校验
|
1 year ago |
|
chenhc
|
d4a5f6d67f
|
feat: 定数包项目
|
1 year ago |
|
chenhc
|
879b532494
|
dev_ksck → origin/dev_ksck
|
1 year ago |
|
anthonywj
|
44ba28c823
|
权限问题。耗材字典下载问题
|
1 year ago |
|
chenhc
|
fc91a02cf4
|
feat: 医保耗材信息增加字段
|
1 year ago |
|
chenhc
|
b50b981c65
|
feat: 增加页面的医保耗材信息调用功能
|
1 year ago |
|
chenhc
|
255b6f1826
|
feat: 设备管理开发
|
1 year ago |
|
anthonywj
|
e6b51b0637
|
收费项目添加价格与计量单位
|
1 year ago |
|
anthonywj
|
778f4424ac
|
xm包名问题
|
1 year ago |
|
chenhc
|
54d3d3244a
|
feat: 审核流程配置功能
|
1 year ago |
|
chenhc
|
79496895ad
|
Merge remote-tracking branch 'origin/dev_20240306' into dev_fifo
# Conflicts:
# src/main/resources/schemas/schema_v2.4.sql
|
1 year ago |
|
anthonywj
|
bc4c32eb51
|
平潭科室收费出库为往来单位时问题
|
1 year ago |
|
anthonywj
|
778258acec
|
第三方出库明细
|
1 year ago |
|
anthonywj
|
53585f97a6
|
新增耗材分类
|
1 year ago |
|
chenhc
|
79c5ac8ef4
|
feat: 代码保存
|
1 year ago |
|
anthonywj
|
13ac0d742f
|
普耗，收费出库生成单据优化
|
1 year ago |
|
anthonywj
|
207f3324d4
|
项目组套新增供应商ID
|
1 year ago |
|
chenhc
|
1f116efd92
|
feat: 三方出入库明细功能
|
1 year ago |
|
chenhc
|
96dba85918
|
feat: 三方出入库明细功能
|
1 year 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
|
1 year ago |
|
chenhc
|
8a1f122230
|
feat: 代码提交
|
1 year 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
|
1 year ago |
|
chenhc
|
2de35f3091
|
feat: 项目组套和三方出入库明细
|
1 year ago |
