Commit Graph

1750 Commits (fccf06cb0eb70238c0bdf6ddb5aa53ef2cc50f19)

Author SHA1 Message Date
anthonywj a508f850a2 南靖新增第三方产品编码返回 1 year ago
anthonywj 184b3c8139 南靖接口调用查库存修改 1 year ago
anthonywj 3a879c604e 单据校验耗材问题 1 year ago
anthonywj 027c1cf7e5 耗材字典查询 1 year ago
chenhc 8f13173a7c feat: 扫码校验功能 1 year ago
chenhc b96ddd10f6 Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo 1 year ago
chenhc 8f054d1410 feat: 0702-扫码校验功能 1 year ago
anthonywj 024f027f6b 高值耗材扫码实时出库 1 year ago
anthonywj 993f541fd4 高值,普耗库存查询 1 year ago
chenhc 6ce53c5bea feat: 0702-扫码校验功能 1 year ago
anthonywj 160d36b0a0 收费项目,单据类型修改 1 year ago
chenhc fc1dbe0c6e feat: 0701-是否需要扫码前判断单据是否为空 1 year ago
chenhc e33e19ec99 feat: 0701-是否需要扫码前判断单据是否为空 1 year ago
wangwei bcbe3745b5 6/21 同步优化 1 year ago
wangwei 8eb4db5673 Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo 1 year ago
anthonywj 268a12c950 打印 1 year ago
anthonywj 90153fcfe6 登录密码校验修改 1 year ago
anthonywj ec843e3b00 Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo 1 year ago
anthonywj 0c7e170101 登录密码校验修改 1 year ago
wangwei 7cc185f22d 6/12 pdf优化加入备注 1 year ago
wangwei b630f392f5 6/11 单据查询页面 1 year ago
wangwei d2a7f661a0 6/7 单据搜索 1 year ago
chenhc 52ff3ecd4a feat: 0606注释掉是否需要扫码 1 year ago
chenhc 96aec50efe feat: 0606修复 1 year ago
wangwei 5d6084864c Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo 1 year ago
wangwei e5968ba6c8 6/5 pdf单据打印修改 1 year ago
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 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 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
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 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: 设备管理优化 1 year ago
chenhc b6ac849ce5 feat: 优化 1 year ago
chenhc 46ae4e7141 feat: 本部门保修单、报修单大厅、我的报修单、我的维修单 1 year ago
anthonywj 308f817e82 设备巡检任务处理 1 year ago
anthonywj 9815904b31 Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo 1 year ago
anthonywj 3cb3fcfdec 设备巡检管理 1 year ago
chenhc ec00d0d605 feat: 设备入库-信息保存-医保编码 1 year ago
chenhc f81d29c601 feat: 设备入库、变更、报废 1 year ago
chenhc 1731ad25ec feat: 设备信息增加字段 1 year ago
chenhc c6bdd36a42 feat: 设备登记、设备入库 1 year ago
chenhc 944eb77b92 feat: 提交 1 year ago
anthonywj 139d85a9b1 新增下载收费项目字典 1 year ago
anthonywj 8fa91cee91 新增下载收费项目字典 1 year ago
anthonywj 40d97991e8 高耗出库明细校验采购类型,高耗自动生成校验单据是否异常 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 449de7adb4 feat: 术士套包、定数包功能开发优化 1 year ago
chenhc 9c6b03fb1b feat: 术士套包、定数包功能开发 1 year ago
chenhc 50490a88dc feat: 术士套包、定数包功能开发 1 year ago
anthonywj bfca9fa283 科室出库修改 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 56ee67d92e 业务单生成扫码单数量不匹配问题 1 year ago
anthonywj e795be4b02 业务单生成扫码单数量不匹配问题 1 year ago
chenhc 8b740b8d33 feat: 打印功能增加字段 1 year ago
chenhc 11270c57dc feat: 第三方明细下载增加字段 1 year ago
chenhc fda7209233 feat: 科室医保分类功能 1 year ago
chenhc 26ae4069bc feat: 科室医保分类功能 1 year ago
anthonywj 543c7c0f6d 收费出库问题 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
chenhc 961bd20bbc feat: 部门与医保耗材信息分类关联关系初始化 1 year ago
anthonywj ae36a483fe 盘点修改 1 year ago
anthonywj 600dc8edf8 盘点问题,service类生成 1 year ago
anthonywj 44ba28c823 权限问题。耗材字典下载问题 1 year ago
anthonywj e7ae556f8d 新增配送产品,申请与审核,创建后回填 1 year ago
anthonywj 5e62af17e7 平潭收费生成单据问题 1 year ago
chenhc 2983a32c3e feat: 医保耗材信息增加字段 1 year ago
chenhc fc91a02cf4 feat: 医保耗材信息增加字段 1 year ago
chenhc 4b5be8fb3b feat: 增加定时扫描三方的明细表-生成单据 1 year ago
chenhc d1743d12b4 feat: 增加定时扫描三方的明细表-生成单据 1 year ago
chenhc b50b981c65 feat: 增加页面的医保耗材信息调用功能 1 year ago
chenhc 493b1b6ca6 feat: 设备管理-设备登记-动态加载子组件 1 year ago
chenhc 371c37c35f feat: 设备管理-卡片开发 1 year ago
anthonywj 8fa0556e89 长泰高值耗材下载后自动生成出入库单据 1 year ago
anthonywj a60ac30187 科室出库补单问题 1 year ago
anthonywj 9cd21f4c54 科室出库补单问题 1 year ago
chenhc 255b6f1826 feat: 设备管理开发 1 year ago
chenhc 07be51ee6f feat: 审核开关-业务页面修改 1 year ago
chenhc 9acdef9af4 feat: 审核开关 1 year ago
chenhc afd1e7fb7d 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
anthonywj 9c6f7e9e4d Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo 1 year ago
anthonywj 34a728e6cb 平潭出库明细调整 1 year ago
chenhc 6dc6e5ab3b feat: 审核流程配置功能 1 year ago
chenhc 45b7fad953 feat: 审核流程配置功能-sql删除 1 year ago
anthonywj 778f4424ac xm包名问题 1 year ago
anthonywj 57c1d8b144 新增下载单据后自动生成出入库单据 1 year ago
anthonywj 1a50e8a480 Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo 1 year ago
anthonywj c9d87c8070 收费出库明细生成单据bug修改 1 year ago
chenhc 54d3d3244a feat: 审核流程配置功能 1 year ago
chenhc 79314bbe8c Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo 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 ef16874927 平潭出入库明细更新 1 year ago
anthonywj 70caeaf21f 普耗收费出入库明细单据生成后自动流转 1 year ago
anthonywj 75b29b956e 业务单生成扫码单双重校验 1 year ago
anthonywj bc4c32eb51 平潭科室收费出库为往来单位时问题 1 year ago
anthonywj fba3db5d38 新增收费出库是否过滤高值耗材 1 year ago
anthonywj 778258acec 第三方出库明细 1 year ago
anthonywj 1551cd46e2 长泰添加异常UDI码 1 year ago
anthonywj 506c61bf64 库存检验问题 1 year ago
anthonywj 53585f97a6 新增耗材分类 1 year ago