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

4:52 下午

jason

More
31131
changed 2 files
V4.1.0

解决jira问题：DGZYY-170 物品预约单增加权限控制(1.具有【查看全部申请单】权限的用户，在科室申领列表可以看到所有科室的物品预约单;2.临床科室用户提交物品预约单后，如果该申请单没有被打印并且发货状态为待发货，则应该允许用户进行修改)

- ?
./com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
- History
- Source
- Diff
./com/.../RecyclingApplicationTableManager.java
- ?
./com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingApplicationManagerImpl.java

7:48 下午

shuyongfu

More
31086
changed 23 files
V4.1.0

解决:SZYK-36 PDA清洗消毒模块，允许查询1周内的数据

NFYY-8 允许不扫描器械包条码的情况下，就可以提交“病人使用记录”。（前提是输入了病人姓名）

ZJJSRM-48 PDA发固定条码物品时，应该不允许扫描出的数量大于库存的数量

GZZYYFY-84 PDA退货后，退货记录的结算科室为空，导致核算月报查询结果有NULL值的科室的问题

FSSZYY-16 PDA预回收页面增加查看和修改非整包申请的消毒物品的材料数量的功能

DGZYY-178 灭菌炉增加按炉次提醒的灭菌程序设置

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingApplicationManagerImpl.java
- ?
./com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
- History
- Source
- Diff
./com/.../CustomRecyclingApplicationAction.java
- ?
./com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
- History
- Source
- Diff
./com/.../RecyclingApplicationManager.java
- ?
./com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java
- History
- Source
- Diff
./com/.../TousseTransitionRecordManagerImpl.java
- ?
./com/forgon/disinfectsystem/recyclingapplication/service/PrepareRecycleTousseManagerImpl.java
- History
- Source
- Diff
./com/.../PrepareRecycleTousseManagerImpl.java
- ?
./com/forgon/disinfectsystem/recyclingapplication/controller/CustomRecyclingApplicationController.java
- History
- Source
- Diff
./com/.../CustomRecyclingApplicationController.java
… 17 more files in changeset.

6:06 下午

zc.li

More
31075
changed 1 file
V4.1.0

删除多余代码

- ?
./com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./com/.../ForeignTousseApplicationManagerImpl.java

6:02 下午

zc.li

More
31074
changed 7 files
V4.1.0

解决：BJ307YY-76。外来器械包装配时拆包支持部分拆包。

- ?
./com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./com/.../ForeignTousseApplicationManagerImpl.java
- ?
./com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java
- History
- Source
- Diff
./com/.../ForeignTousseApplicationTableManager.java
… 5 more files in changeset.

5:30 下午

jason

More
31073
changed 4 files
V4.1.0

解决jira问题：SZYK-35 物品预约单改进为支持显示库存数量以及可限制预约数量不能大于库存数量(代码优化)

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
- History
- Source
- Diff
./com/.../RecyclingApplicationManager.java
- ?
./com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingApplicationManagerImpl.java
- ?
./com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
- History
- Source
- Diff
./com/.../RecyclingApplicationAction.java
… 1 more file in changeset.

5:10 下午

shuyongfu

More
31072
changed 1 file
V4.1.0

解决:CDSLQYQYYY-91 多张外来器械申请单申请同名字的外来器械包时，发货计划显示的待发数量有问题

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./com/.../InvoicePlanOptimizeManagerImpl.java

4:34 下午

jason

More
31071
changed 1 file
V4.1.0

解决jira问题：SZYK-35 物品预约单改进为支持显示库存数量以及可限制预约数量不能大于库存数量(物品预约单)

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingApplicationManagerImpl.java

11:08 上午

jason

More
31068
changed 1 file
V4.1.0

解决jira问题：SZYK-35 物品预约单改进为支持显示库存数量以及可限制预约数量不能大于库存数量

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingApplicationManagerImpl.java

7:57 下午

