anthonywj
|
d96d75634f
|
切换分支备份
|
11 months ago |
anthonywj
|
e645d38789
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
# src/main/resources/schemas/schema_v2.4.sql
|
11 months ago |
anthonywj
|
e7d743faa0
|
切换分支备份
|
11 months ago |
wangwei
|
f9a09de847
|
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
|
dfe7b8769e
|
8/8 药品搜索字段以及插入字段维护
|
11 months ago |
anthonywj
|
274aefa911
|
处方相关修改
|
11 months ago |
anthonywj
|
0f1ee49172
|
预出库扫码修改,处方赋码修改
|
11 months ago |
wangwei
|
26d23af14a
|
8/02 选入收费项目
|
11 months ago |
anthonywj
|
01d873f317
|
基础数据修改
|
11 months ago |
anthonywj
|
cf6978979b
|
切换分支备份
|
11 months ago |
anthonywj
|
f1cd9fd1d6
|
四级库库存查询
|
11 months ago |
anthonywj
|
17b98d8ab0
|
药品信息编辑以及层级包装数量换算
|
12 months ago |
anthonywj
|
4409ea42e3
|
药品字典修改
|
12 months ago |
anthonywj
|
791f8c09fd
|
切换分支备份,选择库存自定义界面
|
12 months ago |
wangwei
|
c84ff8236c
|
7/30 药品管理
|
12 months ago |
anthonywj
|
878f571a3b
|
新增医保拆零,医保收费项目,中西药,中药饮品,医用耗材等
|
12 months ago |
anthonywj
|
f16521fbbb
|
平潭修改患者信息下载
|
1 year ago |
anthonywj
|
184b3c8139
|
南靖接口调用查库存修改
|
1 year ago |
chenhc
|
8bf33df981
|
feat: 0531增加是否需要扫码字段
|
1 year ago |
anthonywj
|
b86c064232
|
评价相关操作类
|
1 year ago |
anthonywj
|
362d1fa353
|
评价体系重命名
|
1 year ago |
anthonywj
|
571a992848
|
新增供应商评价相关类
|
1 year ago |
chenhc
|
fc6daa33f2
|
feat: 0517优化
|
1 year ago |
chenhc
|
770caa552c
|
feat: 设备管理优化-0512-增加移除设备的审批流程
|
1 year ago |
anthonywj
|
8fa91cee91
|
新增下载收费项目字典
|
1 year ago |
chenhc
|
9c6b03fb1b
|
feat: 术士套包、定数包功能开发
|
1 year ago |
chenhc
|
d4a5f6d67f
|
feat: 定数包项目
|
1 year ago |
chenhc
|
07be51ee6f
|
feat: 审核开关-业务页面修改
|
1 year ago |
chenhc
|
9acdef9af4
|
feat: 审核开关
|
1 year ago |
chenhc
|
6dc6e5ab3b
|
feat: 审核流程配置功能
|
1 year ago |
chenhc
|
45b7fad953
|
feat: 审核流程配置功能-sql删除
|
1 year ago |
chenhc
|
54d3d3244a
|
feat: 审核流程配置功能
|
1 year ago |
anthonywj
|
fba3db5d38
|
新增收费出库是否过滤高值耗材
|
1 year ago |
anthonywj
|
778258acec
|
第三方出库明细
|
1 year ago |
anthonywj
|
53585f97a6
|
新增耗材分类
|
1 year ago |
anthonywj
|
8c150bdd3b
|
出入库明细下载问题
|
1 year ago |
anthonywj
|
207f3324d4
|
项目组套新增供应商ID
|
1 year ago |
anthonywj
|
a706fd8952
|
添加供应商是否关联校验
|
1 year ago |
chenhc
|
d4ac5e9fcf
|
feat: 增加产品-产品属性字段
|
1 year ago |
chenhc
|
4db974d0df
|
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 |
chenhc
|
da429ea7dc
|
feat: 产品新增
|
1 year ago |
anthonywj
|
a0b6eb4b27
|
新增产品字典字段补齐
|
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
|
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 |