Activity forgon-ssts-v4.1.0/ssts-invoice/src/main/java/com/forgon

6:39 下午

jason

More
26359
changed 6 files
root:

解决jira问题：GZSDBRMYY-13 材料发货增加包定义作为关联(发货单打印增加器械包名称作为显示)

- -0
- +25
./disinfectsystem/invoicemanager/vo/InvoicePrintVo.java
- History
- Source
- Diff
./disinfectsystem/.../InvoicePrintVo.java
- -1
- +15
./disinfectsystem/invoicemanager/action/MaterialInvoiceAction.java
- History
- Source
- Diff
./disinfectsystem/.../MaterialInvoiceAction.java
- -2
- +8
./disinfectsystem/invoicemanager/service/MaterialInvoiceManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../MaterialInvoiceManagerImpl.java
… 3 more files in changeset.

9:26 上午

shuyongfu

More
26350
changed 9 files
root:

解决Jira问题:DGZYY-155 辅助发货查询数据过多会超时没有显示

- too large
./disinfectsystem/invoicemanager/action/InvoiceAction.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceAction.java
- too large
./disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceManagerImpl.java
… 7 more files in changeset.

4:32 下午

shuyongfu

More
26336
changed 1 file
root:

解决Jira问题:

XJJQZYY-75 使用自定义发货的物品，消毒灭菌费用没有统计到默认结算科室中

- too large
./disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceManagerImpl.java

8:34 下午

zc.li

More
26285
changed 2 files
root:

测试用例修复

- too large
./disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceManagerImpl.java
… 1 more file in changeset.

9:38 上午

yanweining

More
26218
changed 12 files
root:

XJJQZYY-64：PDA上清洗消毒可以拍照上传清洗参数图片

1）新增新表：WashAndDisinfectPic 用于记录清洗记录图片

2）WashAndDisinfectRecordAction：新增查看清洗图片的接口

3）新增pda上传灭菌记录,清洗记录图片的servlet

- too large
./disinfectsystem/invoicemanager/action/InvoiceAction.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceAction.java
… 11 more files in changeset.

11:11 下午

terrykwan

More
26128
changed 3 files
root:

解决如下问题：1、解决辅助发货正在做生物监测的物品添加没有提示；2、PC端发货计划，灭菌筐生物监测不合格，扫物品正常，扫篮筐没有阻止发货等问题。 SZSZLYY-23

- too large
./disinfectsystem/invoicemanager/action/InvoiceAction.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceAction.java
- too large
./disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceManagerImpl.java
… 1 more file in changeset.

1:12 上午

terrykwan

More
26120
changed 1 file
root:

提示消息加上器械包的条码。 SZSZLYY-23

- too large
./disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceManagerImpl.java

3:24 下午

terrykwan

More
26094
changed 2 files
root:

解决errorMsg没有传递到页面，以及空的confirmMsgs消息被放入的问题。 SZSZLYY-23

- too large
./disinfectsystem/invoicemanager/action/InvoiceAction.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceAction.java
- too large
./disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceManagerImpl.java

9:52 上午

terrykwan

More
26086
changed 1 file
root:

补充注释。完成 SZSZLYY-23 扫描发货时根据包实例灭菌记录的生物监测状态和结果进行提示

- too large
./disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceManagerImpl.java

11:20 下午

terrykwan

More
26083
changed 17 files
root:

完成 SZSZLYY-23 扫描发货时根据包实例灭菌记录的生物监测状态和结果进行提示

- -2
- +2
./disinfectsystem/invoicemanager/dwr/table/InvoiceTableManager.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceTableManager.java
- -4
- +18
./disinfectsystem/invoicemanager/service/InvoiceManager.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceManager.java
- too large
./disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceManagerImpl.java
- too large
./disinfectsystem/invoicemanager/action/InvoiceAction.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceAction.java
- -112
- +29
./disinfectsystem/invoicemanager/controller/InvoiceController.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceController.java
… 12 more files in changeset.

9:34 上午

zc.li

More
26032
changed 17 files
root:

