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: 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 20578 is being indexed.

Tuesday 31 Oct 2017
9:19 下午

liuliben

ZSYY-135 pc端添加清洗扫描器械包固定条码功能
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
  3. … 3 more files in changeset.
Wednesday 25 Oct 2017
8:58 下午

adairkang

清洗篮筐状态的处理及测试用例

在清洗完成的时候，如果篮筐为空，则状态变成空闲。

如果清洗失败，即使篮筐为空，状态也会回滚到清洗装载，在重新清洗完成后变成空闲

在删除装配任务的时候(手动删除装配任务或者终止申请单、终止申请单中的物品），如果篮筐为空并且是清洗完成状态，则状态变为装配完成。

Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
  3. … 9 more files in changeset.
Tuesday 24 Oct 2017
5:54 下午

adairkang

重构清洗记录Manager类的根据id查找的方法
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashDataLineChartAction.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
  6. … 3 more files in changeset.
Friday 20 Oct 2017
11:06 上午

adairkang

JMKQYY-4 回收清洗优化，清洗筐只有装配完成才能回收，做成默认配置，成都五冶、东莞市中医院、广州复大肿瘤、花都区人民医院、清远市人民医院、中大复一配置为可以回收
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
  2. … 6 more files in changeset.
10:41 上午

liuliben

解决：德阳添加清洗时提示该篮筐内部分物品已装配并打印标签，不能再次清洗的问题。清洗时获取的未清洗篮筐改为获取未清洗未装配任务的篮筐
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
  2. … 3 more files in changeset.
Thursday 19 Oct 2017
10:37 下午

adairkang

JMKQYY-4 回收清洗优化
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordComparator.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
  4. … 5 more files in changeset.
Monday 25 Sep 2017
3:09 下午

adairkang

PDA清洗添加扫描标识牌条码的处理
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
2:55 下午

zengjc

修复清洗扫描标识牌时，扫描标识牌删除，再扫描待清洗篮筐的节点不删除的问题，修复扫描标识牌保存清洗记录，打开显示篮筐条码的问题.
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
  2. … 1 more file in changeset.
Friday 22 Sep 2017
5:24 下午

zengjc

清洗界面直接扫描标识牌条码功能的完善。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
  2. … 4 more files in changeset.
Tuesday 19 Sep 2017
2:58 下午

adairkang

ZJYY-4 回收记录单页面增加保存并打印包内清点按钮
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
  2. … 19 more files in changeset.
Friday 01 Sep 2017
10:56 下午

adairkang

重构
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
  3. … 8 more files in changeset.
4:42 下午

adairkang

重构TousseDefinitionManager的根据id查找对象的方法
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
  2. … 18 more files in changeset.
Wednesday 30 Aug 2017
8:12 下午

adairkang

清洗记录Manager继承BasePoManager
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
  3. … 3 more files in changeset.
7:57 下午

adairkang

修改参数名称
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
Friday 25 Aug 2017
11:43 上午

adairkang

移动位置
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
  2. … 4 more files in changeset.
11:35 上午

adairkang

no_comment
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/ClassifiedItemManager.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/ClassifiedItemManagerImpl.java
Tuesday 22 Aug 2017
3:17 下午

zengjc

清洗记录的干预，在action的处理移到mannager类里面.
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
2:00 下午

zengjc

清洗记录保存的所有代码从action转移到manager里面，防止提示保存失败，缺实际保存成功某些属性的问题.
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
Monday 21 Aug 2017
6:48 下午

zengjc

修复启动清洗顺序时，手工清洗后，修改清洗机，能保存没有手工清洗篮筐的问题。
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
6:26 下午

adairkang

DGZYY-116 清洗记录增加限制,保存以后再打开也需要验证。可能打开后再添加篮筐
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
4:26 下午

adairkang

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

zengjc

解决jira问题DGZYY-116，添加清洗篮筐机洗之前，要先用手工清洗机清洗，其中判断清洗机是否手工清洗机，可以对清洗机进行配置，目前只有东莞中医院进行配置.
Options
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • ?
    ./src/main/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
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java
  3. … 3 more files in changeset.
11:29 上午

adairkang

清洗机Manager继承BasePoManager
Options
    • ?
    ./src/main/java/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
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/ClassifiedItemManagerImpl.java
3:23 下午

adairkang

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

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

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

zengjc

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

zengjc

触摸屏清洗，扫描清洗机条码，带出默认的清洗程序和清洗时间.
Options
    • ?
    ./src/main/java/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
    • ?
    ./src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
  2. … 3 more files in changeset.
Friday 05 May 2017
6:14 下午

zengjc

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