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

7:57 下午

adairkang

More
14297
changed 31 files
V4.1.0

灭菌装载中，扫描固定条码，器械包入筐的数量为配置的单次扫描的数量.同一个固定条码的不同包可以入不同的灭菌筐(PYQZYY-48)

将扫描条码相应的代码移动到各模块对应的子项目中处理，可以调用对应模块的处理代码，同时简化逻辑处理

./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading
- History
- Source
./main/java/.../sterilizationmanager/sterileloading
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table
- History
- Source
./main/java/com/forgon/.../sterileloading/dwr/table
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/dwr/table/ForeignProxyDisinfectionTableManager.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionTableManager.java
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/service/SterileLoadingManager.java
- History
- Source
./main/java/.../service/SterileLoadingManager.java
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/service
- History
- Source
./main/java/com/.../sterileloading/service
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr
- History
- Source
./main/java/com/.../sterileloading/dwr
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java
- History
- Source
./main/java/.../SterileLoadingTableManager.java
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/service/SterileLoadingManagerImpl.java
- History
- Source
./main/java/.../SterileLoadingManagerImpl.java
… 23 more files in changeset.

5:07 下午

jeffli

More
14290
changed 2 files
V4.1.0

优化灭菌记录页面扫灭菌筐及包实例条码的异常处理

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

10:10 上午

zengjc

More
14273
changed 14 files
V4.1.0

添加灭菌中断功能,解决jira问题GDSRMYY-92

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

1:33 上午

wangyi

More
14237
changed 17 files
V4.1.0

增加临床科室申请外部代理灭菌功能

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManager.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionManager.java
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/action/ForeignProxyDisinfectionAction.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionAction.java
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionManagerImpl.java
… 14 more files in changeset.

6:58 下午

adairkang

More
14169
changed 16 files
V4.1.0

手工入库，手工退库、同步入库、同步退库、导入入库及调拨单给新字段赋值

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/action/ForeignProxyDisinfectionAction.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionAction.java
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/action/ProxyDisinfectionAction.java
- History
- Source
- Diff
./main/java/.../ProxyDisinfectionAction.java
… 14 more files in changeset.

7:00 下午

wangyi

More
14067
changed 5 files
V4.1.0

番禺区中医院外部代理灭菌修改标签打印样式

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionManagerImpl.java
… 4 more files in changeset.

3:57 下午

jeffli

More
14023
changed 7 files
V4.1.0

重构外部代理灭菌打印代码，参数改为json对象，增加标签类型支持。

小榄医院增加中标签配置

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

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionManagerImpl.java
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/action/ForeignProxyDisinfectionAction.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionAction.java
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManager.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionManager.java
… 4 more files in changeset.

3:18 下午

adairkang

More
14021
changed 8 files
V4.1.0

获取图片的代码改造，如果图片没有，则加载空图片，并判断最终的图片数据是否为空，避免空指针异常

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

2:52 下午

jeffli

More
14007
changed 5 files
V4.1.0

调整小榄医院外部代理灭菌标签格式，去掉灭菌程序，增加制作者，审核者

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionManagerImpl.java
… 4 more files in changeset.

3:30 下午

adairkang

More
13981
changed 8 files
V4.1.0

灭菌完成人可以根据配置重新输入（GDSRMYY-67）

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

1:10 下午

adairkang

More
13977
changed 3 files
V4.1.0

添加判断用户是否拥有灭菌模块的权限

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

11:40 上午

adairkang

More
13975
changed 1 file
V4.1.0

灭菌记录可以扫人员条码

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
- History
- Source
- Diff
./main/java/.../SterilizationRecordAction.java

10:58 上午

shuyongfu

More
13971
changed 6 files
V4.1.0

解决省医的jira问题：

GDSRMYY-55 灭菌管理中增加一键进炉功能

GDSRMYY-57 增加'待灭菌装载器械信息'等地方增加显示器械包审核时间

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

