Activity forgon-ssts-v4.1.0/ssts-maintain/src/main

3:46 下午

jason

More
34597
changed 19 files
root:

解决jira问题：GYEY-779 器械生命周期追溯管理功能

- -0
- +82
./java/com/forgon/disinfectsystem/maintain/tousse/controller/IDCardInstanceBindInstrumentController.java
- History
- Source
./java/.../IDCardInstanceBindInstrumentController.java
./java/com/forgon/disinfectsystem/maintain/tousse
- History
- Source
./java/com/forgon/.../maintain/tousse
- -0
- +579
./java/com/forgon/disinfectsystem/maintain/tousse/service/IDCardInstanceBindInstrumentManagerImpl.java
- History
- Source
./java/.../IDCardInstanceBindInstrumentManagerImpl.java
./java/com/forgon/disinfectsystem/maintain/tousse/service
- History
- Source
./java/com/forgon/.../maintain/tousse/service
./java/com/forgon/disinfectsystem/maintain/tousse/controller
- History
- Source
./java/com/forgon/.../maintain/tousse/controller
- -0
- +58
./java/com/forgon/disinfectsystem/maintain/tousse/service/IDCardInstanceBindInstrumentManager.java
- History
- Source
./java/.../IDCardInstanceBindInstrumentManager.java
… 13 more files in changeset.

2:48 下午

jason

More
34410
changed 3 files
root:

解决jira问题：ZSSXLRMYY-217 包定义的是否装配字段为否的物品，录入清洗记录后，器械包信息的清洗记录应可查到回收及清洗信息(保存清洗记录时，联动修改不装配的器械包实例上的清洗信息)

- too large
./java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java
- History
- Source
- Diff
./java/com/.../MaintainManagerImpl.java
… 2 more files in changeset.

2:55 下午

jason

More
34372
changed 3 files
root:

解决jira问题：ZSSXLRMYY-217 包定义的是否装配字段为否的物品，录入清洗记录后，器械包信息的清洗记录应可查到回收及清洗信息(保存清洗记录时，联动修改不装配的器械包实例上的清洗信息)

- too large
./java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java
- History
- Source
- Diff
./java/com/.../MaintainManagerImpl.java
… 2 more files in changeset.

2:51 下午

jason

More
34313
changed 2 files
root:

解决jira问题：GDSRMYY-547 倍力曼清洗机设备接口改进：查看运行参数界面，增加阶段参数显示以及增加打印功能

- -5
- +4
./java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java
- History
- Source
- Diff
./java/com/.../BelimedDataManagerImpl.java
… 1 more file in changeset.

6:23 下午

jason

More
34309
changed 5 files
root:

解决jira问题：GDSRMYY-547 倍力曼清洗机设备接口改进：查看运行参数界面，增加阶段参数显示以及增加打印功能

- -24
- +53
./java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java
- History
- Source
- Diff
./java/com/.../BelimedDataManagerImpl.java
… 4 more files in changeset.

4:12 下午

jason

More
34241
changed 5 files
root:

解决jira问题：ZJYY-108 PDA预回收功能优化：扫“手术间”、“科室”、“标识牌”条码筛选待回收的申请单、单内物品可设置排序、增加已处理物品颜色标识、物品加急标识

- too large
./java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java
- History
- Source
- Diff
./java/com/.../MaintainManagerImpl.java
… 4 more files in changeset.

11:19 上午

jason

More
34228
changed 2 files
root:

