forgon-ssts-v4.1.0 / ssts-recyclingapplication

src

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 7
Total Committers: 20
Last Commit: 14 Feb 16
Commits this week: 7
Total Lines of Code (LoC): 142,420
Net change in LoC this week: 245

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
Friday 22 Nov 2019
11:50 上午

jason

解决jira问题：GYEY-732 PC端电脑拍照功能改进以及增加录像功能
Options
    • -27
    • +6
    ./main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
  2. … 2 more files in changeset.
Thursday 21 Nov 2019
5:37 下午

jason

解决jira问题：GYEY-732 PC端电脑拍照功能改进以及增加录像功能
Options
    • -3
    • +32
    ./main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
  2. … 6 more files in changeset.
Thursday 31 Oct 2019
3:03 下午

zc.li

删除不使用的代码
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
  2. … 1 more file in changeset.
Thursday 17 Oct 2019
11:09 上午

jason

解决jira问题：北京垂杨柳医院BJCYLYY-16 外来器械接收单格式更改及增加部分字段取值(解决通用申请单包含外来器械时报错问题)
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
Wednesday 16 Oct 2019
4:22 下午

shuyongfu

解决:ASSDGSZYY-69 物品眼科受水器申请后直接点开发货计划无法发货

解决另一种场景:有其它申请单也申请了眼科受水器及其它物品、但眼科受水器已发货、其它物品未全部发货时也会查这个眼科受水器申请时产生的包定义的md5

Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
  2. … 1 more file in changeset.
11:12 上午

shuyongfu

解决:ASSDGSZYY-69 物品眼科受水器申请后直接点开发货计划无法发货
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
10:37 上午

jason

解决jira问题：售后-东莞市中医院ASSDGSZYY-68 打印发货计划增加“打印待发货物品”功能按钮(增加注释)
Options
    • -1
    • +1
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
  2. … 1 more file in changeset.
10:30 上午

jason

解决jira问题：售后-东莞市中医院ASSDGSZYY-68 打印发货计划增加“打印待发货物品”功能按钮
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
  2. … 1 more file in changeset.
Tuesday 15 Oct 2019
2:12 下午

jason

解决jira问题：售后-东莞市中医院ASSDGSZYY-68 打印发货计划增加“打印待发货物品”功能按钮
Options
    • -0
    • +6
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -0
    • +10
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
  4. … 4 more files in changeset.
Tuesday 17 Sep 2019
5:40 下午

zc.li

撤回：ASSGGSRMYY-32后台代码。改为在前台处理
Options
    • -3
    • +0
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
3:03 下午

zc.li

提交：ASSGGSRMYY-32后台代码。一次性物品申请单填写了备注内容，点开发货计划，备注没显示出来的问题
Options
    • -0
    • +3
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
Monday 02 Sep 2019
3:58 下午

jason

解决jira问题：广医二院消毒供应项目GYEY-727 组织机构增加科室停用、启用功能按钮(已停用的科室不能进行科室申领及修改申请单)
Options
    • -0
    • +6
    ./main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
    • -0
    • +19
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
  3. … 4 more files in changeset.
Thursday 29 Aug 2019
2:38 下午

jason

代码优化
Options
    • -1
    • +1
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
  2. … 3 more files in changeset.
Tuesday 20 Aug 2019
6:12 下午

jason

解决jira问题：广医二院消毒供应项目GYEY-727 组织机构增加科室停用、启用功能按钮
Options
    • -0
    • +7
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
  2. … 14 more files in changeset.
Friday 02 Aug 2019
3:16 下午

zc.li

处理GGSRMYY-95新增的需求。已消毒状态的消毒物品也算库存数量
Options
    • -2
    • +5
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
Thursday 01 Aug 2019
8:55 下午

jason

解决jira问题：北京垂杨柳医院BJCYLYY-16 外来器械接收单格式更改及增加部分字段取值(器械送达时间格式)
Options
    • -1
    • +1
    ./main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
7:11 下午

jason

解决jira问题：北京垂杨柳医院BJCYLYY-16 外来器械接收单格式更改及增加部分字段取值(清洗人重复打印)
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
11:43 上午

jason

