Activity forgon-ssts-v4.1/SterileSupplySystem/branches/V4.1.0/ssts-sterile/src/main/java

10:47 上午

chenjiaru

More
22146
changed 17 files
V4.1.0

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

- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java
- History
- Source
./com/.../SterilizationTransitionManagerImpl.java
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition
- History
- Source
./com/forgon/.../sterilizationTransition
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action
- History
- Source
./com/forgon/.../sterilizationTransition/action
- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManager.java
- History
- Source
./com/.../SterilizationTransitionManager.java
- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java
- History
- Source
./com/forgon/.../SterilizationTransitionAction.java
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service
- History
- Source
./com/forgon/.../sterilizationTransition/service
… 11 more files in changeset.

6:10 下午

shuyongfu

More
22137
changed 4 files
V4.1.0

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

- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./com/.../SterilizationRecordManagerImpl.java
- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
- History
- Source
- Diff
./com/.../SterilizationRecordManager.java
- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
- History
- Source
- Diff
./com/.../SterilizationRecordAction.java
… 1 more file in changeset.

3:35 下午

alan.lee

More
22091
changed 2 files
V4.1.0

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

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

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

1:49 下午

alan.lee

More
22084
changed 5 files
V4.1.0

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

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

10:23 上午

alan.lee

More
22039
changed 10 files
V4.1.0

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

2.Acton提取到manager

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

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

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

3:29 下午

alan.lee

More
22020
changed 4 files
V4.1.0

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

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

4:37 上午

alan.lee

More
22006
changed 8 files
V4.1.0

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

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

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

8:12 下午

alan.lee

More
22003
changed 2 files
V4.1.0

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

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

9:32 上午

alan.lee

More
21984
changed 3 files
V4.1.0

灭菌记录代码优化

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

5:37 下午

alan.lee

More
21971
changed 5 files
V4.1.0

灭菌记录bug:

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

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

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

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

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

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

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

8.兼容oracle

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

3:09 下午

alan.lee

More
21961
changed 3 files
V4.1.0

灭菌记录解决Bug:

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

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

3.篮筐数量

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

4:33 下午

alan.lee

More
21933
changed 5 files
V4.1.0

灭菌记录代码改进

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

3:32 下午

alan.lee

More
21929
changed 4 files
V4.1.0

解决灭菌记录Bug:

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

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

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

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

11:57 上午

alan.lee

More
21923
changed 4 files
V4.1.0

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

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

6:37 下午

alan.lee

More
21893
changed 2 files
V4.1.0

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

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

5:31 下午

alan.lee

More
21886
changed 3 files
V4.1.0

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

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

- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./com/.../SterilizationRecordManagerImpl.java
… 2 more files in changeset.

3:31 下午

alan.lee

More
21875
changed 6 files
V4.1.0

灭菌记录，解决Bug:.添加灭菌记录时，删除后再点载入，提示加载完毕或没有灭菌物品

- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
- History
- Source
- Diff
./com/.../SterilizationRecordAction.java
- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./com/.../SterilizationRecordManagerImpl.java
… 4 more files in changeset.

11:16 上午

alan.lee

More
21869
changed 4 files
V4.1.0

灭菌记录，扫描固定条码代码改进

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

5:24 下午

alan.lee

More
21856
changed 3 files
V4.1.0

获取灭菌物品列表方法，从Action提取至manager中

- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
- History
- Source
- Diff
./com/.../SterilizationRecordAction.java
- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
- History
- Source
- Diff
./com/.../SterilizationRecordManager.java
- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./com/.../SterilizationRecordManagerImpl.java

5:09 下午

alan.lee

More
21855
changed 6 files
V4.1.0

灭菌模块，固定条码代码优化、修改

- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
- History
- Source
- Diff
./com/.../SterilizationRecordManager.java
- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./com/.../SterilizationRecordManagerImpl.java
… 4 more files in changeset.

1:31 上午

alan.lee

More
21832
changed 5 files
V4.1.0

灭菌记录现支持多次扫固定条码，累加数量 --待完成：并发、点开修改记录的汇总

- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
- History
- Source
- Diff
./com/.../SterilizationRecordAction.java
… 4 more files in changeset.

10:34 下午

alan.lee

More
21831
changed 7 files
V4.1.0

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

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

暂时保证灭菌记录能使用欠缺功能有：并发、二次扫描固定条码、打开某条记录汇总

- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./com/.../SterilizationRecordManagerImpl.java
- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
- History
- Source
- Diff
./com/.../SterilizationRecordManager.java
- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
- History
- Source
- Diff
./com/.../SterilizationRecordAction.java
… 4 more files in changeset.

3:28 下午

shuyongfu

More
21817
changed 10 files
V4.1.0

去掉未使用import语句、纠正import语法

- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/BioLogicalMonitorPictureAction.java
- History
- Source
- Diff
./com/.../BioLogicalMonitorPictureAction.java
- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterileloading/service/SterileLoadingManagerImpl.java
- History
- Source
- Diff
./com/.../SterileLoadingManagerImpl.java
- ?
./com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/vo/TousseItenInfo.java
- History
- Source
- Diff
./com/forgon/.../vo/TousseItenInfo.java
- ?
./com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManager.java
- History
- Source
- Diff
./com/.../ForeignProxyDisinfectionManager.java
- ?
./com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
./com/.../ForeignProxyDisinfectionManagerImpl.java
- ?
./com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/action/ForeignProxyDisinfectionAction.java
- History
- Source
- Diff
./com/.../ForeignProxyDisinfectionAction.java
- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java
- History
- Source
- Diff
./com/.../SterilizerRecordLineChartAction.java
- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
- History
- Source
- Diff
./com/.../SterilizationRecordTableManager.java
- ?
./com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/dwr/table/ForeignProxyDisinfectionTableManager.java
- History
- Source
- Diff
./com/.../ForeignProxyDisinfectionTableManager.java
… 1 more file in changeset.

12:02 下午

alan.lee

More
21796
changed 5 files
V4.1.0

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

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

- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
- History
- Source
- Diff
./com/.../SterilizationRecordAction.java
… 4 more files in changeset.

5:28 下午

jeffli

More
21051
changed 1 file
V4.1.0

装配界面中今天本组装配记录上的器械包信息增加【包装人】记录

成都市龙泉驿区第一人民医院CDSLQYQYYY-43

- ?
./com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
./com/.../ForeignProxyDisinfectionManagerImpl.java

9:15 下午

alan.lee

More
20940
changed 6 files
V4.1.0

入筐器械包页面增加“科室”搜索框

- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./com/.../SterilizationRecordManagerImpl.java
… 5 more files in changeset.

8:49 下午

chenjiaru

More
20810
changed 3 files
V4.1.0

添加灭菌记录扫描灭菌物品条码的优化

- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
- History
- Source
- Diff
./com/.../SterilizationRecordManager.java
- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./com/.../SterilizationRecordManagerImpl.java
- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
- History
- Source
- Diff
./com/.../SterilizationRecordAction.java

11:22 上午

chenjiaru

More
20591
changed 1 file
V4.1.0

修复灭菌模块的testNG测试用例不通过的问题

- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
- History
- Source
- Diff
./com/.../SterilizationRecordTableManager.java

12:35 下午

chenjiaru

More
20500
changed 6 files
V4.1.0

解决jira问题： SZNSRMYY-9 灭菌记录页面增加“生物监测观察时间”

- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
- History
- Source
- Diff
./com/.../SterilizationRecordTableManager.java
… 5 more files in changeset.

2:28 下午

adairkang

More
20428
changed 2 files
V4.1.0

PDA灭菌记录图片上传，是否上传成功返回到客户端

- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/servlet/UploadServlet.java
- History
- Source
- Diff
./com/forgon/.../servlet/UploadServlet.java
… 1 more file in changeset.

java

Line History

Stats

Commits this week: 1

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

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

alan.lee

alan.lee

alan.lee

alan.lee

alan.lee

alan.lee

shuyongfu

alan.lee

jeffli

alan.lee

chenjiaru

chenjiaru

chenjiaru

adairkang