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

8:05 下午

adairkang

More
16233
changed 5 files
V4.1.0

代理灭菌保存，设置申请项的包类型及申请单id字段

./main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/vo
- History
- Source
./main/java/com/.../proxydisinfection/vo
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/vo/TousseItenInfo.java
- History
- Source
./main/java/com/.../vo/TousseItenInfo.java
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
- History
- Source
- Diff
./main/.../ProxyDisinfectionManagerImpl.java
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/action/ProxyDisinfectionAction.java
- History
- Source
- Diff
./main/java/.../ProxyDisinfectionAction.java
… 1 more file in changeset.

2:28 下午

shuyongfu

More
16193
changed 1 file
V4.1.0

解决二级供应室自动发货后,如果配置为未签收的包不能录使用记录的话,包类型为器械包的包实例不能录使用记录的问题

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

2:13 下午

shuyongfu

More
16191
changed 1 file
V4.1.0

解决二级供应室自动发货后,如果配置为未签收的包不能录使用记录的话,包类型为器械包的包实例不能录使用记录的问题

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

6:16 下午

adairkang

More
16170
changed 1 file
V4.1.0

删除灭菌记录,只有灭菌中的包，才还原状态为已审核

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

6:14 下午

adairkang

More
16169
changed 5 files
V4.1.0

获取灭菌篮筐实例的时候,已有的灭菌篮筐实例，只有关联的灭菌记录都是灭菌失败才能使用。

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

11:06 上午

zengjc

More
16095
changed 1 file
V4.1.0

修正添加灭菌记录，干预完成时，修改灭菌状态不生效的问题。

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

9:49 上午

chenjiaru

More
16092
changed 5 files
V4.1.0

添加灭菌记录扫描条码时，新加了统计"篮筐数量"、"器械包数量"、"敷料包数量"、"外来器械包数量"、"代理灭菌包"的功能

- ?
./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
… 3 more files in changeset.

8:33 下午

chenjiaru

More
16079
changed 4 files
V4.1.0

增加注释

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

11:04 下午

adairkang

More
16068
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.

9:28 下午

zengjc

More
16066
changed 7 files
V4.1.0

添加灭菌干预管理功能，解决jira问题ZSSXLRMYY-102

- ?
./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
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
- History
- Source
- Diff
./main/java/.../SterilizationRecordAction.java
… 4 more files in changeset.

7:28 下午

adairkang

More
16064
changed 1 file
V4.1.0

灭菌失败,器械包状态改回为已审核,需要在包未被废弃的前提下

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

7:24 下午

chenjiaru

More
16062
changed 1 file
V4.1.0

去掉没有意义的代码

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

6:30 下午

chenjiaru

More
16059
changed 3 files
V4.1.0

添加了注释和修改了一些代码书写格式，本次提交不会程序的运行造成影响

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

5:42 下午

wangyi

More
16052
changed 116 files
V4.1.0

自定义表单和质量监测升级

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

10:46 上午

adairkang

More
16039
changed 3 files
V4.1.0

已废弃的器械包，再废弃时，不用再扣减库存(已经没有仓库信息)

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

9:37 上午

shuyongfu

More
16011
changed 5 files
V4.1.0

解决jira问题:

GDSRMYY-220 灭菌装载功能单个条码模式，没扫描篮筐情况下扫描包条码会出现undefined错误

GDSRMYY-218 灭菌装载时扫描首尾条码模式扫描后首条码没清空

以及灭菌装载首尾条码的性能优化

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

5:13 下午

zengjc

More
16003
changed 4 files
V4.1.0

灭菌记录添加备注，解决jira问题ZSSXLRMYY-106.

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

5:49 下午

zengjc

More
15990
changed 3 files
V4.1.0

灭菌完成确认，把参数从action获取，防止pda灭菌完成时，获取参数出现问题.

- ?
./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
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
- History
- Source
- Diff
./main/.../SterilizationRecordManager.java

11:50 上午

zengjc

More
15983
changed 10 files
V4.1.0

添加灭菌确认完成功能，目前只有中大五院配置有此功能，解决jira问题ZSWY-47.

- ?
./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
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
- History
- Source
- Diff
./main/java/.../SterilizationRecordAction.java
- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
- History
- Source
- Diff
./main/.../SterilizationRecordTableManager.java
… 6 more files in changeset.

7:04 下午

shuyongfu

More
15975
changed 2 files
V4.1.0

灭菌装载功能优化,扫描条码与装载至篮筐合并到一起

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

3:08 下午

chenjiaru

More
15965
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.

5:05 下午

jeffli

More
15954
changed 2 files
V4.1.0

不追溯，不打标签的外部代理灭菌物品，申请外部代理灭菌后还是会打标签

中山五院ZSWY-50

- ?
./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

4:06 下午

jeffli

More
15952
changed 4 files
V4.1.0

解决bug：

外部代理灭菌单列表界面，选中多个科室申请单打印时，只会打印其中一个科室的单

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/dwr/table/ForeignProxyDisinfectionTableManager.java
- History
- Source
- Diff
./main/.../ForeignProxyDisinfectionTableManager.java
… 3 more files in changeset.

3:27 下午

chenjiaru

More
15949
changed 3 files
V4.1.0

解决：DGZYY-35 外来器械供应商长期存放供应室备用包的生物监测

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

9:55 上午

shuyongfu

More
15886
changed 7 files
V4.1.0

解决jira问题:

SSTS-79 消毒物品A改名成消毒物品B，再改名成A，再另存为B，发货时扫描B的固定条码显示的是A的包，提交无法发货

以及与消毒物品有关的固定条码问题

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

10:51 上午

chenjiaru

More
15710
changed 5 files
V4.1.0

定义了三个常量

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

10:09 下午

chenjiaru

More
15708
changed 3 files
V4.1.0

解决：灭菌前扫描篮筐，无法统计筐数。（灭菌扫描界面，只有器械包数量显示，没有篮筐数量显示）的问题

现在已经增加了灭菌篮筐数量显示

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

7:18 下午

chenjiaru

More
15707
changed 7 files
V4.1.0

如果生物监测的结果为 "无" 就当成没有做生物监测，如果结果为 "不合格" 则强制制止此外来器械包发货

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

5:35 下午

zengjc

More
15684
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.

4:18 下午

chenjiaru

More
15680
changed 12 files
V4.1.0

解决：JIRA上的一下问题

DGZYY-30 灭菌炉炉次和生物监测

DGZYY-10 东莞市外来器械灭菌监测及发放登记表格式

- ?
./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
- History
- Source
- Diff
./main/.../SterilizationRecordTableManager.java
… 11 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

shuyongfu

shuyongfu

adairkang

adairkang

zengjc

chenjiaru

chenjiaru

adairkang

zengjc

adairkang

chenjiaru

chenjiaru

wangyi

adairkang

shuyongfu

zengjc

zengjc

zengjc

shuyongfu

chenjiaru

jeffli

jeffli

chenjiaru

shuyongfu

chenjiaru

chenjiaru

chenjiaru

zengjc

chenjiaru