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

5:03 下午

adairkang

More
22296
changed 12 files
root:

ZSYY-219 PC端灭菌管理增加打印灭菌记录明细功能

- -0
- +12
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionItemManagerImpl.java
- History
- Source
- Diff
./java/.../SterilizationTransitionItemManagerImpl.java
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/vo
- History
- Source
./java/com/forgon/.../sterilizationrecord/vo
- -0
- +7
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionItemManager.java
- History
- Source
- Diff
./java/.../SterilizationTransitionItemManager.java
- -0
- +7
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
- History
- Source
- Diff
./java/com/.../SterilizationRecordManager.java
- -0
- +82
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/vo/SterilizationRecordPrintTousseItem.java
- History
- Source
./java/.../SterilizationRecordPrintTousseItem.java
- -5
- +28
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
- History
- Source
- Diff
./java/com/.../SterilizationRecordAction.java
- too large
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./java/.../SterilizationRecordManagerImpl.java
… 5 more files in changeset.

1:39 下午

jeffli

More
22288
changed 6 files
root:

增加外部代理灭菌单的部分物品终止功能

中山市小榄人民医院ZSSXLRMYY-155

- -0
- +2
./java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManager.java
- History
- Source
- Diff
./java/.../ForeignProxyDisinfectionManager.java
- -0
- +84
./java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
./java/.../ForeignProxyDisinfectionManagerImpl.java
- -1
- +17
./java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/action/ForeignProxyDisinfectionAction.java
- History
- Source
- Diff
./java/.../ForeignProxyDisinfectionAction.java
… 3 more files in changeset.

7:30 下午

chenjiaru

More
22214
changed 2 files
root:

jira问题：ZSYY-214 PC端灭菌交接记录优化

- -2
- +3
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java
- History
- Source
- Diff
./java/.../SterilizationTransitionAction.java
… 1 more file in changeset.

4:09 下午

chenjiaru

More
22210
changed 8 files
root:

jira问题：ZSYY-214 PC端灭菌交接记录优化

- -5
- +29
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java
- History
- Source
- Diff
./java/.../SterilizationTransitionAction.java
- -27
- +34
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java
- History
- Source
- Diff
./java/.../SterilizationTransitionManagerImpl.java
… 6 more files in changeset.

3:48 下午

alan.lee

More
22209
changed 1 file
root:

更新包失效日期现在改成：当前灭菌时间+保质期。以前是用失效期+保质期

- too large
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./java/.../SterilizationRecordManagerImpl.java

1:46 下午

alan.lee

More
22205
changed 3 files
root:

1.更新包的失效日期代码从Action提取到manager中

2.今天已审核待灭菌物品，提高查询速度

- too large
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./java/.../SterilizationRecordManagerImpl.java
- -6
- +0
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
- History
- Source
- Diff
./java/com/.../SterilizationRecordAction.java
… 1 more file in changeset.

11:52 上午

adairkang

More
22204
changed 14 files
root:

灭菌交接打印

- -0
- +5
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManager.java
- History
- Source
- Diff
./java/.../SterilizationTransitionManager.java
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/vo
- History
- Source
./java/com/forgon/.../sterilizationTransition/vo
- -2
- +66
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java
- History
- Source
- Diff
./java/.../SterilizationTransitionAction.java
- -0
- +21
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java
- History
- Source
- Diff
./java/.../SterilizationTransitionManagerImpl.java
- -0
- +64
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/vo/SterilizationTransitionPrintItem.java
- History
- Source
./java/.../SterilizationTransitionPrintItem.java
- -0
- +65
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/vo/SterilizationTransitionPrintData.java
- History
- Source
./java/.../SterilizationTransitionPrintData.java
… 8 more files in changeset.

9:51 上午

chenjiaru

More
22200
changed 6 files
root:

jira问题：ZSYY-214 PC端灭菌交接记录优化（部分代码的提交）

- -0
- +5
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java
- History
- Source
- Diff
./java/.../SterilizationTransitionAction.java
- -0
- +1
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java
- History
- Source
- Diff
./java/.../SterilizationTransitionManagerImpl.java
… 4 more files in changeset.

1:31 上午

chenjiaru

More
22199
changed 10 files
root:

jira问题：ZSYY-214 PC端灭菌交接记录优化（部分代码的提交）

- -0
- +1
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java
- History
- Source
- Diff
./java/.../SterilizationTransitionManagerImpl.java
- -2
- +11
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java
- History
- Source
- Diff
./java/.../SterilizationTransitionAction.java
… 8 more files in changeset.

8:11 下午

adairkang

More
22189
changed 9 files
root:

PDA端清洗交接

