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

12:58 下午

shuyongfu

More
14806
changed 1 file
V4.1.0

解决器械包灭菌扫描后科室显示错误(显示成false)的问题

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

4:33 下午

jeffli

More
14791
changed 3 files
V4.1.0

已装配的外部代理灭菌申请单,供应室可以删除，临床不能删除

番禺区中医院PYQZYY-80

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

4:08 下午

jeffli

More
14790
changed 1 file
V4.1.0

已装配的外部代理灭菌申请单不能删除

番禺区中医院PYQZYY-80

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

10:42 上午

jeffli

More
14773
changed 4 files
V4.1.0

外部代理灭菌申请单列表，增加打印标签的功能，可以批量打印选中的申请单上所有包实例

广东省人民医院GDSRMYY-128

- ?
./com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/action/ForeignProxyDisinfectionAction.java
- History
- Source
- Diff
./com/.../ForeignProxyDisinfectionAction.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
… 1 more file in changeset.

9:47 上午

jeffli

More
14772
changed 2 files
V4.1.0

外部代理灭菌，对已终止的单进行装配时，给出准确的错误提示

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

10:57 下午

shuyongfu

More
14769
changed 5 files
V4.1.0

解决jira问题:GDSRMYY-133

在灭菌装载界面中的'篮筐明细'和灭菌界面中的灭菌物品列表中增加科室字段(改进)

并已做成可配置

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

2:05 下午

jeffli

More
14761
changed 2 files
V4.1.0

外部代理灭菌单装配时判断单是否已终止

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

11:16 上午

jeffli

More
14759
changed 4 files
V4.1.0

优化终止外部代理灭菌申请单代码：

增加并发控制

批量终止时，每个单放到单独的事务终止

判断是否已终止，已发货

返回成功终止的记录数

- ?
./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/foreignproxydisinfection/service/ForeignProxyDisinfectionManager.java
- History
- Source
- Diff
./com/.../ForeignProxyDisinfectionManager.java
… 1 more file in changeset.

10:50 上午

jeffli

More
14758
changed 4 files
V4.1.0

优化删除外部代理灭菌申请单代码：

增加并发控制

批量删除时，每个单放到单独的事务删除

判断空的发货状态

优化判断是否有灭菌或者发货包实例的代码

返回成功删除的记录数

- ?
./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
… 1 more file in changeset.

5:27 下午

jeffli

More
14750
changed 13 files
V4.1.0

外部代理灭菌代码改造：

是否装配和是否打印分开2个属性

ForeignProxyItem增加 tousseItemId

装配之后不屏蔽装配并打印和装配并打印申请单按钮，后台自动判断是否需要装配

增加并发控制

保存或者更新申请单时，不创建和更新tousseItem，装配时才生成

保存申请单时，不设置发货状态，装配后生成

- ?
./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/foreignproxydisinfection/service/ForeignProxyDisinfectionManager.java
- History
- Source
- Diff
./com/.../ForeignProxyDisinfectionManager.java
… 10 more files in changeset.

11:37 上午

shuyongfu

More
14721
changed 2 files
V4.1.0

解决外部代理灭菌的问题

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

12:53 上午

shuyongfu

More
14674
changed 12 files
V4.1.0

解决jira问题:

GDSRMYY-127 “待灭菌装载器械包信息”和“今天待灭菌物品”框中增加科室字段。

GDSRMYY-129 科室申领中一次性物品加载速度缓慢(改进)

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

11:09 上午

jeffli

More
14649
changed 2 files
V4.1.0

在点击添加后的'外部代理灭菌信息'界面中增加打印发货计划按钮(装配并打印申请单).

点击装配并打印标签时不关闭'外部代理灭菌信息'界面.

广东省人民医院GDSRMYY-122

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

9:37 上午

adairkang

More
14548
changed 1 file
V4.1.0

灭菌装载对器械包的过滤，写到sql中

- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterileloading/service/SterileLoadingManagerImpl.java
- History
- Source
- Diff
./com/.../SterileLoadingManagerImpl.java

4:47 下午

shuyongfu

More
14439
changed 1 file
V4.1.0

解决jira问题:

GDSRMYY-102 每天的第一炉次灭菌目的都会默认为'每日例行监测'(bug)

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

10:34 上午

zengjc

More
14333
changed 5 files
V4.1.0

添加灭菌记录加急处理,解决jira问题ZSSXLRMYY-40

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

12:36 下午

adairkang

More
14309
changed 1 file
V4.1.0

灭菌装载未找到条码对应器械包的提示信息

- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java
- History
- Source
- Diff
./com/.../SterileLoadingTableManager.java

7:57 下午

adairkang

More
14297
changed 31 files
V4.1.0

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

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

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

5:07 下午

jeffli

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

10:10 上午

zengjc

More
14273
changed 14 files
V4.1.0

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

- ?
./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
- ?
./com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
- History
- Source
- Diff
./com/.../SterilizationRecordManager.java
… 11 more files in changeset.

1:33 上午

wangyi

More
14237
changed 17 files
V4.1.0

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

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

6:58 下午

adairkang

More
14169
changed 16 files
V4.1.0

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

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

7:00 下午

wangyi

More
14067
changed 5 files
V4.1.0

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

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

3:57 下午

jeffli

More
14023
changed 7 files
V4.1.0

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

小榄医院增加中标签配置

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

- ?
./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/foreignproxydisinfection/service/ForeignProxyDisinfectionManager.java
- History
- Source
- Diff
./com/.../ForeignProxyDisinfectionManager.java
… 4 more files in changeset.

3:18 下午

adairkang

More
14021
changed 8 files
V4.1.0

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

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

2:52 下午

jeffli

More
14007
changed 5 files
V4.1.0

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

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

3:30 下午

adairkang

More
13981
changed 8 files
V4.1.0

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

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

1:10 下午

adairkang

More
13977
changed 3 files
V4.1.0

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

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

11:40 上午

adairkang

More
13975
changed 1 file
V4.1.0

灭菌记录可以扫人员条码

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

10:58 上午

shuyongfu

More
13971
changed 6 files
V4.1.0

解决省医的jira问题：

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

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

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

shuyongfu

jeffli

jeffli

jeffli

jeffli

shuyongfu

jeffli

jeffli

jeffli

jeffli

shuyongfu

shuyongfu

jeffli

adairkang

shuyongfu

zengjc

adairkang

adairkang

jeffli

zengjc

wangyi

adairkang

wangyi

jeffli

adairkang

jeffli

adairkang

adairkang

adairkang

shuyongfu