chenhc
|
449de7adb4
|
feat: 术士套包、定数包功能开发优化
|
2 years ago |
|
chenhc
|
9c6b03fb1b
|
feat: 术士套包、定数包功能开发
|
2 years ago |
|
chenhc
|
50490a88dc
|
feat: 术士套包、定数包功能开发
|
2 years ago |
anthonywj
|
5cc8365472
|
科室出库修改
|
2 years ago |
|
chenhc
|
d4a5f6d67f
|
feat: 定数包项目
|
2 years ago |
|
anthonywj
|
56ee67d92e
|
业务单生成扫码单数量不匹配问题
|
2 years ago |
|
anthonywj
|
e795be4b02
|
业务单生成扫码单数量不匹配问题
|
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 |
|
anthonywj
|
e7ae556f8d
|
新增配送产品，申请与审核，创建后回填
|
2 years ago |
|
anthonywj
|
5e62af17e7
|
平潭收费生成单据问题
|
2 years ago |
|
chenhc
|
2983a32c3e
|
feat: 医保耗材信息增加字段
|
2 years ago |
|
chenhc
|
4b5be8fb3b
|
feat: 增加定时扫描三方的明细表-生成单据
|
2 years ago |
|
chenhc
|
d1743d12b4
|
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 |
|
chenhc
|
255b6f1826
|
feat: 设备管理开发
|
2 years ago |
|
chenhc
|
07be51ee6f
|
feat: 审核开关-业务页面修改
|
2 years ago |
|
chenhc
|
9acdef9af4
|
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
|
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
|
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
|
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 |
|
chenhc
|
394ee7e585
|
feat: 高耗码校验 代码todo
|
2 years ago |
|
chenhc
|
ab3f8f57c6
|
feat: 高耗生成码校验 代码todo
|
2 years ago |
|
chenhc
|
9e75867541
|
feat: 三方出入库明细功能
|
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 |
|
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 |
|
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
|
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 |
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
|
0a0155a967
|
1：东山nginx转发问题(头部参数修改);
2：再次领用；再次申购问题；
3.生成内部码是否以最小使用单元问题
|
2 years ago |
|
anthonywj
|
c065ed3a6d
|
集采拆单问题
|
2 years ago |
|
anthonywj
|
d970162fca
|
库存对比修改
|
2 years ago |
|
anthonywj
|
640e3ed137
|
校验后处方结果保存
|
2 years ago |