解决jira问题：ZSRY-9 【器械包定义】模块的“配包注意事项”控件改进为支持富文本编辑及弹窗提示方式改进(导入导出基础数据，导出器械包定义时屏蔽"配包注意事项”列的内容;标识牌打印的备注中打印的内容调整为“标识牌”中的“描述”内容)

- -2
- +2
./java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java
- History
- Source
- Diff
./java/com/.../ExportBasedataManagerImpl.java
… 1 more file in changeset.

10:23 上午

jason

More
34227
changed 1 file
root:

解决：新疆军区总医院新华长龙清洗机清洗参数接口同步时，报“设备品牌:【XinHua】,设备型号:【changlong DC-5】,机器号:【1】获取接口数据有误!：could not execute query”异常

- -1
- +1
./java/com/forgon/disinfectsystem/maintain/device/service/XinHua_ChangLongDataImpl.java
- History
- Source
- Diff
./java/com/.../XinHua_ChangLongDataImpl.java

10:33 上午

jason

More
34075
changed 4 files
root:

解决jira问题：GYEY-766 清洗机耗材使用管理功能开发(已经保存的清洗记录可以查看耗材消耗明细)

- -2
- +2
./java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/action/ConsumptiveMaterialContainerAction.java
- History
- Source
- Diff
./java/.../ConsumptiveMaterialContainerAction.java
… 3 more files in changeset.

5:14 下午

jason

More
34070
changed 1 file
root:

解决jira问题：GYEY-766 清洗机耗材使用管理功能开发(耗材补充后解绑，不应该生成领用记录)

- -2
- +38
./java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/service/ConsumptiveMaterialContainerManagerImpl.java
- History
- Source
- Diff
./java/.../ConsumptiveMaterialContainerManagerImpl.java

4:44 下午

jason

More
34068
changed 2 files
root:

解决jira问题：GYEY-766 清洗机耗材使用管理功能开发(清洗机绑定的清洗耗材容器，没有配置耗材种类，本次消耗扣除失败)

- -0
- +1
./java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/action/ConsumptiveMaterialContainerAction.java
- History
- Source
- Diff
./java/.../ConsumptiveMaterialContainerAction.java
… 1 more file in changeset.

3:50 下午

jason

More
34065
changed 2 files
root:

解决jira问题：GYEY-766 清洗机耗材使用管理功能开发(容器名称修改不成功)

- -5
- +7
./java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/action/ConsumptiveMaterialContainerAction.java
- History
- Source
- Diff
./java/.../ConsumptiveMaterialContainerAction.java
… 1 more file in changeset.

3:12 下午

jason

More
34063
changed 1 file
root:

解决jira问题：GYEY-766 清洗机耗材使用管理功能开发(消耗记录查询异常，消耗记录和补充记录按照操作时间倒序排序)

- -5
- +13
./java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/action/ConsumptiveMaterialContainerAction.java
- History
- Source
- Diff
./java/.../ConsumptiveMaterialContainerAction.java

6:01 下午

jason

More
34057
changed 1 file
root:

解决jira问题：GYEY-766 清洗机耗材使用管理功能开发(使用记录查询异常)

- -1
- +1
./java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/action/ConsumptiveMaterialContainerAction.java
- History
- Source
- Diff
./java/.../ConsumptiveMaterialContainerAction.java

5:32 下午

jason

More
34055
changed 2 files
root:

解决jira问题：GYEY-766 清洗机耗材使用管理功能开发(领用记录增加备注;补充记录查询异常)

- -0
- +1
./java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/service/ConsumptiveMaterialContainerManagerImpl.java
- History
- Source
- Diff
./java/.../ConsumptiveMaterialContainerManagerImpl.java
- -1
- +1
./java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/action/ConsumptiveMaterialContainerAction.java
- History
- Source
- Diff
./java/.../ConsumptiveMaterialContainerAction.java

3:50 下午

jason

More
34049
changed 1 file
root:

解决jira问题：GYEY-766 清洗机耗材使用管理功能开发(补充清洗耗材时，对应批次号的库存不足设定的数量弹窗提示：该批次数量不足，请重新选择或修改补充数量！)

- -0
- +3
./java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/service/ConsumptiveMaterialContainerManagerImpl.java
- History
- Source
- Diff
./java/.../ConsumptiveMaterialContainerManagerImpl.java

3:27 下午

jason

More
34046
changed 1 file
root:

解决jira问题：GYEY-766 清洗机耗材使用管理功能开发(耗材补充记录列表分页)

- -13
- +7
./java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/action/ConsumptiveMaterialContainerAction.java
- History
- Source
- Diff
./java/.../ConsumptiveMaterialContainerAction.java

11:10 上午

jason

More
34041
changed 2 files
root:

解决jira问题：GYEY-766 清洗机耗材使用管理功能开发

- -1
- +1
./java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/action/ConsumptiveMaterialContainerAction.java
- History
- Source
- Diff
./java/.../ConsumptiveMaterialContainerAction.java
… 1 more file in changeset.

10:15 上午

jason

More
34039
changed 30 files
root:

解决jira问题：GYEY-766 清洗机耗材使用管理功能开发

- -0
- +413
./java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/service/ConsumptiveMaterialContainerManagerImpl.java
- History
- Source
./java/.../ConsumptiveMaterialContainerManagerImpl.java
./java/com/forgon/disinfectsystem/maintain/device/consumptivematerial
- History
- Source
./java/com/forgon/.../device/consumptivematerial
- -0
- +99
./java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/action/ConsumptiveMaterialTypeAction.java
- History
- Source
./java/com/.../ConsumptiveMaterialTypeAction.java
./java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/action
- History
- Source
./java/com/forgon/.../consumptivematerial/action
- -0
- +71
./java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/service/ConsumptiveMaterialTypeManagerImpl.java
- History
- Source
./java/.../ConsumptiveMaterialTypeManagerImpl.java
- -0
- +22
./java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/service/ConsumptiveMaterialTypeManager.java
- History
- Source
./java/com/.../ConsumptiveMaterialTypeManager.java
./java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/service
- History
- Source
./java/com/forgon/.../consumptivematerial/service
- -0
- +22
./java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/service/ConsumptiveMaterialContainerManager.java
- History
- Source
./java/.../ConsumptiveMaterialContainerManager.java
- -0
- +530
./java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/action/ConsumptiveMaterialContainerAction.java
- History
- Source
./java/.../ConsumptiveMaterialContainerAction.java
… 21 more files in changeset.

5:50 下午

zc.li

More
34028
changed 1 file
root:

dgsetyy-38 修复新华设备接口按时间匹配时获取到的数据开始时间异常的问题

- -1
- +6
./java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java
- History
- Source
- Diff
./java/com/.../XinHuaDataManagerImpl.java

3:00 下午

zc.li

More
34024
changed 1 file
root:

(暂时挂在本问题上)dgsetyy-38 修复历史bug 新华灭菌炉接口开始时间数据保存错误的问题

- -2
- +5
./java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java
- History
- Source
- Diff
./java/com/.../XinHuaDataManagerImpl.java

10:14 上午

zc.li

More
33892
changed 3 files
root:

解决：DGSETYY-38 新华灭菌炉设备接口参数匹配方式改为灭菌开始时间+机器号的方式

- -8
- +31
./java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java
- History
- Source
- Diff
./java/com/.../XinHuaDataManagerImpl.java
… 2 more files in changeset.

4:17 下午

jason

More
33858
changed 7 files
root:

解决jira问题：DGSETYY-33 器械包定义增加清洗教学视频功能，在回收、清洗、仪器图谱模块的仪器图谱查看界面均可以查看清洗教学视频

- -0
- +3
./java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java
- History
- Source
- Diff
./java/com/.../ExportBasedataManagerImpl.java
… 6 more files in changeset.

6:10 下午

jason

More
33783
changed 3 files
root:

解决jira问题：GDSRMYY-545 新增【导出包定义的影像及关联文件】、【导出培训管理文件】功能(增加文件压缩进度)

- -22
- +55
./java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java
- History
- Source
- Diff
./java/com/.../ExportBasedataManagerImpl.java
- -3
- +5
./java/com/forgon/disinfectsystem/maintain/exportbasedata/action/ExportZipFileAction.java
- History
- Source
- Diff
./java/com/.../action/ExportZipFileAction.java
… 1 more file in changeset.

10:55 上午

jason

More
33772
changed 3 files
root:

解决jira问题：GDSRMYY-545 新增【导出包定义的影像及关联文件】、【导出培训管理文件】功能(等待压缩完毕后，才在页面上显示可以下载压缩包)

- -1
- +1
./java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManager.java
- History
- Source
- Diff
./java/com/.../ExportBasedataManager.java
- -9
- +43
./java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java
- History
- Source
- Diff
./java/com/.../ExportBasedataManagerImpl.java
- -6
- +20
./java/com/forgon/disinfectsystem/maintain/exportbasedata/action/ExportZipFileAction.java
- History
- Source
- Diff
./java/com/.../action/ExportZipFileAction.java

10:13 上午

jason

More
33763
changed 5 files
root:

解决jira问题：GDSRMYY-545 新增【导出包定义的影像及关联文件】、【导出培训管理文件】功能；

- -0
- +153
./java/com/forgon/disinfectsystem/maintain/exportbasedata/action/ExportZipFileAction.java
- History
- Source
./java/com/.../action/ExportZipFileAction.java
- -2
- +699
./java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java
- History
- Source
- Diff
./java/com/.../ExportBasedataManagerImpl.java
./java/com/forgon/disinfectsystem/maintain/exportbasedata/action
- History
- Source
./java/com/forgon/.../exportbasedata/action
./java/com/forgon/disinfectsystem/maintain/exportbasedata
- History
- Source
./java/com/forgon/.../maintain/exportbasedata
- -0
- +20
./java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManager.java
- History
- Source
- Diff
./java/com/.../ExportBasedataManager.java

6:05 下午

zc.li

More
33673
changed 2 files
root:

完善：NYSY-44 修改返回的阶段名

- -1
- +1
./java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java
- History
- Source
- Diff
./java/com/.../GetingeDataManagerImpl.java
… 1 more file in changeset.

5:35 下午

zc.li

More
33652
changed 2 files
root:

解决：NYSY-44 灭菌记录的灭菌器（洁定HS66-20-2）参数界面增加灭菌记录运行内容的数据表格显示

- -0
- +4
./java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java
- History
- Source
- Diff
./java/com/.../GetingeDataManagerImpl.java
… 1 more file in changeset.

3:23 下午

jason

More
33647
changed 1 file
root:

解决jira问题：NYSY-45 清洗记录的清洗机（洁定46-5）参数界面增加清洗记录运行内容的数据表格显示

- -2
- +2
./java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java
- History
- Source
- Diff
./java/com/.../GetingeDataManagerImpl.java

6:25 下午

jason

More
33644
changed 3 files
root:

解决jira问题：NYSY-45 清洗记录的清洗机（洁定46-5）参数界面增加清洗记录运行内容的数据表格显示

- -1
- +11
./java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java
- History
- Source
- Diff
./java/com/.../GetingeDataManagerImpl.java
- -5
- +15
./java/com/forgon/disinfectsystem/maintain/device/service/FileOfDatReader.java
- History
- Source
- Diff
./java/com/.../service/FileOfDatReader.java
… 1 more file in changeset.

main

Line History

Stats

Commits this week: 0

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

jason

jason

jason

jason

jason

jason

jason

jason

jason

jason

jason

jason

jason

jason

jason

jason

jason

jason

jason

zc.li

zc.li

zc.li

jason

jason

jason

jason

zc.li

zc.li

jason

jason