Activity forgon-ssts-v4.1.0/ssts-recyclingapplication/src/main/java/com

10:57 上午

jason

More
32918
changed 8 files
root:

解决jira问题：GYEY-758 新增【不良事件管理】模块

- -0
- +33
./forgon/disinfectsystem/adverseeventrecord/service/AdverseEventRecordManager.java
- History
- Source
./forgon/.../AdverseEventRecordManager.java
./forgon/disinfectsystem/adverseeventrecord/action
- History
- Source
./forgon/disinfectsystem/.../action
./forgon/disinfectsystem/adverseeventrecord
- History
- Source
./forgon/disinfectsystem/adverseeventrecord
./forgon/disinfectsystem/adverseeventrecord/service
- History
- Source
./forgon/disinfectsystem/.../service
- -0
- +97
./forgon/disinfectsystem/adverseeventrecord/service/AdverseEventRecordManagerImpl.java
- History
- Source
./forgon/.../AdverseEventRecordManagerImpl.java
- -0
- +89
./forgon/disinfectsystem/adverseeventrecord/action/AdverseEventRecordAction.java
- History
- Source
./forgon/.../AdverseEventRecordAction.java
… 2 more files in changeset.

4:41 下午

zc.li

More
32882
changed 6 files
root:

解决：SZSZLYY-31，使用记录监控回收状态功能优化

- -5
- +0
./forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
- History
- Source
- Diff
./forgon/.../RecyclingApplicationManager.java
- too large
./forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./forgon/.../RecyclingApplicationManagerImpl.java
… 4 more files in changeset.

3:52 下午

jason

More
32866
changed 2 files
root:

解决jira问题： SZSZLYY-51 - 使用记录审核时检查外来器械包的植入物使用数量并进行提醒和拦截

- -2
- +4
./forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
- History
- Source
- Diff
./forgon/.../ForeignTousseApplicationAction.java
… 1 more file in changeset.

2:49 下午

jason

More
32750
changed 2 files
root:

解决jira问题：NFYY-29 增加外来器械包供应商收费功能及相应报表(修改发货单和包实例价格)

- -1
- +4
./forgon/disinfectsystem/foreigntoussecharge/service/ChargeSettingManagerImpl.java
- History
- Source
- Diff
./forgon/.../ChargeSettingManagerImpl.java
- too large
./forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./forgon/.../ForeignTousseApplicationManagerImpl.java

2:29 下午

jason

More
32749
changed 1 file
root:

解决jira问题：NFYY-29 增加外来器械包供应商收费功能及相应报表(修改发货单和包实例价格)

- -46
- +89
./forgon/disinfectsystem/foreigntoussecharge/service/ChargeSettingManagerImpl.java
- History
- Source
- Diff
./forgon/.../ChargeSettingManagerImpl.java

5:49 下午

jason

More
32734
changed 1 file
root:

解决jira问题：NFYY-29 增加外来器械包供应商收费功能及相应报表(修改发货单和包实例价格)

- -14
- +113
./forgon/disinfectsystem/foreigntoussecharge/service/ChargeSettingManagerImpl.java
- History
- Source
- Diff
./forgon/.../ChargeSettingManagerImpl.java

4:53 下午

jason

More
32731
changed 1 file
root:

解决jira问题：NFYY-29 增加外来器械包供应商收费功能及相应报表

- -4
- +32
./forgon/disinfectsystem/foreigntoussecharge/service/ChargeSettingManagerImpl.java
- History
- Source
- Diff
./forgon/.../ChargeSettingManagerImpl.java

3:35 下午

jason

More
32725
changed 4 files
root:

解决jira问题：NFYY-29 增加外来器械包供应商收费功能及相应报表

- -13
- +13
./forgon/disinfectsystem/foreigntoussecharge/service/ChargeSettingManagerImpl.java
- History
- Source
- Diff
./forgon/.../ChargeSettingManagerImpl.java
- -7
- +10
./forgon/disinfectsystem/foreigntoussecharge/service/ForeignTousseChargeModeManagerImpl.java
- History
- Source
- Diff
./forgon/.../ForeignTousseChargeModeManagerImpl.java
… 2 more files in changeset.

2:52 下午

jason

More
32722
changed 1 file
root:

解决：外来器械包申请单修改后，保存报错

- too large
./forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./forgon/.../ForeignTousseApplicationManagerImpl.java

2:06 下午

jason

More
32718
changed 1 file
root:

解决：外来器械包申请单修改后，保存报错

- too large
./forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./forgon/.../ForeignTousseApplicationManagerImpl.java

10:46 上午

jason

More
32710
changed 24 files
root:

解决jira问题：NFYY-29 增加外来器械包供应商收费功能及相应报表