解决jira问题：北京垂杨柳医院BJCYLYY-16 外来器械接收单格式更改及增加部分字段取值
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
Wednesday 31 Jul 2019
8:55 下午

jason

解决jira问题：北京垂杨柳医院BJCYLYY-16 外来器械接收单格式更改及增加部分字段取值
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
  2. … 1 more file in changeset.
3:43 下午

shuyongfu

处理Jira问题:ASSZDWY-46 装配页面打印回收清单，提示“该时间段内没有需要打印的内容”，但实际上所选时间段内是有回收物品
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
Tuesday 16 Jul 2019
1:44 下午

zc.li

解决：SZSZLYY-30。回收时手工添加的器械包也能进行回收功能，删除器械包时，申请数量不为0也能从申请单中删除器械包。
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
  2. … 4 more files in changeset.
Wednesday 10 Jul 2019
8:06 下午

zc.li

解决：GGSRMYY-95。借物模块，科室申请借物的物品数量不能超过该物品在供应室的库存数量，即申请数量不能超过状态为已灭菌的数量，根据祖先id匹配。
Options
    • -0
    • +28
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
  2. … 3 more files in changeset.
7:04 下午

shuyongfu

发货性能优化及测试用例重新调整
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
  2. … 17 more files in changeset.
Thursday 04 Jul 2019
11:14 上午

shuyongfu

解决Jira问题:

GZZYYFY-50 使用快速发货物品较多时加载慢，出现超时提示

GZZYYFY-50 使用快速发货物品较多时加载慢，出现超时提示

Options
    • -0
    • +817
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/ExpressInvoicePlanManagerImpl.java
    • -2
    • +36
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -0
    • +9
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ExpressInvoiceApplicationGoodsVo.java
    • -4
    • +23
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • -0
    • +143
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ExpressInvoiceInvoicePlanDetailVo.java
    • -1
    • +1
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ExpressInvoiceInvoicePlanVo.java
    • -0
    • +97
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/ExpressInvoicePlanManager.java
  9. … 15 more files in changeset.
9:36 上午

zc.li

属性重命名
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
  2. … 3 more files in changeset.
Wednesday 03 Jul 2019
6:06 下午

zc.li

解决：GGSRMYY-93。1.

1.使用记录转换的申请单，回收时限制不能手工添加物品名称，不能扫描除了申请单物品以外的物品的标识牌条码添加物品； 2.使用记录转换的申请单，回收物品的数量不能超过申请的数量。配置项的中文名字：限制使用记录转换的申请单不能添加别的物品，英文名字：restrictAddOtherGoodsToApplicationFromUseRecord

设置为true，进行限制；没有配置或者设置为false，不限制；

Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
  2. … 5 more files in changeset.
Tuesday 02 Jul 2019
8:05 下午

zc.li

项目转移
Options
  1. ./main/java/com/forgon/disinfectsystem/borrowrecord/dwr
  2. ./main/java/com/forgon/disinfectsystem/borrowrecord
    • -0
    • +89
    ./main/java/com/forgon/disinfectsystem/borrowrecord/dwr/table/BorrowRecordTableManager.java
  4. ./main/java/com/forgon/disinfectsystem/borrowrecord/dwr/table
    • -0
    • +49
    ./main/java/com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManager.java
    • -0
    • +346
    ./main/java/com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java
  7. ./main/java/com/forgon/disinfectsystem/borrowrecord/action
    • -0
    • +470
    ./main/java/com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManagerImpl.java
  9. ./main/java/com/forgon/disinfectsystem/borrowrecord/service
  10. … 6 more files in changeset.
Thursday 20 Jun 2019
4:38 下午

zc.li

解决：GZSZYYGZHC-39 高值耗材申请单审批通过以后，预入库页面绑定申请单明细没有显示该申请单信息

代永福提交

Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
Tuesday 18 Jun 2019
4:19 下午

jason

解决：中山市小榄人民医院ZSSXLRMYY-178

批量打印加入外部代理灭菌单类型，外部代理灭菌单放在批量打印的最后打印

Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
Friday 14 Jun 2019
6:34 下午

jason

解决jira问题: 中山市小榄人民医院 ZSSXLRMYY-178

批量打印加入外部代理灭菌单类型

Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
  2. … 2 more files in changeset.