jason

More
31056
changed 1 file
V4.1.0

解决jira问题：ZJJSRM-44 科室申领模块按物品查询消毒物品查不出来

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/ReAppTableSqlHandler.java
- History
- Source
- Diff
./com/forgon/.../ReAppTableSqlHandler.java

1:43 下午

jason

More
31038
changed 1 file
V4.1.0

解决jira问题：BJ307YY-85 申请还物单在回收时不应允许手工增加其它物品、申请时间不应为空、申请人不应为admin、不应被合并到待回收的申请单上的问题

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingApplicationManagerImpl.java

10:26 上午

jason

More
31022
changed 1 file
V4.1.0

解决jira问题：GDSZYY-64 提交一次性物品申请单时需要检查该科室是否已有【打印状态为否，发货状态为待发货，终止状态为空】的申请单

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingApplicationManagerImpl.java

5:52 下午

jason

More
31003
changed 1 file
V4.1.0

解决jira问题：BJ307YY-85 申请还物单在回收时不应允许手工增加其它物品、申请时间不应为空、申请人不应为admin、不应被合并到待回收的申请单上的问题

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingApplicationManagerImpl.java

5:31 下午

shuyongfu

More
31001
changed 15 files
V4.1.0

测试objectDao.findSqlByParam方法返回map格式的集合形式的key的大小写问题(oracle数据库查出数据返回map的结果后转换成json时key为大小,sqlserver为小写)的处理

- ?
./com/forgon/disinfectsystem/expensivegoodsapplication/action/ExpensiveGoodsApplicationAction.java
- History
- Source
- Diff
./com/.../ExpensiveGoodsApplicationAction.java
… 14 more files in changeset.

11:34 上午

jason

More
30983
changed 1 file
V4.1.0

解决jira问题：SSTS-348 科室互借，删除状态为已借出的单，失败

- ?
./com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../BorrowRecordManagerImpl.java

11:38 上午

jason

More
30971
changed 1 file
V4.1.0

解决jira问题：SSTS-348 科室互借，删除状态为已借出的单，失败

- ?
./com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java
- History
- Source
- Diff
./com/forgon/.../BorrowRecordAction.java

11:05 上午

jason

More
30968
changed 2 files
V4.1.0

解决jira问题：SSTS-348 科室互借，删除状态为已借出的单，失败

- ?
./com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java
- History
- Source
- Diff
./com/forgon/.../BorrowRecordAction.java
- ?
./com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../BorrowRecordManagerImpl.java

3:08 下午

jason

More
30958
changed 1 file
V4.1.0

解决jira问题：GDSZYY-82 修改外来器械申请单时支持删除单上的外来器械包

- ?
./com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./com/.../ForeignTousseApplicationManagerImpl.java

6:37 下午

shuyongfu

More
30933
changed 2 files
V4.1.0

使用记录的方法作用域放开以便于测试用例调用。测试objectDao.findSqlByParam方法及jdbcTemplate.queryForList方法返回map格式的集合形式的key的大小写问题

- ?
./com/forgon/disinfectsystem/recyclingapplication/updateLog/ApplicationLogManagerImpl.java
- History
- Source
- Diff
./com/.../ApplicationLogManagerImpl.java
… 1 more file in changeset.

11:56 上午

jason

More
30923
changed 2 files
V4.1.0

解决jira问题：SZYK-35 物品预约单改进为支持显示库存数量以及可限制预约数量不能大于库存数量

- ?
./com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
- History
- Source
- Diff
./com/.../DepartmentAppTemplateManagerImpl.java
- ?
./com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
- History
- Source
- Diff
./com/.../RecyclingApplicationAction.java

11:35 上午

jason

More
30921
changed 1 file
V4.1.0

解决jira问题：SZYK-35 物品预约单改进为支持显示库存数量以及可限制预约数量不能大于库存数量

