Commit Graph

629 Commits (bef6e840ce1ed75d38315ce569bbad0103638d9d)

Author SHA1 Message Date
anthonywj 08182d3d68 新增是否组套,单据出入库明细查询 12 months ago
anthonywj acc2afebdf 切换分支备份 12 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 新增医保拆零,医保收费项目,中西药,中药饮品,医用耗材等 1 year ago
anthonywj de0987058c Merge branch 'dev_fifo' into dev_fifo_z 1 year ago
wangwei 8a614fd0bc 1.1 1 year ago
anthonywj 7fd4b216aa 第三方收费明细修改 1 year ago
anthonywj f16521fbbb 平潭修改患者信息下载 1 year ago
chenhc 6ce53c5bea feat: 0702-扫码校验功能 1 year ago
wangwei bcbe3745b5 6/21 同步优化 1 year ago
chenhc 52ff3ecd4a feat: 0606注释掉是否需要扫码 1 year ago
chenhc 96aec50efe feat: 0606修复 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
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 e4faa404e0 feat: 0523开发询价模块 1 year ago
chenhc 65e6bdf631 feat: 0521 优化 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
wangwei 67955cae03 增加 保养计划 1 year ago
chenhc 560af1ae62 feat: 设备管理优化-0514-设备卡片 1 year ago
anthonywj bd9af3f14d 采购订单关联单号 1 year ago
chenhc 1c5e86da2d 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 58ace1f05d feat: 设备管理优化 1 year ago
chenhc 5f9b6437da 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 1731ad25ec feat: 设备信息增加字段 1 year ago
anthonywj 36a026f075 申购仓库修改 1 year ago
chenhc 20699097fe feat: 明细列表增加术式模板id 1 year ago
chenhc 50490a88dc feat: 术士套包、定数包功能开发 1 year ago
anthonywj 5cc8365472 科室出库修改 1 year ago
chenhc ad57946821 feat: 产品增加采购类型校验 1 year ago
chenhc d4a5f6d67f feat: 定数包项目 1 year ago
chenhc 11270c57dc 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
chenhc 961bd20bbc feat: 部门与医保耗材信息分类关联关系初始化 1 year ago
anthonywj 600dc8edf8 盘点问题,service类生成 1 year ago
anthonywj e7ae556f8d 新增配送产品,申请与审核,创建后回填 1 year ago
anthonywj 5e62af17e7 平潭收费生成单据问题 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
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 778258acec 第三方出库明细 1 year ago
anthonywj 1551cd46e2 长泰添加异常UDI码 1 year ago
anthonywj 53585f97a6 新增耗材分类 1 year ago
anthonywj 04cbe6afc8 业务单生成扫码单执行先进先出原则 1 year ago
anthonywj 8c150bdd3b 出入库明细下载问题 1 year ago
chenhc 79c5ac8ef4 feat: 代码保存 1 year ago
anthonywj 207f3324d4 项目组套新增供应商ID 1 year ago
anthonywj a706fd8952 添加供应商是否关联校验 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 9b652cd815 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 85c9db2ae5 feat: 项目组套和三方出入库明细 1 year ago
chenhc 2de35f3091 feat: 项目组套和三方出入库明细 1 year ago
anthonywj 34ac7603bd Merge branch '20231126-yw' into dev_ksck 1 year ago
anthonywj e3fc4cd3dc 第三方出入库明细 1 year ago
chenhc a20becfb13 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 805c82e972 新增生产企业字典维护 1 year ago
anthonywj 1ed3360997 新增第三方生产企业 1 year ago
anthonywj c065ed3a6d 集采拆单问题 2 years ago
anthonywj d970162fca 库存对比修改 2 years ago
anthonywj 640e3ed137 校验后处方结果保存 2 years ago
anthonywj bc4b627077 患者信息远程下载,提供中医院设备查询界面 2 years ago
anthonywj 77525665e9 设备入库,变更,销毁等修改,自定义汇总统修改 2 years ago
anthonywj 5fad9e2835 新增自定义库存明细汇总 2 years ago
anthonywj f6ecc65386 患者处方相关修改优化 2 years ago
anthonywj d345794cdb 患者处方相关修改 2 years ago
anthonywj c73e2bf1f2 第三方接口修改,第三接口容错处理,患者信息相关修改,单据类型患者相关修改,临床出库患者信息选择,是否对照处方等相关配置 2 years ago
anthonywj 5f110bea39 患者处方相关修改 2 years ago
wj 1df50657b0 设备相关 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 508e93bb91 Merge remote-tracking branch 'origin/dev_price' into 20231126-yw 2 years ago
yuanwei 9b4ac353f7 单据管理 2 years ago
anthonywj f79458bb45 长泰新增配送产品,物资分类问题 2 years ago
yuanwei 1ad478b286 初始化动态配置 2 years ago
yuanwei 1eab520dfd 初始化动态配置 2 years ago
anthonywj 677f368635 退货补单,多级仓库补单修改,新增灭菌批号,灭菌日期 2 years ago
anthonywj 7de61eb509 预验收入库单区分带回与不带回 2 years ago
anthonywj 7450916af4 Merge remote-tracking branch 'origin/dev_price' into dev_price 2 years ago
anthonywj 5085b66a7f 新增物价类别 2 years ago
wj d817527800 调整 2 years ago
wj fc4cbf3cf3 Merge remote-tracking branch 'origin/dev_price' into dev_price 2 years ago
wj a83e44fad4 调整 2 years ago
anthonywj d7109caf5a 物资分类添加仓库与部门 2 years ago
anthonywj f23c0136dd 新增退货补单流程,诏安两个分库问题,单据明细打印问题 2 years ago
anthonywj 30813b31bd 新增库存过滤方式,新增内网版本更新 2 years ago
wj b34ad7e181 调整 2 years ago
wj 41babe7e64 库存对比相关--未完结 2 years ago
anthonywj 4b0d54ba71 添加患者相关操作类,打印问题修改,项目、定数包相关修改 2 years ago
anthonywj a038cac875 领用相关问题修改 2 years ago
anthonywj 450dcbf2a2 申购修改 2 years ago
anthonywj 4f35b8365f 库存仓库领用等修改 2 years ago
anthonywj e319a9888d 汇总统计 2 years ago
wj 9fd6e1a41b 调整 2 years ago
anthonywj 94e09d6d8d 盘点相关功能--盘点方式,部分盘点修改 2 years ago
anthonywj 0074c56c9d 盘点相关功能 2 years ago
anthonywj 474971fb2f 新增盘点功能代码 2 years ago
anthonywj 1b3c16482a 移除盘点相关功能 2 years ago
anthonywj 1b6eb549d8 设备管理相关代码整理 2 years ago
anthonywj 12f1851bba 业务单据打印等,出入库明细打印等 2 years ago
anthonywj 21a94967d8 业务单直接生成扫码单 2 years ago
anthonywj 1c202156b4 价格相关修改,新增库存定量设置 2 years ago
anthonywj d9d4ca1771 新增价格相关处理 2 years ago
anthonywj 5f3aca56b2 超时修改密码 2 years ago
anthonywj dbd58892ee 单据类型初始化问题 2 years ago
anthonywj 54c7b550a2 单据类型添加编辑类型 2 years ago
anthonywj 2806032885 系统升级bug修改 2 years ago
anthonywj 3847e021b2 登录菜单问题 2 years ago
anthonywj cfdfe112ed 预验收价格问题 2 years ago
郑明梁 f835362043 设备代码提交 2 years ago
anthonywj d8a88547fe pda带配/拣货单据修改 2 years ago
郑明梁 06ebf55ed0 Merge remote-tracking branch 'origin/dev2.0' into dev2.0
# Conflicts:
#	src/main/resources/schemas/schema_v2.2.sql
2 years ago
郑明梁 af21cfdf13 设备代码提交 2 years ago
anthonywj 90f7f1f927 PDA手持终端相关接口 2 years ago
anthonywj c62383ff51 自定义头部参数代码备份 2 years ago
郑明梁 70483edee8 设备代码提交 2 years ago
anthonywj 4a8fb12b43 Merge remote-tracking branch 'origin/dev2.0' into dev2.0 2 years ago
anthonywj dec79c047d 新增已执行次数字段;
自定义前端表头字段相关操作类
2 years ago
黄泽腾 3e43f5f1c4 设备管理-设备资质 2 years ago
anthonywj 24cd753745 设备明细表字段补充 2 years ago
黄泽腾 ceb2ac74a8 设备管理-设备资质 2 years ago
anthonywj a77d2ca199 Merge remote-tracking branch 'origin/dev2.0' into dev2.0 2 years ago
anthonywj e16a34bc39 巡检计划定时任务补充(未完成) 2 years ago
郑明梁 48431be244 设备领用审核代码提交 2 years ago
anthonywj ba5731260b 设备管理设备位置字典表 2 years ago
anthonywj 795cd78540 生产企业字典相关代码 2 years ago
anthonywj 98951a39f0 设备使用记录相关操作类 2 years ago
anthonywj 024431999a Merge remote-tracking branch 'origin/dev2.0' into dev2.0 2 years ago
anthonywj d31eee08c3 设备相关人员操作类 2 years ago
郑明梁 671131105a 设备领用代码提交 2 years ago
anthonywj 14254daeb7 设备资质相关操作类 2 years ago
郑明梁 5c5f667cf5 设备代码提交 2 years ago
anthonywj 1931ece8a3 修改设备任务ID为雪花ID(自增同步会有问题) 2 years ago
anthonywj d28b4f1699 同步任务备份 2 years ago
郑明梁 a7725c066c Merge remote-tracking branch 'origin/dev2.0' into dev2.0 2 years ago
郑明梁 1b271cab9d Merge remote-tracking branch 'origin/dev' into dev2.0 2 years ago
anthonywj 2ac43431a4 第三方业务单据下载重复问题 2 years ago
wangwei b400a08d83 同步删除基础数据 2 years ago
anthonywj df219f13c4 切换分支代码备份 2 years ago
anthonywj 4eb14efc5f 手持终端获取单据类型 2 years ago
郑明梁 e3dae86c72 Merge remote-tracking branch 'origin/dev' into dev2.0 2 years ago
郑明梁 a268df2cdb 设备bug修改提交 2 years ago
郑明梁 1514065484 库存代码提交 2 years ago
anthonywj 40f8701bc2 新增同步操作日志相关方法 2 years ago
anthonywj cc2cd0b511 新增同步操作日志相关方法 2 years ago
anthonywj 13ada50cc3 Merge branch 'dev' into ywj_dev
# Conflicts:
#	src/main/resources/application-dev.yml
#	src/main/resources/schemas/schema_v2.2.sql
2 years ago
wangwei c959fc118d 报修详情接口 2 years ago
郑明梁 8be3506529 设备巡检任务新增任务级别和保修类型字段 2 years ago
郑明梁 f6f9b599a5 设备保修详情代码提交 2 years ago
郑明梁 32c2798027 设备巡检任务代码提交 2 years ago
anthonywj 5d8e8861b9 Merge branch 'dev' into ywj_dev
# Conflicts:
#	src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
#	src/main/resources/application-dev.yml
#	src/main/resources/schemas/schema_v2.2.sql
2 years ago
wangwei 1a87f29e4d 我的巡检任务 2 years ago
anthonywj 8e102c1659 第三方产品信息异常问题(回滚) 2 years ago
郑明梁 6c66ec37ca 设备代码提交 2 years ago
anthonywj 5a22d137d8 预验收选入时增加过滤条件 2 years ago
wangwei b27758f8db 报修单 维保设备清单 2 years ago
anthonywj 1476a0f894 新增websocket通信(中继服务同步相关) 2 years ago
anthonywj d9371c48f5 新增设备管理相关实体类与字段 2 years ago
anthonywj 0b613af049 bug修改,物资字典boolean ->Boolean 2 years ago
anthonywj c5f47f8139 bug修改,新增单据验收补单校验 2 years ago