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

10:20 上午

jason

More
33110
changed 10 files
root:

解决jira问题：CDSLQYQYYY-98 新增器械维修管理功能

- -0
- +168
./java/com/forgon/disinfectsystem/tousse/instrumentrepair/action/InstrumentRepairAction.java
- History
- Source
./java/com/.../action/InstrumentRepairAction.java
- -0
- +50
./java/com/forgon/disinfectsystem/tousse/instrumentrepair/service/InstrumentRepairManager.java
- History
- Source
./java/com/.../service/InstrumentRepairManager.java
./java/com/forgon/disinfectsystem/tousse/instrumentrepair/action
- History
- Source
./java/com/forgon/.../instrumentrepair/action
- -0
- +128
./java/com/forgon/disinfectsystem/tousse/instrumentrepair/service/InstrumentRepairManagerImpl.java
- History
- Source
./java/com/.../InstrumentRepairManagerImpl.java
./java/com/forgon/disinfectsystem/tousse/instrumentrepair/service
- History
- Source
./java/com/forgon/.../instrumentrepair/service
./java/com/forgon/disinfectsystem/tousse/instrumentrepair
- History
- Source
./java/com/forgon/.../tousse/instrumentrepair
… 4 more files in changeset.

12:01 下午

zc.li

More
33029
changed 1 file
root:

解决：SSTS-486，ORACLE数据库，灭菌装载模块，筛选灭菌方式，后台报错“Caused by: java.sql.SQLSyntaxErrorException: ORA-00920: 无效的关系运算符”。

- too large
./java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
- History
- Source
- Diff
./java/com/.../TousseInstanceManagerImpl.java

6:13 下午

jason

More
32995
changed 3 files
root:

解决jira问题：GYEY-759 器械包信息里勾选物品后自动计算并显示预计灭菌完成时间(灭菌中的器械包，灭菌使用时间取灭菌记录上的灭菌程序的灭菌使用时间)

- too large
./java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
- History
- Source
- Diff
./java/com/.../TousseInstanceManagerImpl.java
- -0
- +7
./java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
- History
- Source
- Diff
./java/com/.../TousseInstanceManager.java
… 1 more file in changeset.

5:52 下午

jason

More
32994
changed 1 file
root:

解决jira问题：GYEY-759 器械包信息里勾选物品后自动计算并显示预计灭菌完成时间(灭菌中的器械包，灭菌使用时间取灭菌记录上的灭菌程序的灭菌使用时间)

- too large
./java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
- History
- Source
- Diff
./java/com/.../TousseInstanceManagerImpl.java

3:28 下午

jason

More
32970
changed 1 file
root:

解决jira问题：GYEY-759 器械包信息里勾选物品后自动计算并显示预计灭菌完成时间

- too large
./java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
- History
- Source
- Diff
./java/com/.../TousseInstanceManagerImpl.java

10:55 上午

jason

More
32956
changed 5 files
root:

解决jira问题：GYEY-759 器械包信息里勾选物品后自动计算并显示预计灭菌完成时间

- -0
- +7
./java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
- History
- Source
- Diff
./java/com/.../TousseInstanceManager.java
- too large
./java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
- History
- Source
- Diff
./java/com/.../TousseInstanceManagerImpl.java
… 3 more files in changeset.

11:03 上午

jason

More
32905
changed 1 file
root:

解决jira问题：XKYY-239 自定义装配时看不见器械包图片

- too large
./java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
- History
- Source
- Diff
./java/com/.../TousseDefinitionAction.java

11:44 上午

jason

More
32892
changed 3 files
root:

解决jira问题：CDSLQYQYYY-97 器械仓库管理的材料定义里的最大和最小库存数量需要在系统告警里提示(告警类型改名称)

- -1
- +1
./java/com/forgon/disinfectsystem/tousse/materialdefinition/dwr/table/MaterialDefinitionTableManager.java
- History
- Source
- Diff
./java/.../MaterialDefinitionTableManager.java
… 2 more files in changeset.

6:42 下午

jason

More
32886
changed 3 files
root:

解决jira问题：CDSLQYQYYY-97 器械仓库管理的材料定义里的最大和最小库存数量需要在系统告警里提示(告警类型改名称)

