anthonywj
|
2a5c095915
|
设备巡检任务处理
|
1 year ago |
chenhc
|
eaf83b2ca3
|
feat: 设备管理优化-0514-合同管理
|
1 year ago |
|
chenhc
|
5e393ab5ab
|
feat: 设备管理优化-0513-申购、计划、合同、订单复制到设备管理
|
1 year ago |
|
chenhc
|
b096280db6
|
feat: 设备管理优化-0513-合同管理复制
|
1 year ago |
|
chenhc
|
770caa552c
|
feat: 设备管理优化-0512-增加移除设备的审批流程
|
1 year ago |
|
chenhc
|
11754a27bb
|
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: 设备管理优化
|
1 year ago |
|
chenhc
|
b6ac849ce5
|
feat: 优化
|
1 year ago |
|
chenhc
|
46ae4e7141
|
feat: 本部门保修单、报修单大厅、我的报修单、我的维修单
|
1 year ago |
|
anthonywj
|
308f817e82
|
设备巡检任务处理
|
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
|
8fa91cee91
|
新增下载收费项目字典
|
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
|
9c6b03fb1b
|
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 |
|
anthonywj
|
e795be4b02
|
业务单生成扫码单数量不匹配问题
|
1 year ago |
|
chenhc
|
8b740b8d33
|
feat: 打印功能增加字段
|
1 year ago |
|
chenhc
|
fda7209233
|
feat: 科室医保分类功能
|
1 year ago |
|
chenhc
|
26ae4069bc
|
feat: 科室医保分类功能
|
1 year ago |
|
chenhc
|
879b532494
|
dev_ksck → origin/dev_ksck
|
1 year ago |
|
anthonywj
|
f4bcdbb267
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
|
1 year ago |
|
anthonywj
|
a58e9e6229
|
盘点修改，审核重复提交问题
|
1 year ago |
|
chenhc
|
a273cbce06
|
feat: 部门与医保耗材信息分类接口开发
|
1 year ago |
|
anthonywj
|
600dc8edf8
|
盘点问题，service类生成
|
1 year ago |
|
anthonywj
|
44ba28c823
|
权限问题。耗材字典下载问题
|
1 year ago |
|
chenhc
|
4b5be8fb3b
|
feat: 增加定时扫描三方的明细表-生成单据
|
1 year ago |
|
chenhc
|
d1743d12b4
|
feat: 增加定时扫描三方的明细表-生成单据
|
1 year ago |
|
chenhc
|
b50b981c65
|
feat: 增加页面的医保耗材信息调用功能
|
1 year ago |
|
chenhc
|
371c37c35f
|
feat: 设备管理-卡片开发
|
1 year ago |
|
chenhc
|
255b6f1826
|
feat: 设备管理开发
|
1 year ago |
|
chenhc
|
07be51ee6f
|
feat: 审核开关-业务页面修改
|
1 year ago |
|
chenhc
|
9acdef9af4
|
feat: 审核开关
|
1 year ago |
|
chenhc
|
db533938c8
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
# Conflicts:
# src/main/resources/schemas/schema_v2.4.sql
|
1 year ago |
|
chenhc
|
1cde4618ad
|
feat: 供三方调用接口开发
|
1 year ago |
|
anthonywj
|
34a728e6cb
|
平潭出库明细调整
|
1 year ago |
|
chenhc
|
45b7fad953
|
feat: 审核流程配置功能-sql删除
|
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
|
778258acec
|
第三方出库明细
|
1 year ago |
|
anthonywj
|
506c61bf64
|
库存检验问题
|
1 year ago |
|
anthonywj
|
04cbe6afc8
|
业务单生成扫码单执行先进先出原则
|
1 year ago |
|
anthonywj
|
692c07d961
|
出入库明细下载
|
1 year ago |
|
anthonywj
|
8c150bdd3b
|
出入库明细下载问题
|
1 year ago |
|
chenhc
|
fa55bd5ab8
|
feat: 提交
|
1 year ago |
|
chenhc
|
79c5ac8ef4
|
feat: 代码保存
|
1 year ago |
|
anthonywj
|
17c2f222e5
|
高值出库明细生成库存校验等
|
1 year ago |
|
anthonywj
|
13ac0d742f
|
普耗，收费出库生成单据优化
|
1 year ago |
|
anthonywj
|
e685fb17dc
|
往来类型为患者，根据患者进行拆单
|
1 year ago |
|
anthonywj
|
a706fd8952
|
添加供应商是否关联校验
|
1 year ago |
|
anthonywj
|
2053441176
|
登录界面标题配置
|
1 year ago |
|
chenhc
|
9e75867541
|
feat: 三方出入库明细功能
|
1 year ago |
|
chenhc
|
1f116efd92
|
feat: 三方出入库明细功能
|
1 year ago |
|
chenhc
|
8c0e5a73ba
|
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
|
c30ba149f9
|
切换分支备份
|
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 |
|
anthonywj
|
1aa81fe5de
|
科室出库，集采拆单
|
1 year ago |
|
chenhc
|
85c9db2ae5
|
feat: 项目组套和三方出入库明细
|
1 year ago |
|
chenhc
|
2de35f3091
|
feat: 项目组套和三方出入库明细
|
1 year ago |
|
anthonywj
|
34ac7603bd
|
Merge branch '20231126-yw' into dev_ksck
|
1 year ago |
|
chenhc
|
a20becfb13
|
feat: 耗材字典新增功能
|
1 year ago |
|
anthonywj
|
584bbcaed6
|
临床使用出库修改，新增采购类型，使用出库拆单补单等
|
1 year ago |
|
chenhc
|
a83523fe58
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
1 year ago |
|
chenhc
|
87600e2b3e
|
Merge remote-tracking branch 'origin/dev_price' into dev_price
|
1 year ago |
|
chenhc
|
6c859a9470
|
fix: 修复临床出库过滤库存数0的供应商
|
1 year ago |
|
anthonywj
|
ea708c5303
|
预验收库存校验问题
|
1 year ago |
yuanwei
|
65cd5b0ec5
|
合并冲突
|
1 year ago |
|
yuanwei
|
7a74235bcd
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
1 year ago |
|
anthonywj
|
04f790caf8
|
单据重复上传问题，东山第三方产品信息新增库房代码
|
1 year ago |
|
yuanwei
|
7ffe727deb
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
# Conflicts:
# src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java
|
1 year ago |
|
anthonywj
|
805c82e972
|
新增生产企业字典维护
|
1 year ago |
|
anthonywj
|
1ed3360997
|
新增第三方生产企业
|
1 year ago |
|
anthonywj
|
4854df1f7f
|
申购问题
|
1 year ago |
|
anthonywj
|
0a0155a967
|
1：东山nginx转发问题(头部参数修改);
2：再次领用；再次申购问题；
3.生成内部码是否以最小使用单元问题
|
1 year ago |
|
anthonywj
|
d970162fca
|
库存对比修改
|
1 year ago |
|
anthonywj
|
640e3ed137
|
校验后处方结果保存
|
1 year ago |
|
anthonywj
|
bc4b627077
|
患者信息远程下载，提供中医院设备查询界面
|
1 year 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 |
|
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
|
e7cdbf7140
|
第三方产品信息上传
|
2 years ago |
|
anthonywj
|
9dba332648
|
切换分支备份
|
2 years ago |
|
yuanwei
|
6502b3a7a7
|
出入库单管理配置
|
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 |
|
yuanwei
|
9112dbdf08
|
领用管理提交
|
2 years ago |
|
yuanwei
|
31144b596b
|
字典功能处理
|
2 years ago |
|
anthonywj
|
426b966cb3
|
合并分支备份
|
2 years ago |
|
yuanwei
|
1eab520dfd
|
初始化动态配置
|
2 years ago |
|
anthonywj
|
399d6c3881
|
出入库明细单据类型
|
2 years ago |
|
anthonywj
|
677f368635
|
退货补单，多级仓库补单修改，新增灭菌批号，灭菌日期
|
2 years ago |
|
anthonywj
|
f839f4633d
|
单据打印，库存查询修改
|
2 years ago |
|
anthonywj
|
32bd31903d
|
每日汇总统计等
|
2 years ago |
|
anthonywj
|
4d307a42a3
|
单据按di排序
|
2 years ago |
|
anthonywj
|
7de61eb509
|
预验收入库单区分带回与不带回
|
2 years ago |
|
anthonywj
|
a277bc0ba2
|
项目组套相关更新
|
2 years ago |
|
anthonywj
|
15e7286003
|
患者信息，处方信息下载
|
2 years ago |
|
anthonywj
|
5085b66a7f
|
新增物价类别
|
2 years ago |
|
anthonywj
|
d7109caf5a
|
物资分类添加仓库与部门
|
2 years ago |
|
anthonywj
|
f23c0136dd
|
新增退货补单流程，诏安两个分库问题，单据明细打印问题
|
2 years ago |
|
anthonywj
|
6f43a8a666
|
库存添加过滤条件，领用单据流转生成出入库单据，DI查询库存
|
2 years ago |
|
anthonywj
|
6d5e0228d9
|
单据复制校验库存，申购加到货仓库
|
2 years ago |
|
anthonywj
|
30813b31bd
|
新增库存过滤方式，新增内网版本更新
|
2 years ago |
|
anthonywj
|
ed4dc216bb
|
Merge remote-tracking branch 'origin/dev_price' into dev_price
|
2 years ago |
|
anthonywj
|
cd25fab565
|
UDI物资流向查询未查询到数据问题
|
2 years ago |
|
wj
|
b34ad7e181
|
调整
|
2 years ago |
|
wj
|
098280532f
|
Merge remote-tracking branch 'origin/dev_price' into dev_price
|
2 years ago |
|
wj
|
41babe7e64
|
库存对比相关--未完结
|
2 years ago |
|
anthonywj
|
b1ece4dbc6
|
申购添加商品名称等字段
|
2 years ago |
|
anthonywj
|
e192f70aba
|
患者信息，患者处方等相关接口新增
|
2 years ago |
|
anthonywj
|
c20dcbd4a5
|
患者信息，患者处方等相关接口新增
|
2 years ago |
|
anthonywj
|
bbc21a1a97
|
udi追溯查询
|
2 years ago |
|
anthonywj
|
4b0d54ba71
|
添加患者相关操作类，打印问题修改，项目、定数包相关修改
|
2 years ago |
|
anthonywj
|
00c2995717
|
预验收库存，领用等修改
|
2 years ago |
|
anthonywj
|
a038cac875
|
领用相关问题修改
|
2 years ago |
|
anthonywj
|
4f35b8365f
|
库存仓库领用等修改
|
2 years ago |
|
anthonywj
|
2eb50644dc
|
领用预验收库存不足，领用相关问题修改
|
2 years ago |
