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
Thursday 01 Aug 2019
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.
Wednesday 12 Jun 2019
1:44 下午

shuyongfu

解决Jira问题:GZSZYYGZHC-38 预入库的页面中绑定申请单明细那块加载申请单信息很慢
Options
    • -1
    • +4
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -1
    • +4
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
Saturday 08 Jun 2019
5:59 下午

terrykwan

增加回收模块的的注释
Options
    • -1
    • +9
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
  3. … 2 more files in changeset.
Monday 03 Jun 2019
11:55 上午

zc.li

解决：GGSRMYY-87。解决申请单提交后，取消加急无效的问题。
Options
    • -0
    • +6
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -16
    • +3
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
Tuesday 28 May 2019
5:20 下午

zc.li

解决：GZSDBRMYY-14。增加日志,记录回收清点界面点击查看申请单的操作。
Options
    • -1
    • +27
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
Thursday 23 May 2019
2:47 下午

zc.li

修复非供应室用户申请自定义申请单，申请科室被禁用时，科室为空的问题。
Options
    • -1
    • +4
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
  2. … 1 more file in changeset.
Wednesday 22 May 2019
7:03 下午

zc.li

修复查看提交给一级供应室的申请单时报错的问题。
Options
    • -2
    • +2
    ./main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
Tuesday 21 May 2019
11:57 上午

zc.li

发货管理加急后台代码；删除加急对象的urgent属性和相关操作；
Options
    • -2
    • +8
    ./main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java
  2. … 11 more files in changeset.
Monday 20 May 2019
9:42 上午

jason

解决jira问题：FJZRXYY-1 全部申请单列表中外来器械和外部代理灭菌申请单记录打印不了
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
  2. … 2 more files in changeset.
Thursday 16 May 2019
10:04 上午

zc.li

修复回收生成装配任务时，产生的装配任务不合理的问题。如一个回收项回收3个，其中一个是特急，会生成加急数量为1，特急的装配任务和2个加急数量为0但是却是特急的装配任务。
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
  2. … 3 more files in changeset.
Wednesday 15 May 2019
1:51 下午

zc.li

提交后台代码
Options
    • -1
    • +28
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ApplicationGoodsVo.java
    • -1
    • +8
    ./main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java
    • -1
    • +2
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
    • -0
    • +33
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/vo/InvoicePlanVo.java
    • -3
    • +4
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -3
    • +5
    ./main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
  9. … 23 more files in changeset.
Wednesday 08 May 2019
9:22 上午

jason

解决jira问题：GZZYYFY-49 物品签收增加消毒物品类型
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
  2. … 1 more file in changeset.
9:20 上午

shuyongfu

解决Jira问题:

ZSYY-266 器械包信息列表的回收时间取值错误

Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
  2. … 3 more files in changeset.
Monday 06 May 2019
5:55 下午

jason

解决jira问题：GZZYYFY-43 科室申领鼠标悬浮DIV的发货数量需要扣减退货数量
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
  2. … 4 more files in changeset.
Friday 26 Apr 2019
9:53 下午

shuyongfu

修复测试用例,截止目前433个测试用例(部分测试用例暂时注释、后期再抽时间解决)全部运行通过
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
  2. … 16 more files in changeset.
3:21 下午

yanweining

GZSZYYGZHC-35:高值耗材包定义被删，导致没法入库
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -8
    • +8
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java
  3. … 1 more file in changeset.
Wednesday 17 Apr 2019
1:08 下午

terrykwan

消毒物品拆包申请的价格，改回原来的取值方式。GZZYYFY-47 发货计划打印消毒物品格式调整
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
12:45 下午

terrykwan

消毒物品拆包申请的价格，用材料明细的价格之和。GZZYYFY-47 发货计划打印消毒物品格式调整
Options
    • too large
    ./main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java