forgon-ssts-v4.1 / SterileSupplySystem / branches / V4.1.0 / ssts-packing / src / main

java

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 15
Last Commit: 24 Feb 16
Commits this week: 0
Total Lines of Code (LoC): 0
Net change in LoC this week: 0

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 17443 is being indexed.

Monday 20 Mar 2017
6:18 下午

jeffli

解决：GDSRMYY-287

器械包定义中增加‘是否允许修改包装类型’配置项目

Options
    • ?
    ./com/forgon/disinfectsystem/packing/vo/WaitPackingTaskVo.java
    • ?
    ./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    ./com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java
  4. … 1 more file in changeset.
5:40 下午

chenjiaru

优化查询清洗交接记录视图列表的sql语句
Options
    • ?
    ./com/forgon/disinfectsystem/washTransition/action/WashTransitionRecordAction.java
5:14 下午

chenjiaru

解决jira问题：ZSYY-30 PC端上增加清洗交接记录汇总查询
Options
    • ?
    ./com/forgon/disinfectsystem/washTransition/action/WashTransitionRecordAction.java
  2. ./com/forgon/disinfectsystem/washTransition/action
  3. … 8 more files in changeset.
Saturday 18 Mar 2017
5:37 下午

shuyongfu

解决jira问题:HDQRMYY-21 二级供应室增加如果不是自己科室的器械时，需手动发货

旧数据也已增加升级脚本自动升级

Options
    • ?
    ./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
Wednesday 15 Mar 2017
5:35 下午

jeffli

暂时屏蔽功能：

装配时废弃标识牌之后自动新建一个使用中的实例

Options
    • ?
    ./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
4:43 下午

jeffli

解决：GZFDZL-100

器械包管理下面增加新页面，“标识牌信息”页面。

改进自动废弃标识牌功能，废弃之后自动新建一个使用中的实例

Options
    • ?
    ./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
  2. … 10 more files in changeset.
Tuesday 14 Mar 2017
3:55 下午

jeffli

解决：GZFDZL-101

器械包属性增加一个“标识牌自动废弃”属性。

Options
    • ?
    ./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
  2. … 4 more files in changeset.
Sunday 12 Mar 2017
11:02 下午

wangyi

完成：ZSYY-28，装配扫篮筐自动获取标识牌条码装配
Options
    • ?
    ./com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java
    • ?
    ./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • ?
    ./com/forgon/disinfectsystem/packing/service/PackingManager.java
    • ?
    ./com/forgon/disinfectsystem/packing/vo/WaitPackingTaskVo.java
  5. … 10 more files in changeset.
Friday 10 Mar 2017
10:09 下午

adairkang

SSTS-103 PDA使用记录模块登记异常包的提示不准确
Options
    • ?
    ./com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
  2. … 2 more files in changeset.
Wednesday 08 Mar 2017
5:00 下午

jeffli

解决bug：

自定义装配不追溯的消毒物品，打印出来的不是固定条码

Options
    • ?
    ./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
11:19 上午

jeffli

解决bug：

自定义装配和普通装备，打印出来的消毒物品不一致

Options
    • ?
    ./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
  2. … 1 more file in changeset.
10:13 上午

jeffli

解决bug：

自定义装配和普通装备，打印出来的消毒物品不一致

Options
    • ?
    ./com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java
  2. … 1 more file in changeset.
9:47 上午

chenjiaru

解决：器械包告警那里，查所有科室的视图和单独查看某一科室视图，同一科室数量对上的问题
Options
    • ?
    ./com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
Tuesday 07 Mar 2017
5:51 下午

jeffli

改进：GDSRMYY-269

消毒物品可通过自定义装配进行装配

Options
    • ?
    ./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
  2. … 2 more files in changeset.
Friday 03 Mar 2017
3:00 下午

chenjiaru

解决jira两个问题：

GZFDZL-97 告警管理，增加导出excel功能。

GZFDZL-96 告警管理，点击查看所有科室页面，需要增加失效起止过滤条件。

Options
    • ?
    ./com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
  2. … 5 more files in changeset.
Thursday 02 Mar 2017
11:52 上午

wangyi