5:44 下午

adairkang

More
13940
changed 22 files
V4.1.0

器械包获取失效日期的代码重构

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionManagerImpl.java
… 21 more files in changeset.

2:40 下午

jeffli

More
13879
changed 2 files
V4.1.0

解决bug：

不追溯的外部代理灭菌单状态为已发货，但实际发货数量不够

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionManagerImpl.java
… 1 more file in changeset.

2:29 下午

shuyongfu

More
13878
changed 1 file
V4.1.0

解决外部代理灭菌包定义的包装类型失效期为0导致添加外部代理灭菌时保存报错的问题

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

5:07 下午

jeffli

More
13865
changed 1 file
V4.1.0

解决bug：

追溯的外部代理灭菌单不能发货

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

4:45 下午

shuyongfu

More
13862
changed 1 file
V4.1.0

外来代理灭菌设置篮筐框实例的判断调整

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

11:46 上午

jeffli

More
13855
changed 15 files
V4.1.0

重构外部代理灭菌单提交方法

外部代理灭菌增加不追溯物品发货功能。

重构发货提交方法

解决bug：

外部代理灭菌单添加同一个包多次，生成的申请项只有1个。

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManager.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionManager.java
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionManagerImpl.java
… 13 more files in changeset.

11:42 上午

shuyongfu

More
13833
changed 1 file
V4.1.0

解决jira问题:ZSWY-26 外部代理灭菌包，器械包定义里设置为不审核，待审核列表仍会出现

如果未扫描灭菌筐可外部代理灭菌包定义是否审核为否时,包实例的状态变为已审核.

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

6:36 下午

zengjc

More
13809
changed 10 files
V4.1.0

灭菌记录添加一条或者多条质量监测信息,解决jira问题ZSWY-5

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

11:01 上午

zengjc

More
13766
changed 1 file
V4.1.0

添加灭菌记录时,后台校验灭菌炉是否正在灭菌.

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
- History
- Source
- Diff
./main/.../SterilizationRecordManagerImpl.java

10:58 上午

zengjc

More
13712
changed 6 files
V4.1.0

灭菌记录增加上传图片功能。

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

11:35 下午

shuyongfu

More
13710
changed 50 files
V4.1.0

4.0代码同步至4.1

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

3:58 下午

adairkang

More
13694
changed 9 files
V4.1.0

灭菌程序添加能否添加器械包进行灭菌（pc、pda、基础数据导入都有修改)（GDSRMYY-20）

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

12:45 下午

adairkang

More
13692
changed 6 files
V4.1.0

外部代理灭菌添加送来时间,预约时间,制作者.核对者，并打印信息(GDSRMYY-21)

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/action/ForeignProxyDisinfectionAction.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionAction.java
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionManagerImpl.java
… 4 more files in changeset.

9:58 上午

shuyongfu

More
13667
changed 2 files
V4.1.0

外部代理灭菌如果未扫描灭菌筐时，则包状态变为已装配。有扫描灭菌筐时包状态变为已审核

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionManagerImpl.java
… 1 more file in changeset.

5:58 下午

adairkang

More
13590
changed 5 files
V4.1.0

pda灭菌中的灭菌记录可以删除

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

2:52 下午

wangyi

More
13499
changed 2 files
V4.1.0

灭菌干预灭菌中的器械包不允许移动

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

11:48 上午

zengjc

More
13484
changed 4 files
V4.1.0

修正oracle数据库的项目,召回信息查询不到器械包的问题.

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

src

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)

adairkang

jeffli

zengjc

wangyi

adairkang

wangyi

jeffli

adairkang

jeffli

adairkang

adairkang

adairkang

shuyongfu

adairkang

jeffli

shuyongfu

jeffli

shuyongfu

jeffli

shuyongfu

zengjc

zengjc

zengjc

shuyongfu

adairkang

adairkang

shuyongfu

adairkang

wangyi

zengjc