- ?
./com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
- History
- Source
- Diff
./com/.../RecyclingApplicationAction.java

6:23 下午

jason

More
30917
changed 3 files
V4.1.0

解决jira问题：SZYK-35 物品预约单改进为支持显示库存数量以及可限制预约数量不能大于库存数量

- ?
./com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
- History
- Source
- Diff
./com/.../RecyclingApplicationAction.java
- ?
./com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingApplicationManagerImpl.java
… 1 more file in changeset.

2:29 下午

zc.li

More
30837
changed 6 files
V4.1.0

解决：DGKHYY-28.同一张外来器械申请单里，不同供应商的外来器械在回收清点界面应允许部分回收

- ?
./com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java
- History
- Source
- Diff
./com/.../ForeignTousseApplicationTableManager.java
- ?
./com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../InvoicePlanManagerImpl.java
… 4 more files in changeset.

6:33 下午

zc.li

More
30833
changed 7 files
V4.1.0

解决：GDSZYY-79。外来器械标签上打印的供应商，应该是对应包所属的供应商。

- ?
./com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java
- History
- Source
- Diff
./com/.../ForeignTousseApplicationManager.java
- ?
./com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./com/.../ForeignTousseApplicationManagerImpl.java
- ?
./com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java
- History
- Source
- Diff
./com/.../ForeignTousseApplicationTableManager.java
- ?
./com/forgon/disinfectsystem/foreigntousseapplication/controller/ForeignTousseApplicationController.java
- History
- Source
- Diff
./com/.../ForeignTousseApplicationController.java
… 3 more files in changeset.

5:03 下午

jason

More
30821
changed 1 file
V4.1.0

解决jira问题：GDSZYY-77 修改外来器械包申请单，添加外来器械包后提交，提示【参数出错】

- ?
./com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./com/.../ForeignTousseApplicationManagerImpl.java

4:21 下午

shuyongfu

More
30805
changed 1 file
V4.1.0

解决:GDSRMYY-535 发货计划界面申请单下拉框中缺失“全部”选项

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./com/.../InvoicePlanOptimizeManagerImpl.java

2:57 下午

shuyongfu

More
30802
changed 1 file
V4.1.0

解决:ZSSZYY-139麻醉室的消毒物品无法发货，扫描固定条码没有反应

查未发完货的申请单加上处理科室的过滤条件，只查当前登录用户登录的科室处理的申请单

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../InvoicePlanManagerImpl.java

2:30 下午

jason

More
30801
changed 1 file
V4.1.0

解决jira问题：GDSRMYY-534 物品绑定功能应允许能否申请为否的一次性物品通过绑定关系进行加载和申请

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingApplicationManagerImpl.java

10:22 上午

jason

More
30797
changed 1 file
V4.1.0

解决jira问题：GDSRMYY-537 已打印的一次性物品申请单要允许进行修改，包括修改物品的数量

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./com/forgon/.../InvoicePlanManagerImpl.java

4:40 下午

shuyongfu

More
30774
changed 1 file
V4.1.0

处理发货计划的待物品列表的库存列数值不正确的问题(项目未定义加急级别时,该库存列的数值为0或空)

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./com/.../InvoicePlanOptimizeManagerImpl.java

3:21 下午

zc.li

More
30680
changed 18 files
V4.1.0

解决：GDSRMYY-526.包定义中一次性物品应纳入器械包工作量统计报表和消毒供应中心工作量统计报表统计（件数）。

- ?
./com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./com/.../RecyclingApplicationManagerImpl.java
… 17 more files in changeset.

java

Line History

Stats

Commits this week: 5

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

jason

shuyongfu

zc.li

zc.li

jason

shuyongfu

jason

jason

jason

jason

jason

jason

shuyongfu

jason

jason

jason

jason

shuyongfu

jason

jason

jason

zc.li

zc.li

jason

shuyongfu

shuyongfu

jason

jason

shuyongfu

zc.li