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

src

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 1
Total Committers: 16
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 22296 is being indexed.

Tuesday 30 Jan 2018
5:03 下午

adairkang

ZSYY-219 PC端灭菌管理增加打印灭菌记录明细功能
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionItemManagerImpl.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionItemManager.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
  6. ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/vo
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/vo/SterilizationRecordPrintTousseItem.java
  8. … 5 more files in changeset.
1:39 下午

jeffli

增加外部代理灭菌单的部分物品终止功能

中山市小榄人民医院ZSSXLRMYY-155

Options
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManager.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/action/ForeignProxyDisinfectionAction.java
  4. … 3 more files in changeset.
Tuesday 23 Jan 2018
7:30 下午

chenjiaru

jira问题：ZSYY-214 PC端灭菌交接记录优化
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java
  2. … 1 more file in changeset.
4:09 下午

chenjiaru

jira问题：ZSYY-214 PC端灭菌交接记录优化
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java
  3. … 6 more files in changeset.
3:48 下午

alan.lee

更新包失效日期 现在改成 ： 当前灭菌时间+保质期 。以前是用失效期+保质期
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
1:46 下午

alan.lee

1.更新包的失效日期代码从Action提取到manager中

2.今天已审核待灭菌物品，提高查询速度

Options
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
  3. … 1 more file in changeset.
11:52 上午

adairkang

灭菌交接打印
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManager.java
  2. ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/vo
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/vo/SterilizationTransitionPrintData.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/vo/SterilizationTransitionPrintItem.java
  7. … 8 more files in changeset.
9:51 上午

chenjiaru

jira问题：ZSYY-214 PC端灭菌交接记录优化（部分代码的提交）
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java
  3. … 4 more files in changeset.
1:31 上午

chenjiaru

jira问题：ZSYY-214 PC端灭菌交接记录优化（部分代码的提交）
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java
  3. … 8 more files in changeset.
Monday 22 Jan 2018
8:11 下午

adairkang

PDA端清洗交接
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionItemManagerImpl.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionItemManager.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManager.java
  5. … 5 more files in changeset.
4:46 下午

chenjiaru

jira问题：ZSYY-206 增加灭菌交接功能（部分代码的提交）
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java
  3. … 5 more files in changeset.
3:42 下午

chenjiaru

jira问题：ZSYY-206 增加灭菌交接功能（部分代码的提交）
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java
  3. … 6 more files in changeset.
Sunday 21 Jan 2018
10:50 下午

chenjiaru

jira问题：ZSYY-206 增加灭菌交接功能（部分代码的提交）
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionItemManagerImpl.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionItemManager.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManager.java
  6. … 18 more files in changeset.
Friday 19 Jan 2018
8:14 下午

alan.lee

灭菌完成后去更新包的失效日期
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
10:47 上午

chenjiaru

jira问题：ZSYY-206 增加灭菌交接功能（部分代码的提交）
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java
  2. ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition
  3. ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManager.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java
  6. ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service
  7. … 11 more files in changeset.
Thursday 18 Jan 2018
6:10 下午

shuyongfu

解决状态为灭菌中的灭菌记录的器械包从列表删除后(只是从灭菌物品列表里删除,并未点保存),然后重新载入(或扫描被删除的包条码)及一键入炉不成功的问题
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
  4. … 1 more file in changeset.
Wednesday 17 Jan 2018
3:35 下午

alan.lee

解决：1.添加灭菌记录，篮筐和固定条码冲突的问题

2.灭菌装载单个固定条码不能载入的问题

Options
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
  2. … 1 more file in changeset.
1:49 下午

alan.lee

灭菌装载页面针对固定条码，汇总
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java
  2. … 4 more files in changeset.
Tuesday 16 Jan 2018
10:23 上午

alan.lee

1.灭菌转载新增分组删除功能

2.Acton提取到manager

3.代码优化 (long)0 改成0L

4.获取固定条码的方法重构

Options
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
  4. … 7 more files in changeset.
Monday 15 Jan 2018
3:29 下午

alan.lee

灭菌固定条码修改数量，关于最大值的修改
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
  2. … 3 more files in changeset.
Sunday 14 Jan 2018
4:37 上午

alan.lee

解决：中山一院消毒供应项目ZSYY-198

不追溯物品灭菌记录和灭菌装载优化

Options
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java
  2. … 7 more files in changeset.
Saturday 13 Jan 2018
8:12 下午

alan.lee

灭菌记录：一键入炉如果存在固定条码，则去做汇总
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
  2. … 1 more file in changeset.
Friday 12 Jan 2018
9:32 上午

alan.lee

灭菌记录代码优化
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
  2. … 2 more files in changeset.
Thursday 11 Jan 2018
5:37 下午

alan.lee

灭菌记录bug:

1、修改数量后（比如：数量由100修改为10），点击保存，修改的数量不生效

2、查看已灭菌的记录，后台报错

3、新增，扫篮筐，篮筐数量显示不对，数量多了1

4、装不追溯物品的篮筐，保存后，篮筐条码变成不追溯的固定条码

5、原本的记录有不入筐不追溯物品，也有已入筐的不追溯物品，打开灭菌记录，扫第二次固定条码，数量加在原本的篮筐数量上（只剩下篮筐这一行，篮筐下没有东西，也不能展开）

6、新增记录，扫两个篮筐，一个篮筐是放不追溯物品，保存。打开灭菌记录，扫描不追溯的固定条码，提示条码已存在

7、重新灭菌保存后，灭菌记录里没有物品

8.兼容oracle

Options
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
  3. … 3 more files in changeset.
3:09 下午

alan.lee

灭菌记录解决Bug:

1.修改数量后，立刻点击保存，修改的数量不生效

2.灭菌记录的上部分填写的数据不见了

3.篮筐数量

Options
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
  3. … 1 more file in changeset.
Wednesday 10 Jan 2018
4:33 下午

alan.lee

灭菌记录代码改进
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
  3. … 3 more files in changeset.
3:32 下午

alan.lee

解决灭菌记录Bug:

1.扫描固定条码，显示未定义

2.打开灭菌记录，删除包后在打开还在里面

3.加载篮筐后，只显示一条数据

Options
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
  3. … 2 more files in changeset.
11:57 上午

alan.lee

灭菌记录扫固定条码，不是当天的包也可扫描
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
  3. … 2 more files in changeset.
Tuesday 09 Jan 2018
6:37 下午

alan.lee

解决bug：点开灭菌记录后，允许修改数量
Options
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
  2. … 1 more file in changeset.
5:31 下午

alan.lee

灭菌记录 解决Bug: 1，灭菌记录，如果只有一个固定条码，会显示成唯一条码 2.固定条码删除或修改数量， 不仅仅是已审核的，还有灭菌中的

完善细节：固定条码修改数量，可能加载比较慢，将保存按钮禁用，后台修改完以后启用

Options
    • ?
    ./main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
  2. … 2 more files in changeset.