- -0
- +91
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java
- History
- Source
- Diff
./java/.../SterilizationTransitionManagerImpl.java
- -1
- +35
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionItemManagerImpl.java
- History
- Source
- Diff
./java/.../SterilizationTransitionItemManagerImpl.java
- -2
- +28
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManager.java
- History
- Source
- Diff
./java/.../SterilizationTransitionManager.java
- -2
- +16
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionItemManager.java
- History
- Source
- Diff
./java/.../SterilizationTransitionItemManager.java
… 5 more files in changeset.

4:46 下午

chenjiaru

More
22180
changed 7 files
root:

jira问题：ZSYY-206 增加灭菌交接功能（部分代码的提交）

- -1
- +1
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java
- History
- Source
- Diff
./java/.../SterilizationTransitionAction.java
- -1
- +1
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java
- History
- Source
- Diff
./java/.../SterilizationTransitionManagerImpl.java
… 5 more files in changeset.

3:42 下午

chenjiaru

More
22179
changed 8 files
root:

jira问题：ZSYY-206 增加灭菌交接功能（部分代码的提交）

- -0
- +2
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java
- History
- Source
- Diff
./java/.../SterilizationTransitionAction.java
- -0
- +3
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java
- History
- Source
- Diff
./java/.../SterilizationTransitionManagerImpl.java
… 6 more files in changeset.

10:50 下午

chenjiaru

More
22164
changed 23 files
root:

jira问题：ZSYY-206 增加灭菌交接功能（部分代码的提交）

- -0
- +27
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionItemManagerImpl.java
- History
- Source
./java/.../SterilizationTransitionItemManagerImpl.java
- -1
- +16
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManager.java
- History
- Source
- Diff
./java/.../SterilizationTransitionManager.java
- -0
- +93
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java
- History
- Source
- Diff
./java/.../SterilizationTransitionManagerImpl.java
- -0
- +18
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionItemManager.java
- History
- Source
./java/.../SterilizationTransitionItemManager.java
- -1
- +106
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java
- History
- Source
- Diff
./java/.../SterilizationTransitionAction.java
… 18 more files in changeset.

8:14 下午

alan.lee

More
22156
changed 3 files
root:

灭菌完成后去更新包的失效日期

- -0
- +6
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
- History
- Source
- Diff
./java/com/.../SterilizationRecordAction.java
- too large
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./java/.../SterilizationRecordManagerImpl.java
- -0
- +8
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
- History
- Source
- Diff
./java/com/.../SterilizationRecordManager.java

10:47 上午

chenjiaru

More
22146
changed 17 files
root:

jira问题：ZSYY-206 增加灭菌交接功能（部分代码的提交）

./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action
- History
- Source
./java/com/.../sterilizationTransition/action
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service
- History
- Source
./java/com/.../sterilizationTransition/service
- -0
- +71
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java
- History
- Source
./java/com/.../SterilizationTransitionAction.java
- -0
- +9
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManager.java
- History
- Source
./java/com/.../SterilizationTransitionManager.java
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition
- History
- Source
./java/com/.../sterilizationTransition
- -0
- +10
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java
- History
- Source
./java/.../SterilizationTransitionManagerImpl.java
… 11 more files in changeset.

6:10 下午

shuyongfu

More
22137
changed 4 files
root:

解决状态为灭菌中的灭菌记录的器械包从列表删除后(只是从灭菌物品列表里删除,并未点保存),然后重新载入(或扫描被删除的包条码)及一键入炉不成功的问题

- too large
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./java/.../SterilizationRecordManagerImpl.java
- -6
- +28
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
- History
- Source
- Diff
./java/com/.../SterilizationRecordAction.java
- -1
- +2
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
- History
- Source
- Diff
./java/com/.../SterilizationRecordManager.java
… 1 more file in changeset.

3:35 下午

alan.lee

More
22091
changed 2 files
root:

解决：1.添加灭菌记录，篮筐和固定条码冲突的问题

2.灭菌装载单个固定条码不能载入的问题

- too large
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./java/.../SterilizationRecordManagerImpl.java
… 1 more file in changeset.

1:49 下午

alan.lee

More
22084
changed 5 files
root:

灭菌装载页面针对固定条码，汇总

- -3
- +3
./java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java
- History
- Source
- Diff
./java/com/.../SterileLoadingTableManager.java
… 4 more files in changeset.

10:23 上午

alan.lee

More
22039
changed 10 files
root:

1.灭菌转载新增分组删除功能

2.Acton提取到manager

3.代码优化 (long)0 改成0L

4.获取固定条码的方法重构

- -3
- +3
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
- History
- Source
- Diff
./java/com/.../SterilizationRecordAction.java
- too large
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./java/.../SterilizationRecordManagerImpl.java
- -0
- +3
./java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java
- History
- Source
- Diff
./java/com/.../SterileLoadingTableManager.java
… 7 more files in changeset.

3:29 下午

alan.lee

More
22020
changed 4 files
root:

