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

3:24 下午

shuyongfu

More
28124
changed 1 file
root:

代码优化,改为调用公共方法

- -8
- +2
./disinfectsystem/recyclingapplication/action/UntracableRecyclingApplicationAction.java
- History
- Source
- Diff
./disinfectsystem/.../UntracableRecyclingApplicationAction.java

3:21 下午

shuyongfu

More
28122
changed 5 files
root:

解决:BJCYLYY-38 微创手术室的申请单，出现装配数量大于申请数量的问题

(对pda端与pc的业务进行了整合、合到一起)

- -2
- +22
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManager.java
- -421
- +16
./disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationAction.java
- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java
- -4
- +6
./disinfectsystem/recyclingapplication/service/RecyclingApplicationComparator.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationComparator.java
… 1 more file in changeset.

6:55 下午

shuyongfu

More
28088
changed 1 file
root:

解决发货计划-打开科室的发货计划单查询待发货物品时,oracle数据库报错的问题(hql不能用连接符,只能用连接函数)

- -1
- +1
./disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanOptimizeManagerImpl.java

3:13 下午

shuyongfu

More
28084
changed 1 file
root:

解决发货计划-打开科室的发货计划单查询待发货物品时,oracle数据库报错的问题

- -2
- +4
./disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanOptimizeManagerImpl.java

10:03 上午

jason

More
28040
changed 1 file
root:

解决jira问题：DGZYY-166东莞中医院手术室器械包处理流程改造(借物单、物品预约单的申请项“是否回收”属性都设置为“否”)

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

9:56 上午

shuyongfu

More
28039
changed 6 files
root:

解决:DGZYY-166 手术室器械包处理流程改造

发货计划与发货、科室申请打印等处的处理

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

2:04 下午

jason

More
28035
changed 1 file
root:

解决jiar问题：DGZYY-166 东莞中医院手术室器械包处理流程改造

- -2
- +2
./disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationAction.java

9:59 上午

jason

More
28029
changed 6 files
root:

解决jiar问题：DGZYY-166 东莞中医院手术室器械包处理流程改造(科室申领添加【物品预约单】)

- -2
- +3
./disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationAction.java
- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java
… 4 more files in changeset.

12:03 下午

shuyongfu

More
27939
changed 1 file
root:

解决jira问题：SZSDSRMYY-8 深圳市第三人民医院待发货物品颜色状态显示

ASSZDFY-66发货计划模块，打开手术室的发货界面加载待发货的物品很慢

发货优化后,待发货列表消毒物品背景色的问题(有已消毒状态的包、但该消毒物品的背景未变成蓝色(还是显示黄色))、增加对有已消毒状态的包的背景色设置成蓝色

- -2
- +2
./disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanOptimizeManagerImpl.java

8:55 下午

shuyongfu

More
27903
changed 2 files
root:

解决:ASSZDFY-66 发货计划模块，打开手术室的发货界面加载待发货的物品很慢

加急的申请单发货完成后的申请单及申请项的几个加急字段的联动处理

- -1
- +2
./disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanOptimizeManagerImpl.java
… 1 more file in changeset.

4:31 下午

shuyongfu

More
27849
changed 1 file
root:

发货细节处理,解决manager层的方法返回的数据为null时,会导致前端页面的进度条不能关闭的问题

- -2
- +6
./disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanAction.java

2:33 下午

shuyongfu

More
27843
changed 1 file
root:

解决:ASSZDY-66发货计划模块，打开手术室的发货界面加载待发货的物品很慢

针对申请单的申请科室编码在组织机构不存的情况进行了过滤,防止出现异常导致发货计划列表页面数据出不来

- -1
- +5
./disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanOptimizeManagerImpl.java

8:37 下午

shuyongfu

More
27818
changed 1 file
root:

解决:ASSZDY-66发货计划模块，打开手术室的发货界面加载待发货的物品很慢

处理发货计划待发货物品列表加急数量显示错误的问题

- -4
- +4
./disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanOptimizeManagerImpl.java

8:02 下午

shuyongfu

More
27817
changed 1 file
root:

解决:ASSZDY-66发货计划模块，打开手术室的发货界面加载待发货的物品很慢

待发货计划列表科室顺序调整

- -1
- +2
./disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanOptimizeManagerImpl.java

7:38 下午

shuyongfu

More
27816
changed 2 files
root:

解决:ASSZDFY-66发货计划模块，打开手术室的发货界面加载待发货的物品很慢

待发货物品明细排序调整、排序语句纠正

- -2
- +1
./disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanOptimizeManagerImpl.java
- too large
./disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanManagerImpl.java

4:10 下午

shuyongfu

More
27815
changed 2 files
root:

解决:ASSZDFY-66发货计划模块，打开手术室的发货界面加载待发货的物品很慢

处理退货重发、回收申请单发货、已灭菌包变背景色等问题

- -0
- +46
./disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanOptimizeManagerImpl.java
… 1 more file in changeset.

10:40 上午

shuyongfu

More
27812
changed 20 files
root:

