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

2:46 下午

zc.li

More
28747
changed 1 file
V4.1.0

处理追加需求：ZJJSRM-12。如果科室申领了A、B物品，但是在回收时把B物品删除不回收了，在打印回收汇总单时不需要把B物品打印出来,即使此时回收数量为0也不取申请数量；

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java

2:36 下午

zc.li

More
28746
changed 1 file
V4.1.0

修复旧BUG:BJDXZLYY-4。外来器械包申请单也会打印的问题;影响ZJJSRM-12也会打印外来器械包申请单；;

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java

2:19 下午

zc.li

More
28712
changed 3 files
V4.1.0

解决:ZJJSRM-21.标识牌回收时要允许从设置了物品科室共用配置的科室回收.

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordAction.java
… 2 more files in changeset.

6:19 下午

zc.li

More
28704
changed 1 file
V4.1.0

解决:PYQZYY-184。业务修改:回收时未入框就删除器械包,申请数量不为0的申请项tousseItem会被删除改回以前的为0的才删除。

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java

8:58 下午

zc.li

More
28692
changed 3 files
V4.1.0

解决:ZJJSRM-12.打印回收汇总单初始格式新增数量是否优先取回收数量.

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordAction.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManager.java

3:13 下午

zc.li

More
28675
changed 1 file
V4.1.0

修复ZSWY-109.扫描包外标签会产生两个申请物品的问题(不兼容旧代码);

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java

9:00 下午

zc.li

More
28635
changed 1 file
V4.1.0

修复:DGSDBZXYY-54.新旧标识牌一起回收保存后，打开这张回收单将其中一个标识牌移除再添加进去，保存。会导致该标识牌绑定的篮筐置为空闲状态，无法清洗。(修复删除后再加入篮筐的标识牌装配时扫描不出来的问题)

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java

6:24 下午

zc.li

More
28632
changed 1 file
V4.1.0

解决:DGSDBZXYY-54.新旧标识牌一起回收保存后，打开这张回收单将其中一个标识牌移除再添加进去，保存。会导致该标识牌绑定的篮筐置为空闲状态，无法清洗。

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java

2:22 下午

zc.li

More
28628
changed 1 file
V4.1.0

修复：NYSY-6。开启配置项查询手术间时历史回收记录不能显示的问题；

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java

2:20 下午

zc.li

More
28627
changed 1 file
V4.1.0

修复：NYSY-6。开启配置项查询手术间时历史回收记录不能显示的问题；

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
- History
- Source
- Diff
./src/.../RecyclingRecordListSqlGenerator.java

11:47 上午

zc.li

More
28624
changed 1 file
V4.1.0

优化：ZSWY-109;消毒物品通过扫描包外标签的条码回收后，看不到装配任务，出现大量积压的待装配物品的问题(增加对隔多代的消毒物品的处理)

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java

5:16 下午

zc.li

More
28616
changed 3 files
V4.1.0

解决：NYSY-6。二级供应室录入加急的回收单，申请科室也是二级供应室自己的，没有红色“急”字背景

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
- History
- Source
- Diff
./src/.../RecyclingRecordListSqlGenerator.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingRecordVo.java
- History
- Source
./src/main/java/.../vo/RecyclingRecordVo.java

10:49 上午

zc.li

More
28592
changed 1 file
V4.1.0

解决:PYQZYY-175.回收扫描篮筐条码,如果篮筐状态为清洗中或清洗完成，没有出现提示的问题;

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordAction.java

4:36 下午

jason

More
28583
changed 10 files
V4.1.0

解决jira问题：ZSRY-2 中山二院资产归属功能改进

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordAction.java
… 8 more files in changeset.

3:30 下午

zc.li

More
28580
changed 2 files
V4.1.0

解决：ZSWY-109;消毒物品通过扫描包外标签的条码回收后，看不到装配任务，出现大量积压的待装配物品的问题

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java
… 1 more file in changeset.

5:17 下午

zc.li

More
28554
changed 1 file
V4.1.0

修复:ZSWY-131 材料清洗类型只有一种，拆包入到不同的篮筐,有时会产生多条装配任务的问题；

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java

2:53 下午

zc.li

