Activity forgon-ssts-v4.1.0/ssts-userecord/src

Tree
Accordion

Stats

Commits this week: 0

Total Committers:	13
Last Commit:	14 Feb 16
Commits this week:	0
Total Lines of Code (LoC):	38,535
Net change in LoC this week:	0

Commit Activity

last updated a few seconds ago

Constraints

Constraints: committers

Committer:

Log Comment:

Constraints: files

File Extension:

File Name:

Constraints: dates

Start Date:

End Date:

Friday 07 Apr 2017

10:24 上午

shuyongfu

More
17646
added 10 files
root:

解决jira问题:

LJSRMYY-2 开发与手麻的接口

以及中六、中山眼科之前4.0代码的调整

./main/java/com/forgon/disinfectsystem/useRecord/hrepPath/zsykzx
- History
- Source
./main/java/com/.../useRecord/hrepPath/zsykzx
- -0
- +344
./main/java/com/forgon/disinfectsystem/useRecord/hrepPath/ljsrmyy/LyUseRecordMainResult.java
- History
- Source
./main/java/.../ljsrmyy/LyUseRecordMainResult.java
./main/java/com/forgon/disinfectsystem/useRecord/hrepPath/ljsrmyy
- History
- Source
./main/java/com/.../useRecord/hrepPath/ljsrmyy
./main/java/com/forgon/disinfectsystem/useRecord/hrepPath/zsly
- History
- Source
./main/java/com/forgon/.../useRecord/hrepPath/zsly
./main/java/com/forgon/disinfectsystem/useRecord/hrepPath
- History
- Source
./main/java/com/.../useRecord/hrepPath
- -0
- +455
./main/java/com/forgon/disinfectsystem/useRecord/hrepPath/zsly/HerpPathManagerImpl.java
- History
- Source
./main/java/com/.../zsly/HerpPathManagerImpl.java
- -0
- +512
./main/java/com/forgon/disinfectsystem/useRecord/hrepPath/CommonHerpPathManagerImpl.java
- History
- Source
./main/java/.../CommonHerpPathManagerImpl.java
- -0
- +24
./main/java/com/forgon/disinfectsystem/useRecord/hrepPath/HerpPathManager.java
- History
- Source
./main/java/com/.../hrepPath/HerpPathManager.java
- -0
- +539
./main/java/com/forgon/disinfectsystem/useRecord/hrepPath/ljsrmyy/HerpPathManagerImpl.java
- History
- Source
./main/java/.../ljsrmyy/HerpPathManagerImpl.java
- -0
- +545
./main/java/com/forgon/disinfectsystem/useRecord/hrepPath/zsykzx/HerpPathManagerImpl.java
- History
- Source
./main/java/com/.../zsykzx/HerpPathManagerImpl.java

10:20 上午

shuyongfu

More
17643
changed 26 files
root:

解决jira问题:

ZSYY-38 使用记录转申请单改成按手术间号合并

ZSYY-39 手术预约发货增加以第二手术名称物品发货功能

ZSYY-40 使用记录的手术间号读取手术预约单的手术间

LJSRMYY-2 开发与手麻的接口

oracle数据库环境下某些标识符过长的问题

- -47
- +61
./main/java/com/forgon/disinfectsystem/operationSchedule/service/OperationScheduleManagerImpl.java
- History
- Source
- Diff
./main/.../OperationScheduleManagerImpl.java
- -2
- +22
./main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
- History
- Source
- Diff
./main/java/.../service/UseRecordManager.java
- too large
./main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
- History
- Source
- Diff
./main/java/.../UseRecordManagerImpl.java
… 23 more files in changeset.

Friday 31 Mar 2017

12:29 下午

adairkang

More
17563
changed 1 file
root:

ZSYY-41 PDA端使用记录提交后没有刷新列表

- too large
./main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
- History
- Source
- Diff
./main/java/.../UseRecordManagerImpl.java

Thursday 30 Mar 2017

9:47 上午

shuyongfu

More
17544
changed 7 files
root:

解决jira问题:HZSRMYY-18 病人接口更新字段

- too large
./main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
- History
- Source
- Diff
./main/java/.../UseRecordManagerImpl.java
- -0
- +12
./main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
- History
- Source
- Diff
./main/java/.../action/UseRecordAction.java
… 5 more files in changeset.

Wednesday 29 Mar 2017

5:51 下午

zhonghaowen

More
17543
changed 2 files
root:

ZSSZYY-97:使用记录干预添加器械包修改回原来的判断逻辑

- -3
- +1
./main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
- History
- Source
- Diff
./main/java/.../action/UseRecordAction.java
… 1 more file in changeset.

4:54 下午

zhonghaowen

More
17539
changed 2 files
root:

ZSSZYY-97:使用记录干预添加器械包增加判断是否来自干预，如果是来自干预，则允许添加器械包

- -1
- +3
./main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
- History
- Source
- Diff
./main/java/.../action/UseRecordAction.java
… 1 more file in changeset.