- -1
- +1
./java/com/forgon/disinfectsystem/tousse/materialdefinition/dwr/table/MaterialDefinitionTableManager.java
- History
- Source
- Diff
./java/.../MaterialDefinitionTableManager.java
… 2 more files in changeset.

2:46 下午

jason

More
32877
changed 3 files
root:

解决jira问题：CDSLQYQYYY-97 器械仓库管理的材料定义里的最大和最小库存数量需要在系统告警里提示

- -1
- +20
./java/com/forgon/disinfectsystem/tousse/materialdefinition/dwr/table/MaterialDefinitionTableManager.java
- History
- Source
- Diff
./java/.../MaterialDefinitionTableManager.java
… 2 more files in changeset.

4:56 下午

jason

More
32868
changed 1 file
root:

解决jira问题：GYEY-756 - 在一次性物品管理里增加【图片管理】功能

- -2
- +4
./java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageAndVideoAction.java
- History
- Source
- Diff
./java/com/.../UploadImageAndVideoAction.java

4:41 下午

jason

More
32867
changed 1 file
root:

解决jira问题：GYEY-756 - 在一次性物品管理里增加【图片管理】功能

- -4
- +2
./java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageAndVideoAction.java
- History
- Source
- Diff
./java/com/.../UploadImageAndVideoAction.java

2:28 下午

jason

More
32858
changed 3 files
root:

解决jira问题：GYEY-756 - 在一次性物品管理里增加【图片管理】功能

- -0
- +12
./java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageAndVideoAction.java
- History
- Source
- Diff
./java/com/.../UploadImageAndVideoAction.java
- -1
- +2
./java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageFileAction.java
- History
- Source
- Diff
./java/com/.../UploadImageFileAction.java
- -0
- +21
./java/com/forgon/disinfectsystem/tousse/imagefilemanager/service/ImageFileManagerImpl.java
- History
- Source
- Diff
./java/com/.../ImageFileManagerImpl.java

5:29 下午

zc.li

More
32854
changed 1 file
root:

删除多余代码

- -1
- +0
./java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
- History
- Source
- Diff
./java/.../TousseDefinitionTableManager.java

4:38 下午

zc.li

More
32852
changed 1 file
root:

解决SSTS-474 器械包定义中【打印标签同时打印包内清单】属性为“否”，点击“打印器械包明细单”，系统没反应

- -3
- +2
./java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
- History
- Source
- Diff
./java/.../TousseDefinitionTableManager.java

4:46 下午

jason

More
32828
changed 5 files
root:

解决jira问题：GYEY-756 - 在一次性物品管理里增加【图片管理】功能

- -2
- +26
./java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageAndVideoAction.java
- History
- Source
- Diff
./java/com/.../UploadImageAndVideoAction.java
- -0
- +25
./java/com/forgon/disinfectsystem/tousse/imagefilemanager/service/ImageFileManagerImpl.java
- History
- Source
- Diff
./java/com/.../ImageFileManagerImpl.java
- -2
- +3
./java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageFileAction.java
- History
- Source
- Diff
./java/com/.../UploadImageFileAction.java
- -0
- +20
./java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/ShowImageAction.java
- History
- Source
- Diff
./java/com/.../action/ShowImageAction.java
… 1 more file in changeset.

4:39 下午

zc.li

More
32804
changed 3 files
root:

解决：SZYK-58，带标识牌的器械包，标签模板上带有编号，重打印后，编号丢失。

- too large
./java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
- History
- Source
- Diff
./java/com/.../TousseInstanceManagerImpl.java
- -0
- +6
./java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
- History
- Source
- Diff
./java/com/.../TousseInstanceManager.java
… 1 more file in changeset.

3:38 下午

jason

More
32801
changed 1 file
root:

解决jira问题：ZSRY-26 修改“打印器械包明细单”模板的打印格式，增加“包装类型和灭菌程序”

- -0
- +3
./java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
- History
- Source
- Diff
./java/.../TousseDefinitionTableManager.java

6:16 下午

zc.li

More
32795
changed 8 files
root:

解决了 QYSRMYY-31 - 装配界面勾选部分物品装配后加载左上角待装配任务里的物品很慢