解决:ASSZDFY-66发货计划模块，打开手术室的发货界面加载待发货的物品很慢

- -2
- +47
./disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanManager.java
- -3
- +53
./disinfectsystem/recyclingapplication/vo/InvoicePlanVo.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanVo.java
- -62
- +143
./disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanAction.java
- -0
- +1612
./disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
- History
- Source
./disinfectsystem/.../InvoicePlanOptimizeManagerImpl.java
- too large
./disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanManagerImpl.java
- -3
- +33
./disinfectsystem/recyclingapplication/vo/ApplicationGoodsVo.java
- History
- Source
- Diff
./disinfectsystem/.../ApplicationGoodsVo.java
… 14 more files in changeset.

6:13 下午

zc.li

More
27779
changed 6 files
root:

解决：zyyfs-135加急的外来器械申请单在清洗完成后，在装配管理里没显示对应的清洗篮筐，清洗时间，回收时间，没显示加急的颜色标识;

zyyfs-136,修复装配界面加急的外来器械包拆包按钮不显示的问题;外来器械包拆包支持加急;

- too large
./disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanManagerImpl.java
- -1
- +42
./disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../ForeignTousseApplicationManagerImpl.java
- -0
- +6
./disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
- History
- Source
- Diff
./disinfectsystem/.../ForeignTousseApplicationAction.java
… 3 more files in changeset.

3:37 下午

jason

More
27707
changed 1 file
root:

解决jira问题：GDSRMYY-520 广东省人民医院当一个科室有2张或以上的一次性物品申请单，批量打印发货计划合并科室会打印出重复单据

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

7:54 下午

jason

More
27674
changed 1 file
root:

解决jira问题：GGSRMYY-122 贵港市人民医院一次性物品入库时更改价格后，在科室申领处看见的还是更改之前的价格(申请模板一次性物品单价)

- -3
- +5
./disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../DepartmentAppTemplateManagerImpl.java

9:40 上午

jason

More
27649
changed 2 files
root:

解决jira问题：ASSQFYY-10 售后-祈福医院系统“是否自动合并申请单”设置为“是”但未自动合并临床科室申请单

- too large
./disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../RecyclingApplicationManagerImpl.java
… 1 more file in changeset.

5:00 下午

jason

More
27645
changed 2 files
root:

解决jira问题：SZSDSRMYY-8 深圳市第三人民医院待发货物品颜色状态显示(后台只返回灭菌状态，不处理加急状态)

- -5
- +0
./disinfectsystem/recyclingapplication/vo/ApplicationGoodsVo.java
- History
- Source
- Diff
./disinfectsystem/.../ApplicationGoodsVo.java
- too large
./disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanManagerImpl.java

9:14 下午

jason

More
27625
changed 1 file
root:

解决jira问题：SZSDSRMYY-8 深圳市第三人民医院待发货物品颜色状态显示(外来器械拆分小包状态判断)

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

10:36 上午

jason

More
27620
changed 2 files
root:

解决jira问题：SZSDSRMYY-8 深圳市第三人民医院待发货物品颜色状态显示(一次性物品申请单合并后，发货计划看不到一次性物品)

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

4:47 下午

jason

More
27619
changed 1 file
root:

解决jira问题：SZSDSRMYY-8 深圳市第三人民医院待发货物品颜色状态显示(物品排列顺序调整)

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

9:12 上午

jason

More
27616
changed 1 file
root:

解决jira问题：SZSDSRMYY-8 深圳市第三人民医院待发货物品颜色状态显示(加急物品排序)

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

5:42 下午

jason

More
27609
changed 2 files
root:

解决jira问题：SZSDSRMYY-8 深圳市第三人民医院待发货物品颜色状态显示

- too large
./disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePlanManagerImpl.java
- -0
- +28
./disinfectsystem/recyclingapplication/vo/ApplicationGoodsVo.java
- History
- Source
- Diff
./disinfectsystem/.../ApplicationGoodsVo.java

7:55 下午

jason

More
27590
changed 1 file
root:

解决jira问题：DGSFYBJY-31 东莞市妇幼保健院物品绑定设置后，在科室申领模板里填写的申请单不能自动填写绑定的包

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

9:14 下午

shuyongfu

More
27551
changed 2 files
root:

解决:ASSZNSRMYY-8 外来器械包干预的【重新拆包】功能增强

- -1
- +5
./disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../ForeignTousseApplicationManagerImpl.java
… 1 more file in changeset.

1:43 下午

zc.li

More
27543
changed 8 files
root:

完善：SZSDSRMYY-5。器械包工作量统计报表中修改器械件数统计方式中，不开配置项也会计算拆分数量。

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

forgon

Line History

Stats

Commits this week: 7

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

shuyongfu

shuyongfu

shuyongfu

shuyongfu

jason

shuyongfu

jason

jason

shuyongfu

shuyongfu

shuyongfu

shuyongfu

shuyongfu

shuyongfu

shuyongfu

shuyongfu

shuyongfu

zc.li

jason

jason

jason

jason

jason

jason

jason

jason

jason

jason

shuyongfu

zc.li