Monday 27 Mar 2017

10:35 下午

wangyi

More
17512
changed 113 files
root:

完成：DGZYY-69，装配可以不补充材料，回收时自动关联包实例未补充材料明细

- -1
- +3
./main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
- History
- Source
- Diff
./main/java/.../action/UseRecordAction.java
… 112 more files in changeset.

11:17 上午

zhonghaowen

More
17496
changed 6 files
root:

解决ZSSZYY-97:使用记录干预功能

- too large
./main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
- History
- Source
- Diff
./main/java/.../UseRecordManagerImpl.java
- -0
- +8
./main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
- History
- Source
- Diff
./main/java/.../service/UseRecordManager.java
- -1
- +11
./main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
- History
- Source
- Diff
./main/java/.../action/UseRecordAction.java
… 3 more files in changeset.

Friday 24 Mar 2017

11:34 下午

adairkang

More
17491
changed 1 file
root:

备注

- -1
- +5
./main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
- History
- Source
- Diff
./main/java/.../service/UseRecordManager.java

11:33 下午

adairkang

More
17490
changed 3 files
root:

ZSYY-36 PDA上使用记录列表的数量，显示最近24小时内的数据

ZSYY-34 PDA端增加使用记录审核后自动转申请单配置项

- -1
- +1
./main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
- History
- Source
- Diff
./main/java/.../service/UseRecordManager.java
- too large
./main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
- History
- Source
- Diff
./main/java/.../UseRecordManagerImpl.java
… 1 more file in changeset.

Saturday 18 Mar 2017

2:05 下午

shuyongfu

More
17422
changed 1 file
root:

解决使用记录录入明细统计报表按一次性物品(高值耗材)名称及条码查询不到数据的问题

根据使用记录登记一次性物品或高值耗材的条码查到对应的一次性物品id设值到一次性物品使用明细表的字段中

- -2
- +13
./main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
- History
- Source
- Diff
./main/java/.../action/UseRecordAction.java

Tuesday 14 Mar 2017

11:04 上午

adairkang

More
17347
changed 4 files
root:

HDQRMYY-20 pda添加新的使用记录时，如果住院号已经登记过有旧使用记录，会把已登记的器械包连带出来

- -12
- +14
./main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordToJson.java
- History
- Source
- Diff
./main/java/.../service/UseRecordToJson.java
… 3 more files in changeset.

Thursday 09 Mar 2017

6:42 下午

shuyongfu

More
17303
changed 2 files
root:

中大附一手术预约接口调整

- -2
- +2
./main/java/com/forgon/disinfectsystem/operationSchedule/service/OperationScheduleManagerImpl.java
- History
- Source
- Diff
./main/.../OperationScheduleManagerImpl.java
… 1 more file in changeset.

5:51 下午

shuyongfu

More
17301
changed 2 files
root:

解决jira问题:ZSYY-19 手术预约管理列表内容调整

1.手术预约管理列表增加改动：1、隐藏图中没有勾选的列；2、预约单排序改成列名“手术台次”正序为主。

2.手术预约推送的数据暂不写备注

- -1
- +1
./main/java/com/forgon/disinfectsystem/operationSchedule/service/OperationScheduleManagerImpl.java
- History
- Source
- Diff
./main/.../OperationScheduleManagerImpl.java
… 1 more file in changeset.

Wednesday 08 Mar 2017

3:11 下午

adairkang

More
17281
changed 1 file
root:

使用记录，器械包是否真正使用属性的修改

- too large
./main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
- History
- Source
- Diff
./main/java/.../UseRecordManagerImpl.java

Monday 27 Feb 2017

4:19 下午

zhonghaowen

More
17161
changed 2 files
root:

DYSYY-9:修改根据借物单id来查找该借物单上的物品被转换成申请单的情况和根据器械包实例id来查找借物单的id方法

- too large
./main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
- History
- Source
- Diff
./main/java/.../UseRecordManagerImpl.java
… 1 more file in changeset.

12:17 上午

shuyongfu

More
17151
changed 3 files
root:

手术预约接口增加对病人名字、住院号属性的赋值

- -1
- +3
./main/java/com/forgon/disinfectsystem/operationSchedule/service/OperationScheduleManagerImpl.java
- History
- Source
- Diff
./main/.../OperationScheduleManagerImpl.java
… 2 more files in changeset.

Friday 24 Feb 2017

5:44 下午

shuyongfu

More
17126
changed 7 files
root:

解决jira问题:

ZSYY-20 手术预约发货功能调整

ZSYY-19 手术预约管理列表内容调整

- -6
- +17
./main/java/com/forgon/disinfectsystem/operationSchedule/service/OperationScheduleManagerImpl.java
- History
- Source
- Diff
./main/.../OperationScheduleManagerImpl.java
… 6 more files in changeset.

Wednesday 22 Feb 2017

4:00 下午

zhonghaowen

More
17081
changed 21 files
root:

解决DYSYY-9:借物发货的器械包在使用记录转化为申请单后，借物单的状态自动变为归还待确认状态