- too large
./java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
- History
- Source
- Diff
./java/com/.../TousseDefinitionAction.java
- -0
- +7
./java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManager.java
- History
- Source
- Diff
./java/com/.../MaterialDefinitionManager.java
- -0
- +14
./java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
- History
- Source
- Diff
./java/.../MaterialDefinitionManagerImpl.java
… 5 more files in changeset.

2:20 下午

zc.li

More
32657
changed 1 file
root:

处理：DGSETYY-16，灭菌不合格后。灭菌装载模块扫描不合格的篮筐，器械包加载不出的问题

- too large
./java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
- History
- Source
- Diff
./java/com/.../TousseInstanceManagerImpl.java

6:49 下午

shuyongfu

More
32533
changed 3 files
root:

解决:SZSDSRMYY-69 登记器械包返消的外来器械包，在回收页面显示出来的是外来器械包定义材料数量，应该显示为和这个外来器械包相关联的包实例材料数量

- too large
./java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
- History
- Source
- Diff
./java/.../TousseDefinitionManagerImpl.java
- -0
- +9
./java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
- History
- Source
- Diff
./java/com/.../TousseDefinitionManager.java
… 1 more file in changeset.

2:43 下午

jason

More
32468
changed 7 files
root:

解决jira问题：GDSZYY-102 开发二级供应室在历史装配记录生成代理灭菌单功能(包实例核对状态改为是否接收)

- too large
./java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
- History
- Source
- Diff
./java/com/.../TousseInstanceManagerImpl.java
… 6 more files in changeset.

4:08 下午

zc.li

More
32423
changed 2 files
root:

解决 SZSDSRMYY-68 - 装配页面的【装配打印标签】改为【装配打印标签和材料清单】

- too large
./java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
- History
- Source
- Diff
./java/.../TousseDefinitionManagerImpl.java
… 1 more file in changeset.

3:29 下午

zc.li

More
32382
changed 2 files
root:

解决：SZSDSRMYY-68，装配页面的【装配打印标签】改为【装配打印标签和材料清单】。

- -3
- +9
./java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
- History
- Source
- Diff
./java/.../TousseDefinitionTableManager.java
… 1 more file in changeset.

10:27 上午

zc.li

More
32337
changed 2 files
root:

解决：GDSZYY-102 开发二级供应室在历史装配记录生成代理灭菌单功能

- too large
./java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
- History
- Source
- Diff
./java/com/.../TousseInstanceManagerImpl.java
… 1 more file in changeset.

3:42 下午

zc.li

More
32328
changed 1 file
root:

灭菌加急代码健壮性增强

- too large
./java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
- History
- Source
- Diff
./java/com/.../TousseInstanceManagerImpl.java

6:38 下午

jason

More
32290
changed 1 file
root:

解决jira问题：FSSZYY-31 消毒物品发货材料数量与对应申请单里的材料数量不一致(修复材料MD5为空，但是材料数量大于0的消毒物品器械包定义)

- too large
./java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
- History
- Source
- Diff
./java/com/.../TousseDefinitionAction.java

3:11 下午

shuyongfu

More
32279
changed 1 file
root:

解决:FSSZYY-31 消毒物品发货材料数量与对应申请单里的材料数量不一致

- too large
./java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
- History
- Source
- Diff
./java/.../TousseDefinitionManagerImpl.java

6:10 下午

shuyongfu

More
32274
changed 1 file
root:

解决:FSSZYY-31 消毒物品发货材料数量与对应申请单里的材料数量不一致

- too large
./java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
- History
- Source
- Diff
./java/.../TousseDefinitionManagerImpl.java

4:44 下午

jason

More
32249
changed 1 file
root:

解决：外来器械包申请单“器械包”名称下拉框出现重复名称(根据器械包名称和供应商名称过滤重复数据)

- too large
./java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
- History
- Source
- Diff
./java/.../TousseDefinitionManagerImpl.java

main

Line History

Stats

Commits this week: 2

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

jason

zc.li

jason

jason

jason

jason

jason

jason

jason

jason

jason

jason

jason

zc.li

zc.li

jason

zc.li

jason

zc.li

zc.li

shuyongfu

jason

zc.li

zc.li

zc.li

zc.li

jason

shuyongfu

shuyongfu

jason