完成：#GDSRMYY-270，聚合包支持多个所属科室
Options
    • ?
    ./com/forgon/disinfectsystem/packing/service/PackingManager.java
    • ?
    ./com/forgon/disinfectsystem/packing/action/PackingAction.java
    • ?
    ./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
  4. … 2 more files in changeset.
Sunday 26 Feb 2017
10:09 下午

adairkang

重写生成库存对象的方法，原方法删除
Options
    • ?
    ./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
  2. … 10 more files in changeset.
Saturday 25 Feb 2017
2:20 下午

chenjiaru

解决jira问题：ZSWY-66 器械包库存列表增加汇总数据
Options
    • ?
    ./com/forgon/disinfectsystem/packing/dwr/table/TousseGoodsStockTableManager.java
  2. … 6 more files in changeset.
Thursday 23 Feb 2017
12:54 下午

wangyi

解决：ZSWY-62，补充后修改、删除丢失报损记录，已及材料不同价格补充的缺陷
Options
    • ?
    ./com/forgon/disinfectsystem/packing/service/PackingManager.java
    • ?
    ./com/forgon/disinfectsystem/packing/action/PackingAction.java
    • ?
    ./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
  4. … 21 more files in changeset.
Wednesday 22 Feb 2017
7:10 下午

shuyongfu

解决jira问题：ZSSZYY-96 同一炉物品灭菌正常，有一个器械包状态为已审核

灭菌装载增加限制,只能对状态为已审核的器械包从灭菌筐移除

Options
    • ?
    ./com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
  2. … 3 more files in changeset.
3:14 下午

jeffli

解决bug：

自定义装配，自定义标签模板中分开的科室没打印出来

Options
    • ?
    ./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
Monday 20 Feb 2017
8:08 下午

chenjiaru

补上发货时针对“有植入物的器械包”提示其生物监测的情况的功能的测试用例，此次提交没有关联jira
Options
    • ?
    ./com/forgon/disinfectsystem/packing/service/PackingManager.java
    • ?
    ./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
  3. … 7 more files in changeset.
7:18 下午

jeffli

解决：DYSYY-6

重构自定义装配打印代码，支持资产归属和回收科室的配置

Options
    • ?
    ./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
  2. … 1 more file in changeset.
11:31 上午

wangyi

修复外来器械拆包的时候JSON转换报死循环错误问题
Options
    • ?
    ./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
Saturday 18 Feb 2017
5:02 下午

jeffli

解决 DYSYY-15

解决 DYSYY-10

解决 DYSYY-6

折扣价处理，装配打印科室，是否发货

Options
    • ?
    ./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
  2. … 2 more files in changeset.
Friday 17 Feb 2017
7:13 下午

jeffli

解决 DYSYY-15

解决 DYSYY-10

解决 DYSYY-6

折扣价处理，装配打印科室，是否发货

Options
    • ?
    ./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
  2. … 9 more files in changeset.
6:01 下午

shuyongfu

DYSYY-6 供应室的基数包，不管回收来自哪个科室，都打印科室为供应室。

DYSYY-10 器械包定义增加【是否发货】字段

DYSYY-15 折扣价问题的个性化需求改进

针对以上三个问题的功能开发

Options
    • ?
    ./com/forgon/disinfectsystem/packing/action/PackingAction.java
    • ?
    ./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
  3. … 11 more files in changeset.
Monday 13 Feb 2017
3:25 下午

wangyi

修复重新打印聚合包时，修改包装类型后普通器械包没跟着修改
Options
    • ?
    ./com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
  2. … 1 more file in changeset.
Sunday 12 Feb 2017
6:11 下午

chenjiaru

在器械包信息列表那里完善聚合包的一些追溯信息的显示
Options
    • ?
    ./com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
  2. … 14 more files in changeset.
Friday 10 Feb 2017
4:19 下午

wangyi

修复聚合包内普通器械包装配任务有丢失报损不补充不让装配；修复未清洗不让装配聚合包问题，质量监测暂时不能录入聚合包
Options
    • ?
    ./com/forgon/disinfectsystem/packing/action/PackingAction.java
  2. … 2 more files in changeset.