- too large
./main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
- History
- Source
- Diff
./main/java/.../UseRecordManagerImpl.java
… 20 more files in changeset.

Friday 17 Feb 2017

7:15 下午

jeffli

More
17030
changed 7 files
root:

解决 DYSYY-15

解决 DYSYY-10

解决 DYSYY-6

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

- -0
- +1
./main/java/com/forgon/disinfectsystem/operationSchedule/service/OperationScheduleManagerImpl.java
- History
- Source
- Diff
./main/.../OperationScheduleManagerImpl.java
… 6 more files in changeset.

11:53 上午

wangyi

More
17022
changed 9 files
root:

解决：DGZYY-53，外来器械二次回收扫描条码开打该申请单

- too large
./main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
- History
- Source
- Diff
./main/java/.../UseRecordManagerImpl.java
… 8 more files in changeset.

Monday 13 Feb 2017

10:58 上午

shuyongfu

More
16976
changed 2 files
root:

使用记录删除时,使用的聚合包实例的状态逻辑修改,且对应的器械包使用记录中间表的数据也相应删除

- too large
./main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
- History
- Source
- Diff
./main/java/.../UseRecordManagerImpl.java
- -4
- +18
./main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
- History
- Source
- Diff
./main/java/.../action/UseRecordAction.java

10:10 上午

shuyongfu

More
16975
changed 1 file
root:

解决使用记录旧数据追加扫描聚合包时保存出错的问题

- too large
./main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
- History
- Source
- Diff
./main/java/.../UseRecordManagerImpl.java

Friday 10 Feb 2017

7:31 下午

shuyongfu

More
16970
changed 1 file
root:

聚合包使用记录功能的实现代码

- -0
- +4
./main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
- History
- Source
- Diff
./main/java/.../action/UseRecordAction.java

5:03 下午

shuyongfu

More
16969
changed 10 files
root:

聚合包使用记录功能的实现代码及测试用例代码

- -1
- +42
./main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
- History
- Source
- Diff
./main/java/.../action/UseRecordAction.java
- too large
./main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
- History
- Source
- Diff
./main/java/.../UseRecordManagerImpl.java
… 8 more files in changeset.

Sunday 22 Jan 2017

2:33 下午

shuyongfu

More
16875
changed 1 file
root:

解决jira问题:ZSSZYY-83 使用记录扫描条码时，最新扫描的条码在最上方，并记住排序

- too large
./main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
- History
- Source
- Diff
./main/java/.../UseRecordManagerImpl.java

Saturday 21 Jan 2017

1:55 下午

shuyongfu

More
16868
changed 5 files
root:

解决jira问题:ZSSZYY-83 使用记录扫描条码时，最新扫描的条码在最上方，并记住排序

- too large
./main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
- History
- Source
- Diff
./main/java/.../UseRecordManagerImpl.java
- -0
- +2
./main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
- History
- Source
- Diff
./main/java/.../action/UseRecordAction.java
… 3 more files in changeset.

Sunday 08 Jan 2017

10:57 下午

adairkang

More
16654
changed 10 files
root:

录使用记录的时候，器械包添加是否真正使用属性,PDA端处理

- too large
./main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
- History
- Source
- Diff
./main/java/.../UseRecordManagerImpl.java
- -1
- +2
./main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java
- History
- Source
- Diff
./main/java/.../service/UseRecordManager.java
- -16
- +16
./main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
- History
- Source
- Diff
./main/java/.../action/UseRecordAction.java
… 7 more files in changeset.

Saturday 07 Jan 2017

6:58 下午

adairkang

More
16651
changed 5 files
root:

录使用记录的时候，器械包添加是否真正使用属性,针对有配置的医院生效

- -7
- +5
./main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
- History
- Source
- Diff
./main/java/.../action/UseRecordAction.java
- too large
./main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
- History
- Source
- Diff
./main/java/.../UseRecordManagerImpl.java
… 3 more files in changeset.

Friday 06 Jan 2017

7:39 下午

adairkang

More
16634
changed 6 files
root:

使用记录扫描器械包条码时，提示还有失效期更前的器械包(ZSSZYY-75)，添加对已扫条码的过滤

pda也加上此功能

- -3
- +2
./main/java/com/forgon/disinfectsystem/useRecord/action/UseRecordAction.java
- History
- Source
- Diff
./main/java/.../action/UseRecordAction.java
… 5 more files in changeset.

src

Line History

Stats

Commits this week: 0

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

shuyongfu

shuyongfu

adairkang

shuyongfu

zhonghaowen

zhonghaowen

wangyi

zhonghaowen

adairkang

adairkang

shuyongfu

adairkang

shuyongfu

shuyongfu

adairkang

zhonghaowen

shuyongfu

shuyongfu

zhonghaowen

jeffli

wangyi

shuyongfu

shuyongfu

shuyongfu

shuyongfu

shuyongfu

shuyongfu

adairkang

adairkang

adairkang