解决：GZZYYFY-31。PDA发货后台支持一键扫描一次性物品。CSSDSYY-2：PDA,PC发货模块添加器械包分组过滤。

- -2
- +2
./disinfectsystem/invoicemanager/controller/InvoiceController.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceController.java
- -3
- +6
./disinfectsystem/invoicemanager/service/InvoiceManager.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceManager.java
- too large
./disinfectsystem/invoicemanager/action/InvoiceAction.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceAction.java
- too large
./disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceManagerImpl.java
… 13 more files in changeset.

9:47 下午

terrykwan

More
25964
changed 6 files
root:

重构优化此功能的代码。 SZSZLYY-23 扫描发货时根据包实例灭菌记录的生物监测状态和结果进行提示（PDA优先，PC也要做）

- -1
- +5
./disinfectsystem/invoicemanager/service/TousseInstanceInfoManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../TousseInstanceInfoManagerImpl.java
- too large
./disinfectsystem/invoicemanager/action/InvoiceAction.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceAction.java
- too large
./disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceManagerImpl.java
- -6
- +0
./disinfectsystem/invoicemanager/service/InvoiceManager.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceManager.java
… 2 more files in changeset.

12:25 上午

terrykwan

More
25880
changed 1 file
root:

增加聚合包发货时的提示信息

- too large
./disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceManagerImpl.java

10:31 下午

terrykwan

More
25879
changed 1 file
root:

增加扫描科室条码，返回给前台的科室信息。GZYKDXFSKQ-42

- too large
./disinfectsystem/invoicemanager/action/InvoiceAction.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceAction.java

7:01 下午

terrykwan

More
25876
changed 1 file
root:

增加扫描科室条码，返回给前台的科室信息。解决gson转换的空指针问题

- too large
./disinfectsystem/invoicemanager/action/InvoiceAction.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceAction.java

10:11 上午

shuyongfu

More
25694
changed 1 file
root:

解决Jira问题:XJJQZYY-24手术预约和器械包信息增加手术相关信息

自定义发货时增加对发货单的申请单对象的判空

- too large
./disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceManagerImpl.java

12:07 下午

terrykwan

More
25673
changed 1 file
root:

完成了发货时，如果存在同名字的更早失效的器械包，统一PC和PDA端的提醒用户的方式。JIRA问题：器械包发货遵循先失效先发货原则，XJJQZYY-20

- too large
./disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceManagerImpl.java

11:51 上午

yanweining

More
25672
changed 1 file
root:

解决：invoiceAction之前的误提交

- too large
./disinfectsystem/invoicemanager/action/InvoiceAction.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceAction.java

11:23 上午

terrykwan

More
25670
changed 4 files
root:

完成了发货时，如果存在同名字的更早失效的器械包，统一PC和PDA端的提醒用户的方式。JIRA问题：器械包发货遵循先失效先发货原则，XJJQZYY-20

- too large
./disinfectsystem/invoicemanager/action/InvoiceAction.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceAction.java
- too large
./disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceManagerImpl.java
… 2 more files in changeset.

2:18 上午

terrykwan

More
25665
changed 5 files
root:

完成了发货时，如果存在同名字的更早失效的器械包，PC和PDA端的弹窗提醒用户的功能。JIRA问题：器械包发货遵循先失效先发货原则，XJJQZYY-20

- too large
./disinfectsystem/invoicemanager/action/InvoiceAction.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceAction.java
- too large
./disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceManagerImpl.java
… 3 more files in changeset.

4:21 下午

shuyongfu

More
25655
changed 4 files
root:

解决Jira问题:XJJQZYY-24 手术预约和器械包信息增加手术相关信息

器械包信息列表增加手术间字段,取值见问题及字段的代码注释

- too large
./disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceManagerImpl.java
… 3 more files in changeset.

2:23 下午

yanweining

More
25651
changed 4 files
root:

ASSDGSZYY-35:客户希望在“器械包信息”中添加新字段，且信息能随EXCEL导出

- too large
./disinfectsystem/invoicemanager/action/InvoiceAction.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceAction.java
… 3 more files in changeset.

10:30 下午

terrykwan

More
25603
changed 1 file
root:

