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

java

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 12
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 19623 is being indexed.

Monday 21 Aug 2017
4:26 下午

adairkang

DGZYY-116 清洗记录增加限制
Options
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
  4. … 1 more file in changeset.
2:31 下午

zengjc

解决jira问题DGZYY-116，添加清洗篮筐机洗之前，要先用手工清洗机清洗，其中判断清洗机是否手工清洗机，可以对清洗机进行配置，目前只有东莞中医院进行配置.
Options
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
  4. … 5 more files in changeset.
Wednesday 16 Aug 2017
1:42 下午

adairkang

ZSYY-122 设备接口循环次数在PDA上没有自动记录

清洗和灭菌都记录循环次数。界面上不显示，后台程序自动添加

Options
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
  3. … 3 more files in changeset.
11:29 上午

adairkang

清洗机Manager继承BasePoManager
Options
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
  2. … 5 more files in changeset.
Wednesday 05 Jul 2017
7:57 下午

adairkang

取消ClassifiedItemManagerImpl中objectDao，父类有
Options
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/ClassifiedItemManagerImpl.java
3:23 下午

adairkang

GDSRMYY-334 增加回收清点时自动归还借物功能

之前清洗交接未提交的代码

Options
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
  2. … 63 more files in changeset.
Friday 12 May 2017
5:31 下午

zengjc

待清洗篮筐列表，不添加重复的篮筐条码，避免清洗界面的待清洗篮筐列表出现重复的篮筐.
Options
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
11:06 上午

zengjc

触摸屏清洗，扫描清洗机条码，带出默认的清洗程序和清洗时间.
Options
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
  2. … 3 more files in changeset.
Thursday 11 May 2017
6:00 下午

zengjc

解决jira问题HZSRMYY-21，清洗机可以配置默认的清洗程序，在添加清洗记录的界面选择清洗机是，如果有默认清洗程序则显示，也会带出相关的清洗时间和清洗参数.
Options
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
  2. … 3 more files in changeset.
Friday 05 May 2017
6:14 下午

zengjc

清洗记录干预，在干预信息提交前获取清洗记录的信息，准确地把干预前后信息写日志。
Options
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
  3. … 1 more file in changeset.
2:02 下午

zengjc

1.把能否修改清洗记录的判断放到提交保存之前,避免装配时间比清洗时间早时，选择提交缺还校验不通过的情况.

2.干预清洗记录信息(不是干预状态)添加日志.

Options
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
  5. … 1 more file in changeset.
Thursday 04 May 2017
8:02 下午

zengjc

解决jira问题PYQZYY-153，当 前时间在清洗结束时间之后，则不允许再修改该清洗记录，增加清洗干预功能，在清洗记录篮筐的物品没有装配的情况下， 可以干预清洗记录，包括清洗记录的状态、添加和删除清洗篮筐，清洗时间、责任人等信息.
Options
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
  5. … 10 more files in changeset.
Tuesday 18 Apr 2017
5:43 下午

wangyi

修复删除清洗记录时，如果篮筐实例并非最新的篮筐实例，这个时候不能回滚篮筐状态
Options
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
2:52 下午

wangyi

完成：DGDHYY-18，清洗完成后支持可以删除
Options
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
  4. … 4 more files in changeset.
Sunday 16 Apr 2017
1:28 下午

zengjc

解决jira问题GDSRMYY-296,GDSRMYY-306,清洗区工作量不合格报表，设置手术器械科室后对旧的数据也生效，添加设置科室分组，分组的清洗数据会列到查询结果中;设置科室分组的功能做成了配置，目前只有广东省医进行配置.
Options
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
  3. … 17 more files in changeset.
Friday 24 Mar 2017
11:13 上午

chenjiaru

解决jira问题：HZSRMYY-13 发货管理查询优化
Options
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
  2. … 5 more files in changeset.
Monday 20 Mar 2017
10:19 上午

zengjc

解决jira问题: DGDHYY-102,清洗时间修改后的联动修改，修改了清洗时间，会联动修改装配任务，器械包信息的时间，当天装配记录中的清洗时间.
Options
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
  5. … 1 more file in changeset.
Tuesday 24 Jan 2017
3:21 下午

chenjiaru

“清洗篮筐监控”和“虚拟篮筐监控”增加分页显示的功能
Options
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/ClassifiedItemManager.java
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/ClassifiedItemManagerImpl.java
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
  6. … 8 more files in changeset.
Friday 13 Jan 2017
4:05 下午

zengjc

清洗机不需要使用清洗完成功能，则界面上，清洗完成和清洗失败按钮要联动隐藏,解决jira问题ZSSZYY-64.
Options
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
  2. … 1 more file in changeset.
3:57 下午

adairkang

清洗记录鼠标移上去出现DIV显示清洗的篮筐及内容物(ZSSZYY-69)
Options
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
  5. … 1 more file in changeset.
Wednesday 28 Dec 2016
7:23 下午

chenjiaru

给器械包信息列表的"清洗人"做了联动修改
Options
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
  2. … 2 more files in changeset.
Tuesday 27 Dec 2016
7:54 下午

wangyi

修复清洗篮筐特殊情况篮筐状态错误bug
Options
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
Monday 26 Dec 2016
6:31 下午

wangyi

修复外来器械修改植入物属性未生效
Options
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
  2. … 13 more files in changeset.
Friday 23 Dec 2016
2:08 下午

wangyi

修复回收更新清洗记录器械材料未统计问题
Options
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
  3. … 1 more file in changeset.
10:33 上午

chenjiaru

优化发货扫描条时，判断有植入物的器械包是否紧急发货的代码
Options
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
  3. … 6 more files in changeset.
Wednesday 21 Dec 2016
5:13 下午

zengjc

添加清洗记录时，待清洗篮筐列表只显示当前登录用户所在科室的，解决jira问题ZSSZYY-63.
Options
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
Monday 19 Dec 2016
11:37 下午

chenjiaru

解决：DGZYY-61 器械包信息清洗人获取数据改变
Options
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
11:09 下午

chenjiaru

解决：DGZYY-61 器械包信息清洗人获取数据改变
Options
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
  2. … 2 more files in changeset.
8:00 下午

zengjc

修正清洗机在清洗中，却还能添加清洗记录的问题,解决jira问题zssxlrmyy-113.
Options
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
Thursday 15 Dec 2016
6:37 下午

chenjiaru

解决：DGZYY-61 器械包信息清洗人获取数据改变
Options
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • ?
    ./com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
  3. … 9 more files in changeset.