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

ssts-wash

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 1
Total Committers: 12
Last Commit: 24 Feb 16
Commits this week: 1
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 18009 is being indexed.

Thursday 04 May 2017
8:02 下午

zengjc

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

wangyi

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

wangyi

完成：DGDHYY-18，清洗完成后支持可以删除
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • ?
    ./src/main/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
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • ?
    ./src/main/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
    • ?
    ./src/main/java/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
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
  5. … 1 more file in changeset.
Tuesday 24 Jan 2017
3:21 下午

chenjiaru

“清洗篮筐监控”和“虚拟篮筐监控”增加分页显示的功能
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/ClassifiedItemManager.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/ClassifiedItemManagerImpl.java
    • ?
    ./src/main/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
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
  2. … 1 more file in changeset.
3:57 下午

adairkang

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

chenjiaru

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

wangyi

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

wangyi

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

wangyi

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

chenjiaru

优化发货扫描条时，判断有植入物的器械包是否紧急发货的代码
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • ?
    ./src/main/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
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
Monday 19 Dec 2016
11:37 下午

chenjiaru

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

chenjiaru

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

zengjc

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

chenjiaru

解决：DGZYY-61 器械包信息清洗人获取数据改变
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
  3. … 9 more files in changeset.
Wednesday 14 Dec 2016
4:43 下午

chenjiaru

添加器械包定义时不可以添加外来器械材料
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
  3. … 9 more files in changeset.
Monday 12 Dec 2016
10:20 上午

wangyi

丢失报损关联清洗记录改进、装配增加全部丢失补充
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
  2. … 19 more files in changeset.
Thursday 08 Dec 2016
4:43 下午

chenjiaru

解决：ZSSZYY-58 篮筐监控增加搜索功能
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
  2. … 7 more files in changeset.
Tuesday 29 Nov 2016
6:06 下午

zengjc

清洗完成、清洗失败添加日志记录.
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
4:56 下午

zengjc

清洗记录的添加、修改、删除的操作写日志.
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
Thursday 24 Nov 2016
6:03 下午

zengjc

清洗记录列表，添加显示'今天'还是'全部'记录的过滤,添加配置清洗记录列表是否默认显示当天的，目前只有惠州中心人民医院配置，解决jira问题HZSRMYY-3.
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
  2. … 3 more files in changeset.
Tuesday 22 Nov 2016
9:54 上午

adairkang

日志记录客户端类型及版本(pda可以记录版本,pc还未有版本信息)
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
  2. … 6 more files in changeset.
Friday 18 Nov 2016
2:07 下午

adairkang

清洗交接添加状态验证，只有清洗完成才能进行清洗交接
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/ClassifiedItemManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/ClassifiedItemManager.java
  3. … 12 more files in changeset.
Wednesday 16 Nov 2016
11:27 上午

wangyi

修复清洗装载的篮筐，添加清洗记录是提示该篮筐已装配不能扫描
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
Tuesday 15 Nov 2016
6:49 下午

adairkang

清洗扫描添加日志记录
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
11:25 上午

wangyi

清洗器械入筐bug修复
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
  2. … 1 more file in changeset.