灭菌固定条码修改数量，关于最大值的修改

- -6
- +12
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
- History
- Source
- Diff
./java/com/.../SterilizationRecordAction.java
… 3 more files in changeset.

4:37 上午

alan.lee

More
22006
changed 8 files
root:

解决：中山一院消毒供应项目ZSYY-198

不追溯物品灭菌记录和灭菌装载优化

- -2
- +41
./java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java
- History
- Source
- Diff
./java/com/.../SterileLoadingTableManager.java
… 7 more files in changeset.

8:12 下午

alan.lee

More
22003
changed 2 files
root:

灭菌记录：一键入炉如果存在固定条码，则去做汇总

- -4
- +94
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
- History
- Source
- Diff
./java/com/.../SterilizationRecordAction.java
… 1 more file in changeset.

9:32 上午

alan.lee

More
21984
changed 3 files
root:

灭菌记录代码优化

- -9
- +36
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
- History
- Source
- Diff
./java/com/.../SterilizationRecordAction.java
… 2 more files in changeset.

5:37 下午

alan.lee

More
21971
changed 5 files
root:

灭菌记录bug:

1、修改数量后（比如：数量由100修改为10），点击保存，修改的数量不生效

2、查看已灭菌的记录，后台报错

3、新增，扫篮筐，篮筐数量显示不对，数量多了1

4、装不追溯物品的篮筐，保存后，篮筐条码变成不追溯的固定条码

5、原本的记录有不入筐不追溯物品，也有已入筐的不追溯物品，打开灭菌记录，扫第二次固定条码，数量加在原本的篮筐数量上（只剩下篮筐这一行，篮筐下没有东西，也不能展开）

6、新增记录，扫两个篮筐，一个篮筐是放不追溯物品，保存。打开灭菌记录，扫描不追溯的固定条码，提示条码已存在

7、重新灭菌保存后，灭菌记录里没有物品

8.兼容oracle

- too large
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./java/.../SterilizationRecordManagerImpl.java
- -2
- +2
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
- History
- Source
- Diff
./java/com/.../SterilizationRecordAction.java
… 3 more files in changeset.

3:09 下午

alan.lee

More
21961
changed 3 files
root:

灭菌记录解决Bug:

1.修改数量后，立刻点击保存，修改的数量不生效

2.灭菌记录的上部分填写的数据不见了

3.篮筐数量

- too large
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./java/.../SterilizationRecordManagerImpl.java
- -17
- +15
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
- History
- Source
- Diff
./java/com/.../SterilizationRecordAction.java
… 1 more file in changeset.

4:33 下午

alan.lee

More
21933
changed 5 files
root:

灭菌记录代码改进

- too large
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./java/.../SterilizationRecordManagerImpl.java
- -2
- +2
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
- History
- Source
- Diff
./java/com/.../SterilizationRecordAction.java
… 3 more files in changeset.

3:32 下午

alan.lee

More
21929
changed 4 files
root:

解决灭菌记录Bug:

1.扫描固定条码，显示未定义

2.打开灭菌记录，删除包后在打开还在里面

3.加载篮筐后，只显示一条数据

- too large
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./java/.../SterilizationRecordManagerImpl.java
- -10
- +11
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
- History
- Source
- Diff
./java/com/.../SterilizationRecordAction.java
… 2 more files in changeset.

11:57 上午

alan.lee

More
21923
changed 4 files
root:

灭菌记录扫固定条码，不是当天的包也可扫描

- -2
- +3
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
- History
- Source
- Diff
./java/com/.../SterilizationRecordAction.java
- too large
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./java/.../SterilizationRecordManagerImpl.java
… 2 more files in changeset.

6:37 下午

alan.lee

More
21893
changed 2 files
root:

解决bug：点开灭菌记录后，允许修改数量

- too large
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./java/.../SterilizationRecordManagerImpl.java
… 1 more file in changeset.

5:31 下午

alan.lee

More
21886
changed 3 files
root:

灭菌记录解决Bug: 1，灭菌记录，如果只有一个固定条码，会显示成唯一条码 2.固定条码删除或修改数量，不仅仅是已审核的，还有灭菌中的

完善细节：固定条码修改数量，可能加载比较慢，将保存按钮禁用，后台修改完以后启用

- too large
./java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./java/.../SterilizationRecordManagerImpl.java
… 2 more files 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)

adairkang

jeffli

chenjiaru

chenjiaru

alan.lee

alan.lee

adairkang

chenjiaru

chenjiaru

adairkang

chenjiaru

chenjiaru

chenjiaru

alan.lee

chenjiaru

shuyongfu

alan.lee

alan.lee

alan.lee

alan.lee

alan.lee

alan.lee

alan.lee

alan.lee

alan.lee

alan.lee

alan.lee

alan.lee

alan.lee

alan.lee