anthonywj
|
dcd227d367
|
校验方式修改,1.三期,无三期,扫码单生成业务单,等一些功能修改
|
11 months ago |
chenhc
|
08b714b43b
|
feat: 单据in查询
|
11 months ago |
chenhc
|
76c9764465
|
feat: 单据in查询
|
11 months ago |
wangwei
|
c6859d461f
|
8-15 工位管理 1.0
|
11 months ago |
anthonywj
|
3ee4e9caf9
|
单据详情接口修改
|
11 months ago |
anthonywj
|
6b60cc0244
|
代码备份
|
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 |
chenhc
|
4cfe42b996
|
feat: 首页复制
|
11 months ago |
chenhc
|
c268e0d067
|
feat: 库存预警
|
11 months ago |
anthonywj
|
b30a908894
|
重写采集点代码
|
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 药品搜索字段以及插入字段维护
|
11 months ago |
anthonywj
|
0f1ee49172
|
预出库扫码修改,处方赋码修改
|
11 months ago |
wangwei
|
26d23af14a
|
8/02 选入收费项目
|
11 months ago |
chenhc
|
4b6ac18da9
|
feat: 带票出入库明细
|
11 months ago |
anthonywj
|
771886a42d
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
11 months ago |
anthonywj
|
f1cd9fd1d6
|
四级库库存查询
|
11 months ago |
chenhc
|
8fdd2a487d
|
feat: 带票出入库明细
|
11 months ago |
wangwei
|
b329488995
|
单据查看药品字典详情
|
11 months ago |
anthonywj
|
0cc61f9f59
|
新增拆零队列
|
11 months ago |
anthonywj
|
4409ea42e3
|
药品字典修改
|
11 months ago |
anthonywj
|
ed3b454631
|
切换分支备份,选择库存自定义界面
|
11 months ago |
wangwei
|
c84ff8236c
|
7/30 药品管理
|
11 months ago |
wangwei
|
77f78557d6
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
# src/main/resources/schemas/schema_v2.4.sql
|
11 months ago |
wangwei
|
58a8377531
|
7/29 1.1 更改药品
|
11 months ago |
chenhc
|
a4a05d4756
|
feat: 药品出入库明细、汇总、入账库
|
11 months ago |
anthonywj
|
08182d3d68
|
新增是否组套,单据出入库明细查询
|
11 months ago |
anthonywj
|
147c9f3fa9
|
拆零相关修改
|
12 months ago |
wangwei
|
dfd2e2bfce
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
# src/main/resources/schemas/schema_v2.4.sql
|
12 months ago |
wangwei
|
7b0a9dd058
|
7/27 1.1
|
12 months ago |
anthonywj
|
878f571a3b
|
新增医保拆零,医保收费项目,中西药,中药饮品,医用耗材等
|
12 months ago |
anthonywj
|
de0987058c
|
Merge branch 'dev_fifo' into dev_fifo_z
|
12 months ago |
wangwei
|
8a614fd0bc
|
1.1
|
12 months ago |
anthonywj
|
1211a2d256
|
发票登记过滤
|
12 months ago |
wangwei
|
f5c5b10c21
|
7/11 sql
|
1 year ago |
anthonywj
|
c064fa3629
|
患者信息修改,
|
1 year ago |
anthonywj
|
0cee7aee54
|
读患者信息问题
|
1 year ago |
anthonywj
|
a508f850a2
|
南靖新增第三方产品编码返回
|
1 year ago |
anthonywj
|
184b3c8139
|
南靖接口调用查库存修改
|
1 year ago |
chenhc
|
8f054d1410
|
feat: 0702-扫码校验功能
|
1 year ago |
anthonywj
|
160d36b0a0
|
收费项目,单据类型修改
|
1 year ago |
wangwei
|
bcbe3745b5
|
6/21 同步优化
|
1 year ago |
wangwei
|
b630f392f5
|
6/11 单据查询页面
|
1 year ago |
wangwei
|
d2a7f661a0
|
6/7 单据搜索
|
1 year ago |
wangwei
|
2572ca2b7e
|
6/4 优化发票确认时间以及相关带票查询
|
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
|
a15afd2f5a
|
feat: 0527开发论证功能
|
1 year ago |
chenhc
|
b70f4136cf
|
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
|
325f6d6961
|
feat: 0516优化
|
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 |
wangwei
|
67955cae03
|
增加 保养计划
|
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-合同管理复制
|
1 year ago |
chenhc
|
770caa552c
|
feat: 设备管理优化-0512-增加移除设备的审批流程
|
1 year ago |
wangwei
|
f9b273fcb6
|
5-10 数据同步
|
1 year ago |
chenhc
|
958aa625ad
|
feat: 设备管理优化-0510
|
1 year ago |
chenhc
|
46ae4e7141
|
feat: 本部门保修单、报修单大厅、我的报修单、我的维修单
|
1 year ago |
anthonywj
|
3cb3fcfdec
|
设备巡检管理
|
1 year ago |
chenhc
|
f81d29c601
|
feat: 设备入库、变更、报废
|
1 year ago |
chenhc
|
c6bdd36a42
|
feat: 设备登记、设备入库
|
1 year ago |
chenhc
|
944eb77b92
|
feat: 提交
|
1 year ago |
anthonywj
|
40d97991e8
|
高耗出库明细校验采购类型,高耗自动生成校验单据是否异常
|
1 year ago |
anthonywj
|
36a026f075
|
申购仓库修改
|
1 year ago |
anthonywj
|
8850df37f8
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
|
1 year ago |
anthonywj
|
ee737966d2
|
登录密码验证
|
1 year ago |
chenhc
|
20699097fe
|
feat: 明细列表增加术式模板id
|
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
|
11270c57dc
|
feat: 第三方明细下载增加字段
|
1 year ago |
chenhc
|
26ae4069bc
|
feat: 科室医保分类功能
|
1 year ago |
chenhc
|
879b532494
|
dev_ksck → origin/dev_ksck
|
1 year ago |