forgon-ssts-v4.1 / SterileSupplySystem / branches / V4.1.0 / ssts-invoice / src / main

java

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 13
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 15548 is being indexed.

Monday 31 Oct 2016
6:21 下午

jeffli

新增功能：

外部代理灭菌包的器械包也能自动扣减包内一次性物品

Options
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
  2. … 1 more file in changeset.
4:46 下午

jeffli

外部代理灭菌单的终止增加限制条件

广东省人民医院GDSRMYY-196

Options
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
  2. … 7 more files in changeset.
Friday 28 Oct 2016
4:10 下午

jeffli

类型为外部代理灭菌包的器械包，跳过扣减库存处理

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

Options
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
Thursday 27 Oct 2016
8:25 下午

chenjiaru

修复了发货时器械包或者篮筐扫条码时提示未做生物监测和正在做的生物监测的外来器械包，并且把以下的时间改为取服务器的时间

1、申请外部代理灭菌包的申请时间

2、科室互借的出借时间

3、清洗消毒的添加报损器械的时间

4、发货计划的发货时间

5、使用记录的录入时间

6、召回信息的开始时间和截止时间

Options
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
  2. … 8 more files in changeset.
5:06 下午

jeffli

调整invoiceType参数位置
Options
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
11:05 上午

jeffli

发货增加申请科室编码,结算科室编码,申请单类型等冗余属性，对旧数据处理

重构代码，所有根据发货单引用申请单的代码做改造

Options
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
  3. … 11 more files in changeset.
10:46 上午

adairkang

pda自定义发货扫描条码获取发货科室

手术预约发货

Options
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
  2. … 5 more files in changeset.
Wednesday 26 Oct 2016
3:41 下午

jeffli

打开省医发货回写的代码，之前因为测试需要被注释了
Options
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
11:57 上午

jeffli

增加限制：

手术预约发货和自定义发货时，不允许扫描代理灭菌包

Options
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
9:43 上午

jeffli

发货改造
Options
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
Tuesday 25 Oct 2016
6:19 下午

jeffli

发货改造
Options
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
5:37 下午

jeffli

解决bug：

手术预约和自定义发货，扫描多个名字一样的包时，提示发货数量不能大于1

Options
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
4:10 下午

jeffli

解决bug：

手术预约单上有回收后发货的物品时，发货状态计算有问题

Options
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
  2. … 2 more files in changeset.
3:26 下午

jeffli

解决bug：

普通申请单上有手术预约物品时，普通发货会提示库存不足

Options
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
  2. … 1 more file in changeset.
3:08 下午

jeffli

解决bug：

手术预约单上申请了类型为回收后发货的物品，没有显示在待发物品列表上。

Options
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
2:40 下午

jeffli

手术预约发货和自定义发货时不允许扫篮筐
Options
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
12:01 下午

adairkang

PYQZYY-102(pda发货时扫描复核员条码改进)
Options
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
  2. … 7 more files in changeset.
11:56 上午

jeffli

新增自定义发货功能
Options
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoiceTableManager.java
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
  4. … 4 more files in changeset.
9:43 上午

jeffli

新增手术预约发货功能
Options
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/service/SubmitInvoiceItem.java
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
  4. … 11 more files in changeset.
Friday 21 Oct 2016
10:52 上午

chenjiaru

解决：GDSRMYY-184 灭菌情况报表，需要把灭菌中的包也统计进报表里面
Options
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
  2. … 4 more files in changeset.
Thursday 20 Oct 2016
2:14 下午

chenjiaru

改善：DGZYY-10 东莞市外来器械灭菌监测及发放登记表格式
Options
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoiceTableManager.java
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/service/SubmitInvoiceItem.java
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
  6. … 6 more files in changeset.
Wednesday 19 Oct 2016
5:52 下午

zengjc

器械包信息，清洗记录添加位置显示.
Options
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
  2. … 1 more file in changeset.
5:00 下午

zengjc

器械包信息记录灭菌记录添加位置信息，解决jira问题DGZYY-21.
Options
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
  2. … 1 more file in changeset.
Tuesday 18 Oct 2016
11:23 上午

chenjiaru

对sql语句进行小修改，对程序不造成影响
Options
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
10:27 上午

chenjiaru

对sql语句进行小修改，对程序不造成影响
Options
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
Monday 17 Oct 2016
3:42 下午

jeffli

解决bug：

发货器械包扣减一次性物品后，发货单上显示发货类型为科室申请

Options
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
12:49 下午

shuyongfu

解决jira问题及相关功能,具体如下:

GDSRMYY-187 同名的外部代理灭菌包发货时A科室的包发到B科室也能扫描出来

GDSRMYY-182 使用住院号调取病人信息时报错

广东省医his与物资回写接口及中大附一手术排班相关功能

Options
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
  2. … 26 more files in changeset.
11:49 上午

jeffli

优化查看发货单界面，增加类型属性
Options
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
  2. … 2 more files in changeset.
Sunday 16 Oct 2016
4:23 下午

chenjiaru

1、灭菌记录添加一个新属性"生物监测的结束时间"

2、发货记录添加一个新属性"是否常规",默认是常规发货（解释一下：非常规指的是正在做"生物监测"时发货员就就把这个器械包发货了）

Options
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoiceTableManager.java
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
  5. … 8 more files in changeset.
Friday 14 Oct 2016
4:54 下午

jeffli

器械包出库时自动减去材料或者一次性物品数量，然后费用进到报表

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

Options
    • ?
    ./com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
  2. … 12 more files in changeset.