wangwei
|
dfe7b8769e
|
8/8 药品搜索字段以及插入字段维护
|
11 months ago |
anthonywj
|
274aefa911
|
处方相关修改
|
11 months ago |
wangwei
|
26d23af14a
|
8/02 选入收费项目
|
11 months ago |
anthonywj
|
01d873f317
|
基础数据修改
|
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
|
17b98d8ab0
|
药品信息编辑以及层级包装数量换算
|
11 months ago |
anthonywj
|
4409ea42e3
|
药品字典修改
|
11 months ago |
anthonywj
|
ed3b454631
|
切换分支备份,选择库存自定义界面
|
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 |
wangwei
|
8a614fd0bc
|
1.1
|
12 months ago |
anthonywj
|
c064fa3629
|
患者信息修改,
|
1 year ago |
anthonywj
|
f16521fbbb
|
平潭修改患者信息下载
|
1 year ago |
anthonywj
|
a508f850a2
|
南靖新增第三方产品编码返回
|
1 year ago |
chenhc
|
6ce53c5bea
|
feat: 0702-扫码校验功能
|
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 |
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
|
fc6daa33f2
|
feat: 0517优化
|
1 year ago |
anthonywj
|
0b257f3087
|
新增发票确认时间
|
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
|
560af1ae62
|
feat: 设备管理优化-0514-设备卡片
|
1 year ago |
chenhc
|
eaf83b2ca3
|
feat: 设备管理优化-0514-合同管理
|
1 year ago |
chenhc
|
b096280db6
|
feat: 设备管理优化-0513-合同管理复制
|
1 year ago |
wangwei
|
c584701c32
|
5-10 数据同步返回设置
|
1 year ago |
wangwei
|
f9b273fcb6
|
5-10 数据同步
|
1 year ago |
chenhc
|
958aa625ad
|
feat: 设备管理优化-0510
|
1 year ago |
chenhc
|
46ae4e7141
|
feat: 本部门保修单、报修单大厅、我的报修单、我的维修单
|
1 year ago |
anthonywj
|
36a026f075
|
申购仓库修改
|
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
|
bfca9fa283
|
科室出库修改
|
1 year ago |
chenhc
|
ad57946821
|
feat: 产品增加采购类型校验
|
1 year ago |
chenhc
|
d4a5f6d67f
|
feat: 定数包项目
|
1 year ago |
chenhc
|
11270c57dc
|
feat: 第三方明细下载增加字段
|
1 year ago |
anthonywj
|
e7ae556f8d
|
新增配送产品,申请与审核,创建后回填
|
1 year ago |
chenhc
|
fc91a02cf4
|
feat: 医保耗材信息增加字段
|
1 year ago |
chenhc
|
4b5be8fb3b
|
feat: 增加定时扫描三方的明细表-生成单据
|
1 year ago |
chenhc
|
b50b981c65
|
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
|
e6b51b0637
|
收费项目添加价格与计量单位
|
1 year ago |
chenhc
|
45b7fad953
|
feat: 审核流程配置功能-sql删除
|
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
|
fba3db5d38
|
新增收费出库是否过滤高值耗材
|
1 year ago |
anthonywj
|
778258acec
|
第三方出库明细
|
1 year ago |
anthonywj
|
53585f97a6
|
新增耗材分类
|
1 year ago |
anthonywj
|
04cbe6afc8
|
业务单生成扫码单执行先进先出原则
|
1 year ago |
chenhc
|
79c5ac8ef4
|
feat: 代码保存
|
1 year ago |
anthonywj
|
2053441176
|
登录界面标题配置
|
1 year ago |
anthonywj
|
eea1eab737
|
ThrInvResultResponse 字段修改
|
1 year ago |
chenhc
|
8c0e5a73ba
|
feat: 三方出入库明细功能
|
1 year ago |
anthonywj
|
c3c232ccf8
|
ThrInvResultResponse 字段修改
|
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 |
anthonywj
|
be5ce3104b
|
新增产品属性
|
1 year ago |
anthonywj
|
584bbcaed6
|
临床使用出库修改,新增采购类型,使用出库拆单补单等
|
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
|
c065ed3a6d
|
集采拆单问题
|
1 year ago |
anthonywj
|
d970162fca
|
库存对比修改
|
1 year ago |
anthonywj
|
bc4b627077
|
患者信息远程下载,提供中医院设备查询界面
|
1 year ago |
anthonywj
|
77525665e9
|
设备入库,变更,销毁等修改,自定义汇总统修改
|
2 years ago |
anthonywj
|
f6ecc65386
|
患者处方相关修改优化
|
2 years ago |
anthonywj
|
d345794cdb
|
患者处方相关修改
|
2 years ago |
anthonywj
|
c73e2bf1f2
|
第三方接口修改,第三接口容错处理,患者信息相关修改,单据类型患者相关修改,临床出库患者信息选择,是否对照处方等相关配置
|
2 years ago |
anthonywj
|
5f110bea39
|
患者处方相关修改
|
2 years ago |
anthonywj
|
27cc68ff98
|
新增库存出库模式,总库库存,上级库存,当前库存
|
2 years ago |
yuanwei
|
b5108288a5
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
2 years ago |
anthonywj
|
be1475a5da
|
新增库存出库模式,总库库存,上级库存,当前库存
|
2 years ago |
yuanwei
|
498c3be047
|
出入库单管理配置
|
2 years ago |
yuanwei
|
31144b596b
|
字典功能处理
|
2 years ago |
yuanwei
|
1eab520dfd
|
初始化动态配置
|
2 years ago |
anthonywj
|
677f368635
|
退货补单,多级仓库补单修改,新增灭菌批号,灭菌日期
|
2 years ago |
anthonywj
|
4d307a42a3
|
单据按di排序
|
2 years ago |
anthonywj
|
7de61eb509
|
预验收入库单区分带回与不带回
|
2 years ago |
anthonywj
|
a277bc0ba2
|
项目组套相关更新
|
2 years ago |
anthonywj
|
5085b66a7f
|
新增物价类别
|
2 years ago |