解决当depart的json属性为null时，取字符串值报错，导致扫描聚合包条码时物品出不来的问题

- too large
./disinfectsystem/invoicemanager/action/InvoiceAction.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceAction.java

8:19 下午

terrykwan

More
25582
changed 1 file
root:

补充注释

- too large
./disinfectsystem/invoicemanager/action/InvoiceAction.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceAction.java

11:37 上午

yanweining

More
25580
changed 3 files
root:

SZSSKRMYY-5：提供接口给“院感系统”

新增接口：

1.根据住院号/诊疗号查询病人使用记录信息，关联的器械包信息

2.根据器械包实例条码获取追溯信息

- -30
- +7
./disinfectsystem/invoicemanager/service/TousseInstanceInfoManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../TousseInstanceInfoManagerImpl.java
- -4
- +4
./disinfectsystem/invoicemanager/controller/ButtJoinTousseInstanceTraceInfoController.java
- History
- Source
- Diff
./disinfectsystem/.../ButtJoinTousseInstanceTraceInfoController.java
… 1 more file in changeset.

10:02 上午

yanweining

More
25577
changed 1 file
root:

invoiceManagerlmpl代码优化：删除没用的依赖

- too large
./disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceManagerImpl.java

5:47 下午

yanweining

More
25573
changed 1 file
root:

SZSSKRMYY-5:提供接口给“院感系统”

代码优化

- -46
- +49
./disinfectsystem/invoicemanager/service/TousseInstanceInfoManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../TousseInstanceInfoManagerImpl.java

4:19 下午

yanweining

More
25572
changed 7 files
root:

SZSSKRMYY-5:提供接口给“院感系统”

把invoiceManager的查询器械包实例追溯信息方法移动至新增的TousseInstanceInfoManager

- -0
- +162
./disinfectsystem/invoicemanager/controller/ButtJoinTousseInstanceTraceInfoController.java
- History
- Source
- Diff
./disinfectsystem/.../ButtJoinTousseInstanceTraceInfoController.java
- -7
- +0
./disinfectsystem/invoicemanager/service/InvoiceManager.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceManager.java
- -150
- +0
./disinfectsystem/invoicemanager/controller/ButtJoinInvoiceController.java
- History
- Source
- Diff
./disinfectsystem/.../ButtJoinInvoiceController.java
- too large
./disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceManagerImpl.java
- -0
- +23
./disinfectsystem/invoicemanager/service/TousseInstanceInfoManager.java
- History
- Source
./disinfectsystem/.../TousseInstanceInfoManager.java
- -0
- +491
./disinfectsystem/invoicemanager/service/TousseInstanceInfoManagerImpl.java
- History
- Source
./disinfectsystem/.../TousseInstanceInfoManagerImpl.java
… 1 more file in changeset.

12:47 下午

yanweining

More
25565
changed 3 files
root:

SZSSKRMYY-5：提供接口给“院感系统”

新增接口：

通过输入住院号和诊疗号，就可以关联出这个病人的所有使用记录，使用记录里面用过的器械包的追溯信息

- too large
./disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceManagerImpl.java
- -0
- +7
./disinfectsystem/invoicemanager/service/InvoiceManager.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceManager.java
- -0
- +150
./disinfectsystem/invoicemanager/controller/ButtJoinInvoiceController.java
- History
- Source
./disinfectsystem/.../ButtJoinInvoiceController.java

4:49 下午

jeffli

More
25546
changed 2 files
root:

广州医科大学附属口腔医院GZYKDXFSKQ-33

发货计划增加待发物品按钮

- too large
./disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
- History
- Source
- Diff
./disinfectsystem/.../InvoiceManagerImpl.java
… 1 more file in changeset.

forgon

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)

jason

shuyongfu

shuyongfu

zc.li

yanweining

terrykwan

terrykwan

terrykwan

terrykwan

terrykwan

zc.li

terrykwan

terrykwan

terrykwan

terrykwan

shuyongfu

terrykwan

yanweining

terrykwan

terrykwan

shuyongfu

yanweining

terrykwan

terrykwan

yanweining

yanweining

yanweining

yanweining

yanweining

jeffli