./forgon/disinfectsystem/foreigntoussecharge
- History
- Source
./forgon/disinfectsystem/foreigntoussecharge
./forgon/disinfectsystem/foreigntoussecharge/action
- History
- Source
./forgon/disinfectsystem/.../action
- -0
- +76
./forgon/disinfectsystem/foreigntoussecharge/service/ForeignTousseChargeModeManagerImpl.java
- History
- Source
./forgon/.../ForeignTousseChargeModeManagerImpl.java
- -0
- +24
./forgon/disinfectsystem/foreigntoussecharge/service/ChargeSettingManager.java
- History
- Source
./forgon/.../ChargeSettingManager.java
- -0
- +89
./forgon/disinfectsystem/foreigntoussecharge/action/ChargeSettingAction.java
- History
- Source
./forgon/.../ChargeSettingAction.java
- -0
- +24
./forgon/disinfectsystem/foreigntoussecharge/service/ForeignTousseChargeModeManager.java
- History
- Source
./forgon/.../ForeignTousseChargeModeManager.java
- -0
- +131
./forgon/disinfectsystem/foreigntoussecharge/action/ForeignTousseSpecificationAction.java
- History
- Source
./forgon/.../ForeignTousseSpecificationAction.java
- -0
- +18
./forgon/disinfectsystem/foreigntoussecharge/service/ForeignTousseSpecificationManagerImpl.java
- History
- Source
./forgon/.../ForeignTousseSpecificationManagerImpl.java
- -0
- +407
./forgon/disinfectsystem/foreigntoussecharge/service/ChargeSettingManagerImpl.java
- History
- Source
./forgon/.../ChargeSettingManagerImpl.java
./forgon/disinfectsystem/foreigntoussecharge/service
- History
- Source
./forgon/disinfectsystem/.../service
- -0
- +14
./forgon/disinfectsystem/foreigntoussecharge/service/ForeignTousseSpecificationManager.java
- History
- Source
./forgon/.../ForeignTousseSpecificationManager.java
- -0
- +154
./forgon/disinfectsystem/foreigntoussecharge/action/ForeignTousseChargeModeAction.java
- History
- Source
./forgon/.../ForeignTousseChargeModeAction.java
… 12 more files in changeset.

10:38 上午

zc.li

More
32707
changed 3 files
root:

解决：NFYY-29 - 增加外来器械包供应商收费功能及相应报表

- too large
./forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./forgon/.../ForeignTousseApplicationManagerImpl.java
- -2
- +30
./forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
- History
- Source
- Diff
./forgon/.../ForeignTousseApplicationAction.java
- -0
- +10
./forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManager.java
- History
- Source
- Diff
./forgon/.../ForeignTousseApplicationManager.java

4:47 下午

shuyongfu

More
32669
changed 1 file
root:

解决:GDSRMYZHYY-40 器械包返消提交时提示："操作失败，请稍后再试！"

- too large
./forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./forgon/.../RecyclingApplicationManagerImpl.java

3:11 下午

zc.li

More
32639
changed 3 files
root:

解决 DGSETYY-19，外来器械包提前归还后回收状态及单据显示改进

- too large
./forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./forgon/.../ForeignTousseApplicationManagerImpl.java
- too large
./forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./forgon/.../InvoicePlanManagerImpl.java
… 1 more file in changeset.

4:57 下午

jason

More
32626
changed 1 file
root:

解决jira问题：DGKHYY-24 外来器械申请单多个器械包，查看申请物品列表时，每个器械包应只显示出该包对应的供应商

- too large
./forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./forgon/.../InvoicePlanManagerImpl.java

4:42 下午

jason

More
32624
changed 5 files
root:

解决jira问题：NFYY-30 借物管理模块借物单列表增加“最后归还时间“列

- too large
./forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./forgon/.../RecyclingApplicationManagerImpl.java
… 4 more files in changeset.

7:08 下午

zc.li

More
32572
changed 1 file
root:

完善：SZSDSRMYY-70 外来器械拆分小包在使用记录使用植入物时，二次回收查看大包时，能在大包中看到使用数量。

- -0
- +24
./forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
- History
- Source
- Diff
./forgon/.../ForeignTousseApplicationAction.java

4:58 下午

zc.li

More
32564
changed 1 file
root:

修复：SZSDSRMYY-70 二次回收每修改一次材料申请单备注开始位置会多一个分号的问题。

- too large
./forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./forgon/.../ForeignTousseApplicationManagerImpl.java

11:18 上午

zc.li

More
32558
changed 3 files
root:

解决：SZSDSRMYY-70 二次回收材料删除衍生的会删除一次回收过程中的材料信息及一次回收二次回收材料显示的处理

- too large
./forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./forgon/.../ForeignTousseApplicationManagerImpl.java
… 2 more files in changeset.

5:45 下午

jason

More
32551
changed 1 file
root:

解决jira问题：SSTS-455 申领多套外来器械，在回收时修改其中一套外来器械材料的回收数量，其他的外来器械会被删除

- too large
./forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./forgon/.../ForeignTousseApplicationManagerImpl.java

5:37 下午

shuyongfu

More
32549
changed 1 file
root:

解决:SZSDSRMYY-69 登记器械包返消的外来器械包，在回收页面显示出来的是外来器械包定义材料数量，应该显示为和这个外来器械包相关联的包实例材料数量

- too large
./forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./forgon/.../RecyclingApplicationManagerImpl.java

4:39 下午

zc.li

More
32539
changed 6 files
root:

解决：SZSDSRMYY-70，外来器械包申请单二次回收支持植入物回收数量根据使用数量自动生成以及非植入物回收数量修改

- too large
./forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./forgon/.../ForeignTousseApplicationManagerImpl.java
- -0
- +4
./forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
- History
- Source
- Diff
./forgon/.../ForeignTousseApplicationAction.java
… 4 more files in changeset.

6:49 下午

shuyongfu

More
32533
changed 3 files
root:

解决:SZSDSRMYY-69 登记器械包返消的外来器械包，在回收页面显示出来的是外来器械包定义材料数量，应该显示为和这个外来器械包相关联的包实例材料数量

- too large
./forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./forgon/.../RecyclingApplicationManagerImpl.java
… 2 more files in changeset.

3:16 下午