More
28549
changed 11 files
V4.1.0

修复:ZSWY-131 修复拆包清洗入筐保存后会参数多个篮筐实例的问题;修复一些场景会扫描到之前物品都被终止的篮筐的情况;

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManager.java
- History
- Source
- Diff
./src/.../RecyclingRecordTableManager.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordAction.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/TousseIntoBasketService.java
- History
- Source
- Diff
./src/main/.../vo/TousseIntoBasketService.java
… 7 more files in changeset.

11:07 上午

zc.li

More
28547
changed 5 files
V4.1.0

解决:ZSWY-131;物品入筐后终止申请单，篮筐状态置为空闲了，但是该篮筐还显示有装载的物品

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordAction.java
… 3 more files in changeset.

11:05 上午

zc.li

More
28546
changed 1 file
V4.1.0

完善：FSSZYY-4。注释补充

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManager.java

7:56 下午

jason

More
28543
changed 1 file
V4.1.0

解决jira问题：PYQZYY-173 番禺区中医院多手术室器械包流转功能改造

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java

7:18 下午

zc.li

More
28542
changed 2 files
V4.1.0

完善：FSSZYY-4。新增被回收过的物品不显示

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManager.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java

4:48 下午

zc.li

More
28540
changed 3 files
V4.1.0

解决：FSSZYY-4。科室申领的打印回收汇总单增加按科室名分组方式;

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManager.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordAction.java

5:33 下午

jason

More
28518
changed 2 files
V4.1.0

解决jira问题：PYQZYY-173 番禺区中医院多手术室器械包流转功能改造

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java
… 1 more file in changeset.

4:47 下午

zc.li

More
28515
changed 1 file
V4.1.0

修复：ZSWY-129。回收保存产生装配任务时，有时会报空指针的问题;

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java

2:32 下午

zc.li

More
28505
changed 3 files
V4.1.0

解决：DGSDBZXYY-45。历史回收记录列表显示手术间列并新增手术间查询及过滤功能;

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/dwr/table/RecyclingRecordTableManager.java
- History
- Source
- Diff
./src/.../RecyclingRecordTableManager.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java
- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
- History
- Source
- Diff
./src/.../RecyclingRecordListSqlGenerator.java

4:35 下午

zc.li

More
28498
changed 1 file
V4.1.0

完善：ZSWY-126。装配界面，勾选了器械包内的材料后，点击登记丢失或者登记报损按钮，能自动把勾选的物品填写到丢失或者报损的物品登记表 (1.2需求变更,后台不再接收packingTaskId参数及保存)

- ?
./src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java
- History
- Source
- Diff
./src/.../MaterialErrorDamageDetailManagerImpl.java

4:14 下午

zc.li

More
28495
changed 1 file
V4.1.0

解决：ZSWY-126。装配界面，勾选了器械包内的材料后，点击登记丢失或者登记报损按钮，能自动把勾选的物品填写到丢失或者报损的物品登记表

- ?
./src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java
- History
- Source
- Diff
./src/.../MaterialErrorDamageDetailManagerImpl.java

8:40 下午

zc.li

More
28488
changed 15 files
V4.1.0

解决：ZSWY-129。物品回收拆分放入多个清洗篮筐，通过完成清洗的篮筐进行装配后，会导致还没清洗的篮筐状态置为空闲的问题；

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java
… 14 more files in changeset.

6:37 下午

jason

More
28477
changed 1 file
V4.1.0

从Container表获取篮筐清洗分类类型，不直接取ClassifyBasket表上的清洗分类类型

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java

5:59 下午

jason

More
28476
changed 1 file
V4.1.0

解决jira问题：PYQZYY-173 番禺区中医院多手术室器械包流转功能改造

- ?
./src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
- History
- Source
- Diff
./src/main/.../RecyclingRecordManagerImpl.java

ssts-recyclingrecord

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)

zc.li

zc.li

zc.li

zc.li

zc.li

zc.li

zc.li

zc.li

zc.li

zc.li

zc.li

zc.li

zc.li

jason

zc.li

zc.li

zc.li

zc.li

zc.li

jason

zc.li

zc.li

jason

zc.li

zc.li

zc.li

zc.li

zc.li

jason

jason