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-合同管理复制
|
1 year ago |
|
chenhc
|
770caa552c
|
feat: 设备管理优化-0512-增加移除设备的审批流程
|
1 year ago |
|
wangwei
|
c584701c32
|
5-10 数据同步返回设置
|
1 year ago |
|
chenhc
|
11754a27bb
|
feat: 设备管理优化-0512-增加移除类型
|
1 year ago |
|
chenhc
|
44bc4aa00a
|
feat: 设备管理优化-0512-修改提示语
|
1 year ago |
|
wangwei
|
f9b273fcb6
|
5-10 数据同步
|
1 year ago |
|
chenhc
|
958aa625ad
|
feat: 设备管理优化-0510
|
1 year ago |
|
chenhc
|
58ace1f05d
|
feat: 设备管理优化
|
1 year 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 |
